Merge pull request webpack#6154 from EugeneHlushko/feature/use-webpack-missing-module

sokra · web-flow · commit 3c77f03f15a8 · 2017-12-21T09:35:45.000+01:00
Feature: Use WebpackMissingModule
diff --git a/lib/MultiModule.js b/lib/MultiModule.js
@@ -60,10 +60,8 @@ class MultiModule extends Module {
 				str.push(`${JSON.stringify(dep.module.id)}`);
 				str.push(")");
 			} else {
-				// TODO replace with WebpackMissingModule module
-				str.push("(function webpackMissingModule() { throw new Error(");
-				str.push(JSON.stringify(`Cannot find module "${dep.request}"`));
-				str.push("); }())");
+				const content = require("./dependencies/WebpackMissingModule").module(dep.request);
+				str.push(content);
 			}
 			str.push(";\n");
 		});
diff --git a/test/configCases/errors/multi-entry-missing-module/index.js b/test/configCases/errors/multi-entry-missing-module/index.js
@@ -0,0 +1,10 @@
+it("Should use WebpackMissingModule when module is missing with multiple entry setup", function() {
+  var fs = require("fs");
+  var path = require("path");
+  var source = fs.readFileSync(path.join(__dirname, "b.js"), "utf-8");
+  source.should.containEql("!function(){var n=new Error('Cannot find module \"./intentionally-missing-module.js\"');throw n.code=\"MODULE_NOT_FOUND\",n}()}");
+
+  (function() {
+    require("./intentionally-missing-module");
+  }).should.throw("Cannot find module \"./intentionally-missing-module\"");
+});
diff --git a/test/configCases/errors/multi-entry-missing-module/intentionally-missing-module.js b/test/configCases/errors/multi-entry-missing-module/intentionally-missing-module.js
@@ -0,0 +1 @@
+module.exports = "ignored";
diff --git a/test/configCases/errors/multi-entry-missing-module/webpack.config.js b/test/configCases/errors/multi-entry-missing-module/webpack.config.js
@@ -0,0 +1,16 @@
+const IgnorePlugin = require("../../../../lib/IgnorePlugin");
+module.exports = {
+  entry: {
+    b: ["./intentionally-missing-module.js"],
+    bundle0: ["./index"]
+  },
+  output: {
+    filename: "[name].js"
+  },
+  plugins: [
+    new IgnorePlugin(new RegExp(/intentionally-missing-module/))
+  ],
+  node: {
+    __dirname: false
+  }
+};
