diff --git a/examples/wasm-complex/webpack.config.js b/examples/wasm-complex/webpack.config.js index ea331c518..b6f1120b9 100644 --- a/examples/wasm-complex/webpack.config.js +++ b/examples/wasm-complex/webpack.config.js @@ -8,7 +8,7 @@ module.exports = { { test: /\.wat$/, use: "wast-loader", - type: "webassembly/async-experimental" + type: "webassembly/async" } ] }, diff --git a/examples/wasm-simple/webpack.config.js b/examples/wasm-simple/webpack.config.js index 830bd4361..2f30e64a2 100644 --- a/examples/wasm-simple/webpack.config.js +++ b/examples/wasm-simple/webpack.config.js @@ -8,7 +8,7 @@ module.exports = { rules: [ { test: /\.wasm$/, - type: "webassembly/async-experimental" + type: "webassembly/async" } ] }, diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js index c60c21a7e..ab3ecbd04 100644 --- a/lib/WebpackOptionsDefaulter.js +++ b/lib/WebpackOptionsDefaulter.js @@ -142,11 +142,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter { }, options.experiments.syncWebAssembly && { test: /\.wasm$/i, - type: "webassembly/experimental" + type: "webassembly/sync" }, options.experiments.asyncWebAssembly && { test: /\.wasm$/i, - type: "webassembly/async-experimental" + type: "webassembly/async" } ].filter(Boolean) ); diff --git a/lib/debug/ProfilingPlugin.js b/lib/debug/ProfilingPlugin.js index 8e5c88125..68c56a30b 100644 --- a/lib/debug/ProfilingPlugin.js +++ b/lib/debug/ProfilingPlugin.js @@ -321,8 +321,8 @@ const interceptAllParserHooks = (moduleFactory, tracer) => { "javascript/dynamic", "javascript/esm", "json", - "webassembly/async-experimental", - "webassembly/experimental" + "webassembly/async", + "webassembly/sync" ]; moduleTypes.forEach(moduleType => { diff --git a/lib/node/ReadFileCompileAsyncWasmPlugin.js b/lib/node/ReadFileCompileAsyncWasmPlugin.js index 132b2ea71..ce8bba4ce 100644 --- a/lib/node/ReadFileCompileAsyncWasmPlugin.js +++ b/lib/node/ReadFileCompileAsyncWasmPlugin.js @@ -54,7 +54,7 @@ class ReadFileCompileAsyncWasmPlugin { if ( !chunkGraph.hasModuleInGraph( chunk, - m => m.type === "webassembly/async-experimental" + m => m.type === "webassembly/async" ) ) { return; diff --git a/lib/node/ReadFileCompileWasmPlugin.js b/lib/node/ReadFileCompileWasmPlugin.js index 785b21972..83331c630 100644 --- a/lib/node/ReadFileCompileWasmPlugin.js +++ b/lib/node/ReadFileCompileWasmPlugin.js @@ -58,7 +58,7 @@ class ReadFileCompileWasmPlugin { if ( !chunkGraph.hasModuleInGraph( chunk, - m => m.type === "webassembly/experimental" + m => m.type === "webassembly/sync" ) ) { return; diff --git a/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js b/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js index eb421fe49..38498a8ca 100644 --- a/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js +++ b/lib/wasm-async/AsyncWebAssemblyModulesPlugin.js @@ -35,12 +35,12 @@ class AsyncWebAssemblyModulesPlugin { ); normalModuleFactory.hooks.createParser - .for("webassembly/async-experimental") + .for("webassembly/async") .tap("AsyncWebAssemblyModulesPlugin", () => { return new AsyncWebAssemblyParser(); }); normalModuleFactory.hooks.createGenerator - .for("webassembly/async-experimental") + .for("webassembly/async") .tap("AsyncWebAssemblyModulesPlugin", () => { return Generator.byType({ javascript: new AsyncWebAssemblyJavascriptGenerator( @@ -67,7 +67,7 @@ class AsyncWebAssemblyModulesPlugin { chunk, compareModulesById(chunkGraph) )) { - if (module.type === "webassembly/async-experimental") { + if (module.type === "webassembly/async") { const filenameTemplate = outputOptions.webassemblyModuleFilename; result.push({ diff --git a/lib/wasm/WebAssemblyModulesPlugin.js b/lib/wasm/WebAssemblyModulesPlugin.js index 0516478a1..0bca23b14 100644 --- a/lib/wasm/WebAssemblyModulesPlugin.js +++ b/lib/wasm/WebAssemblyModulesPlugin.js @@ -44,13 +44,13 @@ class WebAssemblyModulesPlugin { ); normalModuleFactory.hooks.createParser - .for("webassembly/experimental") + .for("webassembly/sync") .tap("WebAssemblyModulesPlugin", () => { return new WebAssemblyParser(); }); normalModuleFactory.hooks.createGenerator - .for("webassembly/experimental") + .for("webassembly/sync") .tap("WebAssemblyModulesPlugin", () => { return Generator.byType({ javascript: new WebAssemblyJavascriptGenerator(), @@ -71,7 +71,7 @@ class WebAssemblyModulesPlugin { chunk, compareModulesById(chunkGraph) )) { - if (module.type === "webassembly/experimental") { + if (module.type === "webassembly/sync") { const filenameTemplate = outputOptions.webassemblyModuleFilename; @@ -111,7 +111,7 @@ class WebAssemblyModulesPlugin { for (const chunk of compilation.chunks) { if (chunk.canBeInitial()) { for (const module of chunkGraph.getChunkModulesIterable(chunk)) { - if (module.type === "webassembly/experimental") { + if (module.type === "webassembly/sync") { initialWasmModules.add(module); } } diff --git a/lib/web/FetchCompileAsyncWasmPlugin.js b/lib/web/FetchCompileAsyncWasmPlugin.js index 638064621..227dd737c 100644 --- a/lib/web/FetchCompileAsyncWasmPlugin.js +++ b/lib/web/FetchCompileAsyncWasmPlugin.js @@ -29,7 +29,7 @@ class FetchCompileAsyncWasmPlugin { if ( !chunkGraph.hasModuleInGraph( chunk, - m => m.type === "webassembly/async-experimental" + m => m.type === "webassembly/async" ) ) { return; diff --git a/lib/web/FetchCompileWasmPlugin.js b/lib/web/FetchCompileWasmPlugin.js index abe911399..81fc5934b 100644 --- a/lib/web/FetchCompileWasmPlugin.js +++ b/lib/web/FetchCompileWasmPlugin.js @@ -33,7 +33,7 @@ class FetchCompileWasmPlugin { if ( !chunkGraph.hasModuleInGraph( chunk, - m => m.type === "webassembly/experimental" + m => m.type === "webassembly/sync" ) ) { return; diff --git a/test/TestCases.template.js b/test/TestCases.template.js index 3036d17ab..13d9a4c12 100644 --- a/test/TestCases.template.js +++ b/test/TestCases.template.js @@ -159,7 +159,7 @@ const describeCases = config => { { test: /\.wat$/i, loader: "wast-loader", - type: "webassembly/async-experimental" + type: "webassembly/async" } ] }, diff --git a/test/configCases/wasm/identical/webpack.config.js b/test/configCases/wasm/identical/webpack.config.js index 8205c343e..9c944d02a 100644 --- a/test/configCases/wasm/identical/webpack.config.js +++ b/test/configCases/wasm/identical/webpack.config.js @@ -8,7 +8,7 @@ module.exports = { { test: /\.wat$/, loader: "wast-loader", - type: "webassembly/async-experimental" + type: "webassembly/async" } ] }, diff --git a/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js b/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js index ae1be1d3f..bc80a015f 100644 --- a/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js +++ b/test/configCases/wasm/wasm-in-initial-chunk-error/webpack.config.js @@ -5,7 +5,7 @@ module.exports = { { test: /\.wat$/, loader: "wast-loader", - type: "webassembly/experimental" + type: "webassembly/sync" } ] },