Skip to content

Commit 9560af5

Browse files
sokrasokra
authored
Merge pull request webpack#7303 from odedniv/module-not-found
Align 'Cannot find module' message with native NodeJS
2 parents 687c038 + 17fd4d8 commit 9560af5

File tree

19 files changed

+36
-36
lines changed

19 files changed

+36
-36
lines changed

‎examples/code-splitted-require.context-amd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ function webpackContext(req) {
259259
function webpackContextResolve(req) {
260260
var id = map[req];
261261
if(!(id + 1)) { // check for number or string
262-
var e = new Error('Cannot find module "' + req + '".');
262+
var e = new Error("Cannot find module '" + req + "'");
263263
e.code = 'MODULE_NOT_FOUND';
264264
throw e;
265265
}

‎examples/code-splitted-require.context/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ function webpackContext(req) {
259259
function webpackContextResolve(req) {
260260
var id = map[req];
261261
if(!(id + 1)) { // check for number or string
262-
var e = new Error('Cannot find module "' + req + '".');
262+
var e = new Error("Cannot find module '" + req + "'");
263263
e.code = 'MODULE_NOT_FOUND';
264264
throw e;
265265
}

‎examples/code-splitting-harmony/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ function webpackAsyncContext(req) {
248248
var ids = map[req];
249249
if(!ids) {
250250
return Promise.resolve().then(function() {
251-
var e = new Error('Cannot find module "' + req + '".');
251+
var e = new Error("Cannot find module '" + req + "'");
252252
e.code = 'MODULE_NOT_FOUND';
253253
throw e;
254254
});

‎examples/code-splitting-native-import-context-filter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ function webpackAsyncContext(req) {
275275
var ids = map[req];
276276
if(!ids) {
277277
return Promise.resolve().then(function() {
278-
var e = new Error('Cannot find module "' + req + '".');
278+
var e = new Error("Cannot find module '" + req + "'");
279279
e.code = 'MODULE_NOT_FOUND';
280280
throw e;
281281
});

‎examples/code-splitting-native-import-context/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ function webpackAsyncContext(req) {
264264
var ids = map[req];
265265
if(!ids) {
266266
return Promise.resolve().then(function() {
267-
var e = new Error('Cannot find module "' + req + '".');
267+
var e = new Error("Cannot find module '" + req + "'");
268268
e.code = 'MODULE_NOT_FOUND';
269269
throw e;
270270
});

‎examples/code-splitting-specify-chunk-name/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ function webpackAsyncContext(req) {
256256
var ids = map[req];
257257
if(!ids) {
258258
return Promise.resolve().then(function() {
259-
var e = new Error('Cannot find module "' + req + '".');
259+
var e = new Error("Cannot find module '" + req + "'");
260260
e.code = 'MODULE_NOT_FOUND';
261261
throw e;
262262
});

‎examples/hybrid-routing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function webpackAsyncContext(req) {
153153
var ids = map[req];
154154
if(!ids) {
155155
return Promise.resolve().then(function() {
156-
var e = new Error('Cannot find module "' + req + '".');
156+
var e = new Error("Cannot find module '" + req + "'");
157157
e.code = 'MODULE_NOT_FOUND';
158158
throw e;
159159
});

‎examples/mixed/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ function webpackContext(req) {
357357
function webpackContextResolve(req) {
358358
var id = map[req];
359359
if(!(id + 1)) { // check for number or string
360-
var e = new Error('Cannot find module "' + req + '".');
360+
var e = new Error("Cannot find module '" + req + "'");
361361
e.code = 'MODULE_NOT_FOUND';
362362
throw e;
363363
}

‎examples/require.context/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function webpackContext(req) {
143143
function webpackContextResolve(req) {
144144
var id = map[req];
145145
if(!(id + 1)) { // check for number or string
146-
var e = new Error('Cannot find module "' + req + '".');
146+
var e = new Error("Cannot find module '" + req + "'");
147147
e.code = 'MODULE_NOT_FOUND';
148148
throw e;
149149
}

‎examples/web-worker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function webpackContext(req) {
284284
function webpackContextResolve(req) {
285285
var id = map[req];
286286
if(!(id + 1)) { // check for number or string
287-
var e = new Error('Cannot find module "' + req + '".');
287+
var e = new Error("Cannot find module '" + req + "'");
288288
e.code = 'MODULE_NOT_FOUND';
289289
throw e;
290290
}

‎lib/ContextModule.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ function webpackContext(req) {
330330
function webpackContextResolve(req) {
331331
var id = map[req];
332332
if(!(id + 1)) { // check for number or string
333-
var e = new Error('Cannot find module "' + req + '".');
333+
var e = new Error("Cannot find module '" + req + "'");
334334
e.code = 'MODULE_NOT_FOUND';
335335
throw e;
336336
}
@@ -365,7 +365,7 @@ function webpackContext(req) {
365365
function webpackContextResolve(req) {
366366
var id = map[req];
367367
if(!(id + 1)) { // check for number or string
368-
var e = new Error('Cannot find module "' + req + '".');
368+
var e = new Error("Cannot find module '" + req + "'");
369369
e.code = 'MODULE_NOT_FOUND';
370370
throw e;
371371
}
@@ -404,7 +404,7 @@ function webpackAsyncContextResolve(req) {
404404
return Promise.resolve().then(function() {
405405
var id = map[req];
406406
if(!(id + 1)) { // check for number or string
407-
var e = new Error('Cannot find module "' + req + '".');
407+
var e = new Error("Cannot find module '" + req + "'");
408408
e.code = 'MODULE_NOT_FOUND';
409409
throw e;
410410
}
@@ -441,7 +441,7 @@ function webpackAsyncContextResolve(req) {
441441
return Promise.resolve().then(function() {
442442
var id = map[req];
443443
if(!(id + 1)) { // check for number or string
444-
var e = new Error('Cannot find module "' + req + '".');
444+
var e = new Error("Cannot find module '" + req + "'");
445445
e.code = 'MODULE_NOT_FOUND';
446446
throw e;
447447
}
@@ -481,7 +481,7 @@ function webpackAsyncContextResolve(req) {
481481
return ${promise}.then(function() {
482482
var id = map[req];
483483
if(!(id + 1)) { // check for number or string
484-
var e = new Error('Cannot find module "' + req + '".');
484+
var e = new Error("Cannot find module '" + req + "'");
485485
e.code = 'MODULE_NOT_FOUND';
486486
throw e;
487487
}
@@ -540,7 +540,7 @@ function webpackAsyncContext(req) {
540540
var ids = map[req];
541541
if(!ids) {
542542
return Promise.resolve().then(function() {
543-
var e = new Error('Cannot find module "' + req + '".');
543+
var e = new Error("Cannot find module '" + req + "'");
544544
e.code = 'MODULE_NOT_FOUND';
545545
throw e;
546546
});
@@ -559,7 +559,7 @@ module.exports = webpackAsyncContext;`;
559559

560560
getSourceForEmptyContext(id) {
561561
return `function webpackEmptyContext(req) {
562-
var e = new Error('Cannot find module "' + req + '".');
562+
var e = new Error("Cannot find module '" + req + "'");
563563
e.code = 'MODULE_NOT_FOUND';
564564
throw e;
565565
}
@@ -574,7 +574,7 @@ webpackEmptyContext.id = ${JSON.stringify(id)};`;
574574
// Here Promise.resolve().then() is used instead of new Promise() to prevent
575575
// uncaught exception popping up in devtools
576576
return Promise.resolve().then(function() {
577-
var e = new Error('Cannot find module "' + req + '".');
577+
var e = new Error("Cannot find module '" + req + "'");
578578
e.code = 'MODULE_NOT_FOUND';
579579
throw e;
580580
});

‎lib/RuntimeTemplate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = class RuntimeTemplate {
4444
}
4545

4646
throwMissingModuleErrorFunction({ request }) {
47-
const err = `Cannot find module "${request}"`;
47+
const err = `Cannot find module '${request}'`;
4848
return `function webpackMissingModule() { var e = new Error(${JSON.stringify(
4949
err
5050
)}); e.code = 'MODULE_NOT_FOUND'; throw e; }`;

‎lib/dependencies/WebpackMissingModule.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ exports.module = request =>
1010
`!(function webpackMissingModule() { ${exports.moduleCode(request)} }())`;
1111

1212
exports.promise = request => {
13-
const errorCode = toErrorCode(`Cannot find module "${request}"`);
13+
const errorCode = toErrorCode(`Cannot find module '${request}'`);
1414
return `Promise.reject(function webpackMissingModule() { ${errorCode} return e; }())`;
1515
};
1616

1717
exports.moduleCode = request => {
18-
const errorCode = toErrorCode(`Cannot find module "${request}"`);
18+
const errorCode = toErrorCode(`Cannot find module '${request}'`);
1919
return `${errorCode} throw e;`;
2020
};

‎test/ExternalModule.unittest.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ describe("ExternalModule", () => {
171171
// set up
172172
const variableToCheck = "foo";
173173
const request = "bar";
174-
const expected = `if(typeof foo === 'undefined') {var e = new Error("Cannot find module \\"bar\\""); e.code = 'MODULE_NOT_FOUND'; throw e;}
174+
const expected = `if(typeof foo === 'undefined') {var e = new Error("Cannot find module 'bar'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
175175
`;
176176

177177
// invoke
@@ -207,7 +207,7 @@ describe("ExternalModule", () => {
207207
// set up
208208
const id = "someId";
209209
const optional = true;
210-
const expected = `if(typeof __WEBPACK_EXTERNAL_MODULE_someId__ === 'undefined') {var e = new Error("Cannot find module \\"some/request\\""); e.code = 'MODULE_NOT_FOUND'; throw e;}
210+
const expected = `if(typeof __WEBPACK_EXTERNAL_MODULE_someId__ === 'undefined') {var e = new Error("Cannot find module 'some/request'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
211211
module.exports = __WEBPACK_EXTERNAL_MODULE_someId__;`;
212212

213213
// invoke
@@ -239,7 +239,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_someId__;`;
239239
it("checks for the existence of the request setting it", () => {
240240
// set up
241241
const optional = true;
242-
const expected = `if(typeof some/request === 'undefined') {var e = new Error("Cannot find module \\"some/request\\""); e.code = 'MODULE_NOT_FOUND'; throw e;}
242+
const expected = `if(typeof some/request === 'undefined') {var e = new Error("Cannot find module 'some/request'"); e.code = 'MODULE_NOT_FOUND'; throw e;}
243243
module.exports = some/request;`;
244244

245245
// invoke

‎test/WebpackMissingModule.unittest.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe("WebpackMissingModule", () => {
88
it("returns an error message based on given error message", () => {
99
const errorMessage = WebpackMissingModule.moduleCode("mock message");
1010
expect(errorMessage).toBe(
11-
'var e = new Error("Cannot find module \\"mock message\\""); e.code = \'MODULE_NOT_FOUND\'; throw e;'
11+
"var e = new Error(\"Cannot find module 'mock message'\"); e.code = 'MODULE_NOT_FOUND'; throw e;"
1212
);
1313
});
1414
});
@@ -17,7 +17,7 @@ describe("WebpackMissingModule", () => {
1717
it("returns an error message based on given error message", () => {
1818
const errorMessage = WebpackMissingModule.promise("mock message");
1919
expect(errorMessage).toBe(
20-
'Promise.reject(function webpackMissingModule() { var e = new Error("Cannot find module \\"mock message\\""); e.code = \'MODULE_NOT_FOUND\'; return e; }())'
20+
"Promise.reject(function webpackMissingModule() { var e = new Error(\"Cannot find module 'mock message'\"); e.code = 'MODULE_NOT_FOUND'; return e; }())"
2121
);
2222
});
2323
});
@@ -26,7 +26,7 @@ describe("WebpackMissingModule", () => {
2626
it("returns an error message based on given error message", () => {
2727
const errorMessage = WebpackMissingModule.module("mock message");
2828
expect(errorMessage).toBe(
29-
'!(function webpackMissingModule() { var e = new Error("Cannot find module \\"mock message\\""); e.code = \'MODULE_NOT_FOUND\'; throw e; }())'
29+
"!(function webpackMissingModule() { var e = new Error(\"Cannot find module 'mock message'\"); e.code = 'MODULE_NOT_FOUND'; throw e; }())"
3030
);
3131
});
3232
});

‎test/cases/parsing/issue-2641/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ it("should call error callback on missing module", function(done) {
1111
require(['./file', './missingModule'], function(file){}, function(error) {
1212
try {
1313
expect(error).toBeInstanceOf(Error);
14-
expect(error.message).toBe('Cannot find module "./missingModule"');
14+
expect(error.message).toBe("Cannot find module './missingModule'");
1515
done();
1616
} catch(e) {
1717
done(e);
@@ -24,7 +24,7 @@ it("should call error callback on missing module in context", function(done) {
2424
require(['./' + module], function(file){}, function(error) {
2525
try {
2626
expect(error).toBeInstanceOf(Error);
27-
expect(error.message).toBe("Cannot find module \"./missingModule\".");
27+
expect(error.message).toBe("Cannot find module './missingModule'");
2828
done();
2929
} catch(e) { done(e); }
3030
});

‎test/cases/parsing/issue-758/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ it("should call error callback on missing module", function(done) {
1313
require('./missingModule');
1414
}, function(error) {
1515
expect(error).toBeInstanceOf(Error);
16-
expect(error.message).toBe('Cannot find module "./missingModule"');
16+
expect(error.message).toBe("Cannot find module './missingModule'");
1717
done();
1818
});
1919
});
@@ -24,7 +24,7 @@ it("should call error callback on missing module in context", function(done) {
2424
require('./' + module);
2525
}, function(error) {
2626
expect(error).toBeInstanceOf(Error);
27-
expect(error.message).toBe("Cannot find module \"./missingModule\".");
27+
expect(error.message).toBe("Cannot find module './missingModule'");
2828
done();
2929
});
3030
})('missingModule');

‎test/configCases/context-exclusion/simple/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ it("should not exclude paths not matching the exclusion pattern", function() {
99
});
1010

1111
it("should exclude paths/files matching the exclusion pattern", function() {
12-
expect(() => requireInContext("dont")).toThrowError(/Cannot find module ".\/dont"/);
12+
expect(() => requireInContext("dont")).toThrowError(/Cannot find module '.\/dont'/);
1313

14-
expect(() => requireInContext("dont-check-here/file")).toThrowError(/Cannot find module ".\/dont-check-here\/file"/);
14+
expect(() => requireInContext("dont-check-here/file")).toThrowError(/Cannot find module '.\/dont-check-here\/file'/);
1515

16-
expect(() => requireInContext("check-here/dont-check-here/file")).toThrowError(/Cannot find module ".\/check-here\/dont-check-here\/file"/);
16+
expect(() => requireInContext("check-here/dont-check-here/file")).toThrowError(/Cannot find module '.\/check-here\/dont-check-here\/file'/);
1717
});

‎test/configCases/errors/multi-entry-missing-module/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ it("Should use WebpackMissingModule when module is missing with multiple entry s
22
var fs = require("fs");
33
var path = require("path");
44
var source = fs.readFileSync(path.join(__dirname, "b.js"), "utf-8");
5-
expect(source).toMatch("!(function webpackMissingModule() { var e = new Error(\"Cannot find module \\\"./intentionally-missing-module.js\\\"\"); e.code = 'MODULE_NOT_FOUND'; throw e; }());");
5+
expect(source).toMatch("!(function webpackMissingModule() { var e = new Error(\"Cannot find module './intentionally-missing-module.js'\"); e.code = 'MODULE_NOT_FOUND'; throw e; }());");
66

77
expect(function() {
88
require("./intentionally-missing-module");
9-
}).toThrowError("Cannot find module \"./intentionally-missing-module\"");
9+
}).toThrowError("Cannot find module './intentionally-missing-module'");
1010
});

0 commit comments

Comments
 (0)