add checkWasmTypes flag, enabled it only in production

webpack · Jun 4, 2018 · 78b3193 · 78b3193
1 parent 591521b
commit 78b3193
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
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";
 };