add checkWasmTypes flag, enabled it only in production

sokra · sokra · commit 78b31936c3ba · 2018-06-04T20:14:08.000+02:00
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -340,6 +340,9 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.noEmitOnErrors) {
 			new NoEmitOnErrorsPlugin().apply(compiler);
 		}
+		if (options.optimization.checkWasmTypes) {
+			new WasmFinalizeExportsPlugin().apply(compiler);
+		}
 		if (options.optimization.namedModules) {
 			new NamedModulesPlugin().apply(compiler);
 		}
@@ -361,11 +364,6 @@ class WebpackOptionsApply extends OptionsApply {
 			new SizeLimitsPlugin(options.performance).apply(compiler);
 		}
 
-		// FIXME(sven): this should be conditional
-		// if (options.optimization.jsIncompatibleExports) {
-		new WasmFinalizeExportsPlugin().apply(compiler);
-		// }
-
 		new TemplatedPathPlugin().apply(compiler);
 
 		new RecordIdsPlugin({
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -254,6 +254,9 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.noEmitOnErrors", "make", options =>
 			isProductionLikeMode(options)
 		);
+		this.set("optimization.checkWasmTypes", "make", options =>
+			isProductionLikeMode(options)
+		);
 		this.set(
 			"optimization.namedModules",
 			"make",
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1542,6 +1542,10 @@
           "description": "Avoid emitting assets when errors occur",
           "type": "boolean"
         },
+        "checkWasmTypes": {
+          "description": "Check for incompatible wasm types when importing/exporting from/to ESM",
+          "type": "boolean"
+        },
         "namedModules": {
           "description": "Use readable module identifiers for better debugging",
           "type": "boolean"
diff --git a/test/cases/wasm/js-incompatible-type/test.filter.js b/test/cases/wasm/js-incompatible-type/test.filter.js
@@ -1,5 +1,5 @@
 var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
 
 module.exports = function(config) {
-	return supportsWebAssembly();
+	return supportsWebAssembly() && config.mode === "production";
 };

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,9 @@ class WebpackOptionsApply extends OptionsApply {`
`340`	`340`	`if (options.optimization.noEmitOnErrors) {`
`341`	`341`	`new NoEmitOnErrorsPlugin().apply(compiler);`
`342`	`342`	`}`
	`343`	`+ if (options.optimization.checkWasmTypes) {`
	`344`	`+ new WasmFinalizeExportsPlugin().apply(compiler);`
	`345`	`+ }`
`343`	`346`	`if (options.optimization.namedModules) {`
`344`	`347`	`new NamedModulesPlugin().apply(compiler);`
`345`	`348`	`}`
`@@ -361,11 +364,6 @@ class WebpackOptionsApply extends OptionsApply {`
`361`	`364`	`new SizeLimitsPlugin(options.performance).apply(compiler);`
`362`	`365`	`}`
`363`	`366`
`364`		`- // FIXME(sven): this should be conditional`
`365`		`- // if (options.optimization.jsIncompatibleExports) {`
`366`		`- new WasmFinalizeExportsPlugin().apply(compiler);`
`367`		`- // }`
`368`		`-`
`369`	`367`	`new TemplatedPathPlugin().apply(compiler);`
`370`	`368`
`371`	`369`	`new RecordIdsPlugin({`