added strictModuleExceptionHandling option

fixes #1729
webpack · Nov 16, 2016 · b87bfc0 · b87bfc0
1 parent a58ce33
commit b87bfc0
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -62,8 +62,23 @@ function MainTemplate(outputOptions) {
 			this.indent(this.applyPluginsWaterfall("module-obj", "", chunk, hash, "moduleId")),
 			"};",
 			"",
-			"// Execute the module function",
-			"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+			this.asString(outputOptions.strictModuleExceptionHandling ? [
+				"// Execute the module function",
+				"var threw = true;",
+				"try {",
+				this.indent([
+					"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+					"threw = false;"
+				]),
+				"} finally {",
+				this.indent([
+					"if(threw) delete installedModules[moduleId];"
+				]),
+				"}"
+			] : [
+				"// Execute the module function",
+				"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+			]),
 			"",
 			"// Flag the module as loaded",
 			"module.l = true;",

diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -58,6 +58,7 @@ function WebpackOptionsDefaulter() {
 	this.set("output.hashDigest", "hex");
 	this.set("output.hashDigestLength", 20);
 	this.set("output.devtoolLineToLine", false);
+	this.set("output.strictModuleExceptionHandling", false);
 
 	this.set("node", {});
 	this.set("node.console", false);

diff --git a/schemas/webpackOptionsSchema.json b/schemas/webpackOptionsSchema.json
@@ -362,6 +362,10 @@
           "description": "Prefixes every line of the source in the bundle with this string.",
           "type": "string"
         },
+        "strictModuleExceptionHandling": {
+          "description": "Handles exceptions in module loading correctly at a performance cost.",
+          "type": "boolean"
+        },
         "umdNamedDefine": {
           "description": "If `output.libraryTarget` is set to umd and `output.library` is set, setting this to true will name the AMD module.",
           "type": "boolean"

diff --git a/test/configCases/runtime/opt-in-finally/exception.js b/test/configCases/runtime/opt-in-finally/exception.js
@@ -0,0 +1 @@
+throw new Error("Exception");
diff --git a/test/configCases/runtime/opt-in-finally/index.js b/test/configCases/runtime/opt-in-finally/index.js
@@ -0,0 +1,8 @@
+it("should throw exception on every try to load a module", function() {
+	(function() {
+		require("./exception");
+	}).should.throw();
+	(function() {
+		require("./exception");
+	}).should.throw();
+});
diff --git a/test/configCases/runtime/opt-in-finally/webpack.config.js b/test/configCases/runtime/opt-in-finally/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	output: {
+		strictModuleExceptionHandling: true
+	}
+}