Skip to content

Commit 91c3cfd

Browse files
sokrasokra
authored
Merge pull request webpack#6253 from wa-Nadoo/remove-extra-semicolons
Remove extra semicolons
2 parents 2cbd468 + 3a89252 commit 91c3cfd

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

‎lib/ContextModule.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -258,27 +258,27 @@ class ContextModule extends Module {
258258
return typeof fakeMap === "object" ? `var fakeMap = ${JSON.stringify(fakeMap, null, "\t")};` : "";
259259
}
260260

261-
getReturnModuleObjectSource(fakeMap, fakeMapDataExpression = "fakeMap[id]") {
262-
const strict = this.options.namespaceObject === "strict";
263-
const getReturn = type => {
264-
if(type === 1) return "module";
265-
if(type === 2) return "Object.assign({/* fake namespace object */}, module, { \"default\": module })";
266-
if(type === 0) {
267-
if(strict) {
268-
return "/* fake namespace object */ { \"default\": module }";
269-
} else {
270-
return "(typeof module === \"object\" && module && module.__esModule ? module : /* fake namespace object */ { \"default\": module })";
271-
}
261+
getReturn(type) {
262+
if(type === 1) return "module";
263+
if(type === 2) return "Object.assign({/* fake namespace object */}, module, { \"default\": module })";
264+
if(type === 0) {
265+
if(this.options.namespaceObject === "strict") {
266+
return "/* fake namespace object */ { \"default\": module }";
267+
} else {
268+
return "(typeof module === \"object\" && module && module.__esModule ? module : /* fake namespace object */ { \"default\": module })";
272269
}
273-
};
274-
if(typeof fakeMap === "number") return `return ${getReturn(fakeMap)};`;
275-
return `return ${fakeMapDataExpression} === 1 ? ${getReturn(1)} : ${fakeMapDataExpression} ? ${getReturn(2)} : ${getReturn(0)};`;
270+
}
271+
}
272+
273+
getReturnModuleObjectSource(fakeMap, fakeMapDataExpression = "fakeMap[id]") {
274+
if(typeof fakeMap === "number") return `return ${this.getReturn(fakeMap)};`;
275+
return `return ${fakeMapDataExpression} === 1 ? ${this.getReturn(1)} : ${fakeMapDataExpression} ? ${this.getReturn(2)} : ${this.getReturn(0)};`;
276276
}
277277

278278
getSyncSource(dependencies, id) {
279279
const map = this.getUserRequestMap(dependencies);
280280
const fakeMap = this.getFakeMap(dependencies);
281-
const returnModuleObject = `${this.getReturnModuleObjectSource(fakeMap)};`;
281+
const returnModuleObject = this.getReturnModuleObjectSource(fakeMap);
282282

283283
return `var map = ${JSON.stringify(map, null, "\t")};
284284
${this.getFakeMapInitStatement(fakeMap)}
@@ -308,7 +308,7 @@ webpackContext.id = ${JSON.stringify(id)};`;
308308
getWeakSyncSource(dependencies, id) {
309309
const map = this.getUserRequestMap(dependencies);
310310
const fakeMap = this.getFakeMap(dependencies);
311-
const returnModuleObject = `${this.getReturnModuleObjectSource(fakeMap)};`;
311+
const returnModuleObject = this.getReturnModuleObjectSource(fakeMap);
312312

313313
return `var map = ${JSON.stringify(map, null, "\t")};
314314
${this.getFakeMapInitStatement(fakeMap)}
@@ -343,7 +343,7 @@ module.exports = webpackContext;`;
343343
getAsyncWeakSource(dependencies, id) {
344344
const map = this.getUserRequestMap(dependencies);
345345
const fakeMap = this.getFakeMap(dependencies);
346-
const returnModuleObject = `${this.getReturnModuleObjectSource(fakeMap)};`;
346+
const returnModuleObject = this.getReturnModuleObjectSource(fakeMap);
347347

348348
return `var map = ${JSON.stringify(map, null, "\t")};
349349
${this.getFakeMapInitStatement(fakeMap)}
@@ -386,7 +386,7 @@ module.exports = webpackAsyncContext;`;
386386
const thenFunction = fakeMap !== 1 ?
387387
`function(id) {
388388
var module = __webpack_require__(id);
389-
${this.getReturnModuleObjectSource(fakeMap)};
389+
${this.getReturnModuleObjectSource(fakeMap)}
390390
}` :
391391
"__webpack_require__";
392392
return `var map = ${JSON.stringify(map, null, "\t")};
@@ -485,7 +485,7 @@ module.exports = webpackAsyncContext;`;
485485
const requestPrefix = hasMultipleOrNoChunks ?
486486
`Promise.all(ids.slice(${chunksStartPosition}).map(__webpack_require__.e))` :
487487
`__webpack_require__.e(ids[${chunksStartPosition}])`;
488-
const returnModuleObject = `${this.getReturnModuleObjectSource(fakeMap, "ids[1]")};`;
488+
const returnModuleObject = this.getReturnModuleObjectSource(fakeMap, "ids[1]");
489489

490490
return `var map = ${JSON.stringify(map, null, "\t")};
491491
function webpackAsyncContext(req) {

‎lib/dependencies/WebpackMissingModule.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ exports.module = request => `!(function webpackMissingModule() { ${exports.modul
99

1010
exports.promise = (request) => {
1111
const errorCode = toErrorCode(`Cannot find module "${request}"`);
12-
return `Promise.reject(function webpackMissingModule() { ${errorCode}; return e; }())`;
12+
return `Promise.reject(function webpackMissingModule() { ${errorCode} return e; }())`;
1313
};
1414

1515
exports.moduleCode = (request) => {

‎test/WebpackMissingModule.unittest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe("WebpackMissingModule", () => {
1515
describe("#promise", () => {
1616
it("returns an error message based on given error message", () => {
1717
const errorMessage = WebpackMissingModule.promise("mock message");
18-
should(errorMessage).be.eql("Promise.reject(function webpackMissingModule() { var e = new Error(\"Cannot find module \\\"mock message\\\"\"); e.code = 'MODULE_NOT_FOUND';; return e; }())");
18+
should(errorMessage).be.eql("Promise.reject(function webpackMissingModule() { var e = new Error(\"Cannot find module \\\"mock message\\\"\"); e.code = 'MODULE_NOT_FOUND'; return e; }())");
1919
});
2020
});
2121

0 commit comments

Comments
 (0)