diff --git a/examples/module-code-splitting/README.md b/examples/module-code-splitting/README.md
index 6e6120c6e..feb78dd0f 100644
--- a/examples/module-code-splitting/README.md
+++ b/examples/module-code-splitting/README.md
@@ -141,7 +141,7 @@ export function reset() {
/******/ };
/******/
/******/ __webpack_require__.f.j = (chunkId, promises) => {
-/******/ // JSONP chunk loading for javascript
+/******/ // import() chunk loading for javascript
/******/ var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;
/******/ if(installedChunkData !== 0) { // 0 means "already installed".
/******/
@@ -232,9 +232,9 @@ var e,o={},t={};function r(e){var n=t[e];if(void 0!==n)return n.exports;var i=t[
```
asset output.js 6.35 KiB [emitted] [javascript module] (name: main)
asset 1.output.js 1.36 KiB [emitted] [javascript module]
-chunk (runtime: main) output.js (main) 420 bytes (javascript) 2.89 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) output.js (main) 420 bytes (javascript) 2.9 KiB (runtime) [entry] [rendered]
> ./example.js main
- runtime modules 2.89 KiB 6 modules
+ runtime modules 2.9 KiB 6 modules
./example.js + 1 modules 420 bytes [built] [code generated]
[no exports]
[no exports used]
@@ -255,9 +255,9 @@ webpack 5.40.0 compiled successfully
```
asset output.js 1.15 KiB [emitted] [javascript module] [minimized] (name: main)
asset 946.output.js 213 bytes [emitted] [javascript module] [minimized]
-chunk (runtime: main) output.js (main) 420 bytes (javascript) 2.89 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) output.js (main) 420 bytes (javascript) 2.9 KiB (runtime) [entry] [rendered]
> ./example.js main
- runtime modules 2.89 KiB 6 modules
+ runtime modules 2.9 KiB 6 modules
./example.js + 1 modules 420 bytes [built] [code generated]
[no exports]
[no exports used]
diff --git a/examples/module-worker/README.md b/examples/module-worker/README.md
new file mode 100644
index 000000000..4d7147d9c
--- /dev/null
+++ b/examples/module-worker/README.md
@@ -0,0 +1,886 @@
+# example.js
+
+```javascript
+document.body.innerHTML = `
+
+
+ Computing fibonacci without worker:
+
+
+ Computing fibonacci with worker:
+
+
+`;
+
+const history = document.getElementById("history");
+const message = document.getElementById("message");
+const send = document.getElementById("send");
+const fib1 = document.getElementById("fib1");
+const output1 = document.getElementById("output1");
+const fib2 = document.getElementById("fib2");
+const output2 = document.getElementById("output2");
+
+/// CHAT with shared worker ///
+
+const chatWorker = new SharedWorker(
+ new URL("./chat-worker.js", import.meta.url),
+ {
+ name: "chat",
+ type: "module"
+ }
+);
+
+let historyTimeout;
+const scheduleUpdateHistory = () => {
+ clearTimeout(historyTimeout);
+ historyTimeout = setTimeout(() => {
+ chatWorker.port.postMessage({ type: "history" });
+ }, 1000);
+};
+scheduleUpdateHistory();
+
+const from = `User ${Math.floor(Math.random() * 10000)}`;
+
+send.addEventListener("click", e => {
+ chatWorker.port.postMessage({
+ type: "message",
+ content: message.value,
+ from
+ });
+ message.value = "";
+ message.focus();
+ e.preventDefault();
+});
+
+chatWorker.port.onmessage = event => {
+ const msg = event.data;
+ switch (msg.type) {
+ case "history":
+ history.innerText = msg.history.join("\n");
+ scheduleUpdateHistory();
+ break;
+ }
+};
+
+/// FIBONACCI without worker ///
+
+fib1.addEventListener("change", async () => {
+ try {
+ const value = parseInt(fib1.value, 10);
+ const { fibonacci } = await import("./fibonacci");
+ const result = fibonacci(value);
+ output1.innerText = `fib(${value}) = ${result}`;
+ } catch (e) {
+ output1.innerText = e.message;
+ }
+});
+
+/// FIBONACCI with worker ///
+
+const fibWorker = new Worker(new URL("./fib-worker.js", import.meta.url), {
+ name: "fibonacci",
+ type: "module"
+ /* webpackEntryOptions: { filename: "workers/[name].js" } */
+});
+
+fib2.addEventListener("change", () => {
+ try {
+ const value = parseInt(fib2.value, 10);
+ fibWorker.postMessage(`${value}`);
+ } catch (e) {
+ output2.innerText = e.message;
+ }
+});
+
+fibWorker.onmessage = event => {
+ output2.innerText = event.data;
+};
+```
+
+# fib-worker.js
+
+```javascript
+onmessage = async event => {
+ const { fibonacci } = await import("./fibonacci");
+ const value = JSON.parse(event.data);
+ postMessage(`fib(${value}) = ${fibonacci(value)}`);
+};
+```
+
+# fibonacci.js
+
+```javascript
+export function fibonacci(n) {
+ return n < 1 ? 0 : n <= 2 ? 1 : fibonacci(n - 1) + fibonacci(n - 2);
+}
+```
+
+# chat-worker.js
+
+```javascript
+onconnect = function (e) {
+ for (const port of e.ports) {
+ port.onmessage = async event => {
+ const msg = event.data;
+ switch (msg.type) {
+ case "message":
+ const { add } = await import("./chat-module");
+ add(msg.content, msg.from);
+ // fallthrough
+ case "history":
+ const { history } = await import("./chat-module");
+ port.postMessage({
+ type: "history",
+ history
+ });
+ break;
+ }
+ };
+ }
+};
+```
+
+# chat-module.js
+
+```javascript
+export const history = [];
+
+export const add = (content, from) => {
+ if (history.length > 10) history.shift();
+ history.push(`${from}: ${content}`);
+};
+```
+
+# dist/main.js
+
+```javascript
+/******/ var __webpack_modules__ = ({});
+```
+
+/* webpack runtime code */
+
+``` js
+/************************************************************************/
+/******/ // The module cache
+/******/ var __webpack_module_cache__ = {};
+/******/
+/******/ // The require function
+/******/ function __webpack_require__(moduleId) {
+/******/ // Check if module is in cache
+/******/ var cachedModule = __webpack_module_cache__[moduleId];
+/******/ if (cachedModule !== undefined) {
+/******/ return cachedModule.exports;
+/******/ }
+/******/ // Create a new module (and put it into the cache)
+/******/ var module = __webpack_module_cache__[moduleId] = {
+/******/ // no module.id needed
+/******/ // no module.loaded needed
+/******/ exports: {}
+/******/ };
+/******/
+/******/ // Execute the module function
+/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/
+/******/ // Return the exports of the module
+/******/ return module.exports;
+/******/ }
+/******/
+/******/ // expose the modules object (__webpack_modules__)
+/******/ __webpack_require__.m = __webpack_modules__;
+/******/
+/************************************************************************/
+/******/ /* webpack/runtime/define property getters */
+/******/ (() => {
+/******/ // define getter functions for harmony exports
+/******/ __webpack_require__.d = (exports, definition) => {
+/******/ for(var key in definition) {
+/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ }
+/******/ }
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/ensure chunk */
+/******/ (() => {
+/******/ __webpack_require__.f = {};
+/******/ // This file contains only the entry chunk.
+/******/ // The chunk loading function for additional chunks
+/******/ __webpack_require__.e = (chunkId) => {
+/******/ return Promise.all(Object.keys(__webpack_require__.f).reduce((promises, key) => {
+/******/ __webpack_require__.f[key](chunkId, promises);
+/******/ return promises;
+/******/ }, []));
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/get javascript chunk filename */
+/******/ (() => {
+/******/ // This function allow to reference async chunks
+/******/ __webpack_require__.u = (chunkId) => {
+/******/ // return url for filenames not based on template
+/******/ if (chunkId === 631) return "workers/fibonacci.js";
+/******/ // return url for filenames based on template
+/******/ return "" + (chunkId === 348 ? "chat" : chunkId) + ".js";
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/hasOwnProperty shorthand */
+/******/ (() => {
+/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ })();
+/******/
+/******/ /* webpack/runtime/make namespace object */
+/******/ (() => {
+/******/ // define __esModule on exports
+/******/ __webpack_require__.r = (exports) => {
+/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ }
+/******/ Object.defineProperty(exports, '__esModule', { value: true });
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/publicPath */
+/******/ (() => {
+/******/ __webpack_require__.p = "/dist/";
+/******/ })();
+/******/
+/******/ /* webpack/runtime/import chunk loading */
+/******/ (() => {
+/******/ __webpack_require__.b = new URL("./", import.meta.url);
+/******/
+/******/ // object to store loaded and loading chunks
+/******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched
+/******/ // [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
+/******/ var installedChunks = {
+/******/ 179: 0
+/******/ };
+/******/
+/******/ __webpack_require__.f.j = (chunkId, promises) => {
+/******/ // import() chunk loading for javascript
+/******/ var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;
+/******/ if(installedChunkData !== 0) { // 0 means "already installed".
+/******/
+/******/ // a Promise means "currently loading".
+/******/ if(installedChunkData) {
+/******/ promises.push(installedChunkData[1]);
+/******/ } else {
+/******/ if(true) { // all chunks have JS
+/******/ // setup Promise in chunk cache
+/******/ var promise = import("./" + __webpack_require__.u(chunkId)).then((data) => {
+/******/ var {ids, modules, runtime} = data;
+/******/ // add "modules" to the modules object,
+/******/ // then flag all "ids" as loaded and fire callback
+/******/ var moduleId, chunkId, i = 0;
+/******/ for(moduleId in modules) {
+/******/ if(__webpack_require__.o(modules, moduleId)) {
+/******/ __webpack_require__.m[moduleId] = modules[moduleId];
+/******/ }
+/******/ }
+/******/ if(runtime) runtime(__webpack_require__);
+/******/ for(;i < ids.length; i++) {
+/******/ chunkId = ids[i];
+/******/ if(__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ installedChunks[chunkId][0]();
+/******/ }
+/******/ installedChunks[ids[i]] = 0;
+/******/ }
+/******/
+/******/ }, (e) => {
+/******/ if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;
+/******/ throw e;
+/******/ });
+/******/ var promise = Promise.race([promise, new Promise((resolve) => (installedChunkData = installedChunks[chunkId] = [resolve]))])
+/******/ promises.push(installedChunkData[1] = promise);
+/******/ } else installedChunks[chunkId] = 0;
+/******/ }
+/******/ }
+/******/ };
+/******/
+/******/ // no on chunks loaded
+/******/ })();
+/******/
+/************************************************************************/
+```
+
+Computing fibonacci without worker:
+
+
+ Computing fibonacci with worker:
+
+
+`;
+
+const history = document.getElementById("history");
+const message = document.getElementById("message");
+const send = document.getElementById("send");
+const fib1 = document.getElementById("fib1");
+const output1 = document.getElementById("output1");
+const fib2 = document.getElementById("fib2");
+const output2 = document.getElementById("output2");
+
+/// CHAT with shared worker ///
+
+const chatWorker = new SharedWorker(
+ new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u(348), __webpack_require__.b),
+ {
+ name: "chat",
+ type: "module"
+ }
+);
+
+let historyTimeout;
+const scheduleUpdateHistory = () => {
+ clearTimeout(historyTimeout);
+ historyTimeout = setTimeout(() => {
+ chatWorker.port.postMessage({ type: "history" });
+ }, 1000);
+};
+scheduleUpdateHistory();
+
+const from = `User ${Math.floor(Math.random() * 10000)}`;
+
+send.addEventListener("click", e => {
+ chatWorker.port.postMessage({
+ type: "message",
+ content: message.value,
+ from
+ });
+ message.value = "";
+ message.focus();
+ e.preventDefault();
+});
+
+chatWorker.port.onmessage = event => {
+ const msg = event.data;
+ switch (msg.type) {
+ case "history":
+ history.innerText = msg.history.join("\n");
+ scheduleUpdateHistory();
+ break;
+ }
+};
+
+/// FIBONACCI without worker ///
+
+fib1.addEventListener("change", async () => {
+ try {
+ const value = parseInt(fib1.value, 10);
+ const { fibonacci } = await __webpack_require__.e(/*! import() */ 129).then(__webpack_require__.bind(__webpack_require__, /*! ./fibonacci */ 2));
+ const result = fibonacci(value);
+ output1.innerText = `fib(${value}) = ${result}`;
+ } catch (e) {
+ output1.innerText = e.message;
+ }
+});
+
+/// FIBONACCI with worker ///
+
+const fibWorker = new Worker(new URL(/* worker import */ __webpack_require__.p + __webpack_require__.u(631), __webpack_require__.b), {
+ name: "fibonacci",
+ type: "module"
+ /* webpackEntryOptions: { filename: "workers/[name].js" } */
+});
+
+fib2.addEventListener("change", () => {
+ try {
+ const value = parseInt(fib2.value, 10);
+ fibWorker.postMessage(`${value}`);
+ } catch (e) {
+ output2.innerText = e.message;
+ }
+});
+
+fibWorker.onmessage = event => {
+ output2.innerText = event.data;
+};
+```
+
+# dist/chat.js
+
+```javascript
+/******/ var __webpack_modules__ = ({});
+```
+
+/* webpack runtime code */
+
+``` js
+/************************************************************************/
+/******/ // The module cache
+/******/ var __webpack_module_cache__ = {};
+/******/
+/******/ // The require function
+/******/ function __webpack_require__(moduleId) {
+/******/ // Check if module is in cache
+/******/ var cachedModule = __webpack_module_cache__[moduleId];
+/******/ if (cachedModule !== undefined) {
+/******/ return cachedModule.exports;
+/******/ }
+/******/ // Create a new module (and put it into the cache)
+/******/ var module = __webpack_module_cache__[moduleId] = {
+/******/ // no module.id needed
+/******/ // no module.loaded needed
+/******/ exports: {}
+/******/ };
+/******/
+/******/ // Execute the module function
+/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/
+/******/ // Return the exports of the module
+/******/ return module.exports;
+/******/ }
+/******/
+/******/ // expose the modules object (__webpack_modules__)
+/******/ __webpack_require__.m = __webpack_modules__;
+/******/
+/************************************************************************/
+/******/ /* webpack/runtime/define property getters */
+/******/ (() => {
+/******/ // define getter functions for harmony exports
+/******/ __webpack_require__.d = (exports, definition) => {
+/******/ for(var key in definition) {
+/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ }
+/******/ }
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/ensure chunk */
+/******/ (() => {
+/******/ __webpack_require__.f = {};
+/******/ // This file contains only the entry chunk.
+/******/ // The chunk loading function for additional chunks
+/******/ __webpack_require__.e = (chunkId) => {
+/******/ return Promise.all(Object.keys(__webpack_require__.f).reduce((promises, key) => {
+/******/ __webpack_require__.f[key](chunkId, promises);
+/******/ return promises;
+/******/ }, []));
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/get javascript chunk filename */
+/******/ (() => {
+/******/ // This function allow to reference async chunks
+/******/ __webpack_require__.u = (chunkId) => {
+/******/ // return url for filenames based on template
+/******/ return "" + chunkId + ".js";
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/hasOwnProperty shorthand */
+/******/ (() => {
+/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ })();
+/******/
+/******/ /* webpack/runtime/make namespace object */
+/******/ (() => {
+/******/ // define __esModule on exports
+/******/ __webpack_require__.r = (exports) => {
+/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ }
+/******/ Object.defineProperty(exports, '__esModule', { value: true });
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/import chunk loading */
+/******/ (() => {
+/******/ // no baseURI
+/******/
+/******/ // object to store loaded and loading chunks
+/******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched
+/******/ // [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
+/******/ var installedChunks = {
+/******/ 348: 0
+/******/ };
+/******/
+/******/ __webpack_require__.f.j = (chunkId, promises) => {
+/******/ // import() chunk loading for javascript
+/******/ var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;
+/******/ if(installedChunkData !== 0) { // 0 means "already installed".
+/******/
+/******/ // a Promise means "currently loading".
+/******/ if(installedChunkData) {
+/******/ promises.push(installedChunkData[1]);
+/******/ } else {
+/******/ if(true) { // all chunks have JS
+/******/ // setup Promise in chunk cache
+/******/ var promise = import("./" + __webpack_require__.u(chunkId)).then((data) => {
+/******/ var {ids, modules, runtime} = data;
+/******/ // add "modules" to the modules object,
+/******/ // then flag all "ids" as loaded and fire callback
+/******/ var moduleId, chunkId, i = 0;
+/******/ for(moduleId in modules) {
+/******/ if(__webpack_require__.o(modules, moduleId)) {
+/******/ __webpack_require__.m[moduleId] = modules[moduleId];
+/******/ }
+/******/ }
+/******/ if(runtime) runtime(__webpack_require__);
+/******/ for(;i < ids.length; i++) {
+/******/ chunkId = ids[i];
+/******/ if(__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ installedChunks[chunkId][0]();
+/******/ }
+/******/ installedChunks[ids[i]] = 0;
+/******/ }
+/******/
+/******/ }, (e) => {
+/******/ if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;
+/******/ throw e;
+/******/ });
+/******/ var promise = Promise.race([promise, new Promise((resolve) => (installedChunkData = installedChunks[chunkId] = [resolve]))])
+/******/ promises.push(installedChunkData[1] = promise);
+/******/ } else installedChunks[chunkId] = 0;
+/******/ }
+/******/ }
+/******/ };
+/******/
+/******/ // no on chunks loaded
+/******/ })();
+/******/
+/************************************************************************/
+```
+
+/* webpack runtime code */
+
+``` js
+/************************************************************************/
+/******/ // The module cache
+/******/ var __webpack_module_cache__ = {};
+/******/
+/******/ // The require function
+/******/ function __webpack_require__(moduleId) {
+/******/ // Check if module is in cache
+/******/ var cachedModule = __webpack_module_cache__[moduleId];
+/******/ if (cachedModule !== undefined) {
+/******/ return cachedModule.exports;
+/******/ }
+/******/ // Create a new module (and put it into the cache)
+/******/ var module = __webpack_module_cache__[moduleId] = {
+/******/ // no module.id needed
+/******/ // no module.loaded needed
+/******/ exports: {}
+/******/ };
+/******/
+/******/ // Execute the module function
+/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/
+/******/ // Return the exports of the module
+/******/ return module.exports;
+/******/ }
+/******/
+/******/ // expose the modules object (__webpack_modules__)
+/******/ __webpack_require__.m = __webpack_modules__;
+/******/
+/************************************************************************/
+/******/ /* webpack/runtime/define property getters */
+/******/ (() => {
+/******/ // define getter functions for harmony exports
+/******/ __webpack_require__.d = (exports, definition) => {
+/******/ for(var key in definition) {
+/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ }
+/******/ }
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/ensure chunk */
+/******/ (() => {
+/******/ __webpack_require__.f = {};
+/******/ // This file contains only the entry chunk.
+/******/ // The chunk loading function for additional chunks
+/******/ __webpack_require__.e = (chunkId) => {
+/******/ return Promise.all(Object.keys(__webpack_require__.f).reduce((promises, key) => {
+/******/ __webpack_require__.f[key](chunkId, promises);
+/******/ return promises;
+/******/ }, []));
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/get javascript chunk filename */
+/******/ (() => {
+/******/ // This function allow to reference async chunks
+/******/ __webpack_require__.u = (chunkId) => {
+/******/ // return url for filenames based on template
+/******/ return "" + chunkId + ".js";
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/hasOwnProperty shorthand */
+/******/ (() => {
+/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ })();
+/******/
+/******/ /* webpack/runtime/make namespace object */
+/******/ (() => {
+/******/ // define __esModule on exports
+/******/ __webpack_require__.r = (exports) => {
+/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ }
+/******/ Object.defineProperty(exports, '__esModule', { value: true });
+/******/ };
+/******/ })();
+/******/
+/******/ /* webpack/runtime/import chunk loading */
+/******/ (() => {
+/******/ // no baseURI
+/******/
+/******/ // object to store loaded and loading chunks
+/******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched
+/******/ // [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
+/******/ var installedChunks = {
+/******/ 631: 0
+/******/ };
+/******/
+/******/ __webpack_require__.f.j = (chunkId, promises) => {
+/******/ // import() chunk loading for javascript
+/******/ var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;
+/******/ if(installedChunkData !== 0) { // 0 means "already installed".
+/******/
+/******/ // a Promise means "currently loading".
+/******/ if(installedChunkData) {
+/******/ promises.push(installedChunkData[1]);
+/******/ } else {
+/******/ if(true) { // all chunks have JS
+/******/ // setup Promise in chunk cache
+/******/ var promise = import("../" + __webpack_require__.u(chunkId)).then((data) => {
+/******/ var {ids, modules, runtime} = data;
+/******/ // add "modules" to the modules object,
+/******/ // then flag all "ids" as loaded and fire callback
+/******/ var moduleId, chunkId, i = 0;
+/******/ for(moduleId in modules) {
+/******/ if(__webpack_require__.o(modules, moduleId)) {
+/******/ __webpack_require__.m[moduleId] = modules[moduleId];
+/******/ }
+/******/ }
+/******/ if(runtime) runtime(__webpack_require__);
+/******/ for(;i < ids.length; i++) {
+/******/ chunkId = ids[i];
+/******/ if(__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) {
+/******/ installedChunks[chunkId][0]();
+/******/ }
+/******/ installedChunks[ids[i]] = 0;
+/******/ }
+/******/
+/******/ }, (e) => {
+/******/ if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;
+/******/ throw e;
+/******/ });
+/******/ var promise = Promise.race([promise, new Promise((resolve) => (installedChunkData = installedChunks[chunkId] = [resolve]))])
+/******/ promises.push(installedChunkData[1] = promise);
+/******/ } else installedChunks[chunkId] = 0;
+/******/ }
+/******/ }
+/******/ };
+/******/
+/******/ // no on chunks loaded
+/******/ })();
+/******/
+/************************************************************************/
+```
+
+Computing fibonacci without worker:
+
+
+ Computing fibonacci with worker:
+
+
+`;
+
+const history = document.getElementById("history");
+const message = document.getElementById("message");
+const send = document.getElementById("send");
+const fib1 = document.getElementById("fib1");
+const output1 = document.getElementById("output1");
+const fib2 = document.getElementById("fib2");
+const output2 = document.getElementById("output2");
+
+/// CHAT with shared worker ///
+
+const chatWorker = new SharedWorker(
+ new URL("./chat-worker.js", import.meta.url),
+ {
+ name: "chat",
+ type: "module"
+ }
+);
+
+let historyTimeout;
+const scheduleUpdateHistory = () => {
+ clearTimeout(historyTimeout);
+ historyTimeout = setTimeout(() => {
+ chatWorker.port.postMessage({ type: "history" });
+ }, 1000);
+};
+scheduleUpdateHistory();
+
+const from = `User ${Math.floor(Math.random() * 10000)}`;
+
+send.addEventListener("click", e => {
+ chatWorker.port.postMessage({
+ type: "message",
+ content: message.value,
+ from
+ });
+ message.value = "";
+ message.focus();
+ e.preventDefault();
+});
+
+chatWorker.port.onmessage = event => {
+ const msg = event.data;
+ switch (msg.type) {
+ case "history":
+ history.innerText = msg.history.join("\n");
+ scheduleUpdateHistory();
+ break;
+ }
+};
+
+/// FIBONACCI without worker ///
+
+fib1.addEventListener("change", async () => {
+ try {
+ const value = parseInt(fib1.value, 10);
+ const { fibonacci } = await import("./fibonacci");
+ const result = fibonacci(value);
+ output1.innerText = `fib(${value}) = ${result}`;
+ } catch (e) {
+ output1.innerText = e.message;
+ }
+});
+
+/// FIBONACCI with worker ///
+
+const fibWorker = new Worker(new URL("./fib-worker.js", import.meta.url), {
+ name: "fibonacci",
+ type: "module"
+ /* webpackEntryOptions: { filename: "workers/[name].js" } */
+});
+
+fib2.addEventListener("change", () => {
+ try {
+ const value = parseInt(fib2.value, 10);
+ fibWorker.postMessage(`${value}`);
+ } catch (e) {
+ output2.innerText = e.message;
+ }
+});
+
+fibWorker.onmessage = event => {
+ output2.innerText = event.data;
+};
diff --git a/examples/module-worker/fib-worker.js b/examples/module-worker/fib-worker.js
new file mode 100644
index 000000000..42efa83cf
--- /dev/null
+++ b/examples/module-worker/fib-worker.js
@@ -0,0 +1,5 @@
+onmessage = async event => {
+ const { fibonacci } = await import("./fibonacci");
+ const value = JSON.parse(event.data);
+ postMessage(`fib(${value}) = ${fibonacci(value)}`);
+};
diff --git a/examples/module-worker/fibonacci.js b/examples/module-worker/fibonacci.js
new file mode 100644
index 000000000..282fcec2f
--- /dev/null
+++ b/examples/module-worker/fibonacci.js
@@ -0,0 +1,3 @@
+export function fibonacci(n) {
+ return n < 1 ? 0 : n <= 2 ? 1 : fibonacci(n - 1) + fibonacci(n - 2);
+}
diff --git a/examples/module-worker/index.html b/examples/module-worker/index.html
new file mode 100644
index 000000000..e3b460bdf
--- /dev/null
+++ b/examples/module-worker/index.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Worker example
+
+
+
+
+
diff --git a/examples/module-worker/template.md b/examples/module-worker/template.md
new file mode 100644
index 000000000..6a93ddfd9
--- /dev/null
+++ b/examples/module-worker/template.md
@@ -0,0 +1,75 @@
+# example.js
+
+```javascript
+_{{example.js}}_
+```
+
+# fib-worker.js
+
+```javascript
+_{{fib-worker.js}}_
+```
+
+# fibonacci.js
+
+```javascript
+_{{fibonacci.js}}_
+```
+
+# chat-worker.js
+
+```javascript
+_{{chat-worker.js}}_
+```
+
+# chat-module.js
+
+```javascript
+_{{chat-module.js}}_
+```
+
+# dist/main.js
+
+```javascript
+_{{dist/main.js}}_
+```
+
+# dist/chat.js
+
+```javascript
+_{{dist/chat.js}}_
+```
+
+```javascript
+_{{production:dist/chat.js}}_
+```
+
+# dist/workers/fibonacci.js
+
+```javascript
+_{{dist/workers/fibonacci.js}}_
+```
+
+```javascript
+_{{production:dist/workers/fibonacci.js}}_
+```
+
+# dist/129.js
+
+```javascript
+_{{dist/129.js}}_
+```
+
+# Info
+
+## Unoptimized
+
+```
+_{{stdout}}_
+```
+
+## Production mode
+
+```
+_{{production:stdout}}_
+```
diff --git a/examples/module-worker/webpack.config.js b/examples/module-worker/webpack.config.js
new file mode 100644
index 000000000..c75e3aeb1
--- /dev/null
+++ b/examples/module-worker/webpack.config.js
@@ -0,0 +1,18 @@
+var path = require("path");
+
+module.exports = {
+ entry: "./example.js",
+ output: {
+ path: path.join(__dirname, "dist"),
+ filename: "[name].js",
+ chunkFilename: "[name].js",
+ publicPath: "/dist/"
+ },
+ optimization: {
+ chunkIds: "deterministic" // To keep filename consistent between different modes (for example building only)
+ },
+ target: "browserslist: last 2 Chrome versions",
+ experiments: {
+ outputModule: true
+ }
+};
diff --git a/examples/worker/README.md b/examples/worker/README.md
index 64be9aa68..162d82612 100644
--- a/examples/worker/README.md
+++ b/examples/worker/README.md
@@ -367,7 +367,7 @@ export const add = (content, from) => {
/******/ __webpack_require__.m[moduleId] = moreModules[moduleId];
/******/ }
/******/ }
-/******/ if(runtime) runtime(__webpack_require__);
+/******/ if(runtime) var result = runtime(__webpack_require__);
/******/ if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);
/******/ for(;i < chunkIds.length; i++) {
/******/ chunkId = chunkIds[i];
@@ -721,8 +721,8 @@ onmessage = async event => {
!*** ./fibonacci.js ***!
\**********************/
/*! namespace exports */
-/*! export fibonacci [provided] [maybe used in main, ./example.js|80:18-84:2 (runtime-defined)] [usage prevents renaming] */
-/*! other exports [not provided] [maybe used in main, ./example.js|80:18-84:2 (runtime-defined)] */
+/*! export fibonacci [provided] [maybe used in main, 9a81d90cfd0dfd13d748 (runtime-defined)] [usage prevents renaming] */
+/*! other exports [not provided] [maybe used in main, 9a81d90cfd0dfd13d748 (runtime-defined)] */
/*! runtime requirements: __webpack_require__.r, __webpack_exports__, __webpack_require__.d, __webpack_require__.* */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
@@ -746,36 +746,36 @@ function fibonacci(n) {
## Unoptimized
```
-asset main.js 12.2 KiB [emitted] (name: main)
+asset main.js 12.3 KiB [emitted] (name: main)
asset workers/fibonacci.js 5.43 KiB [emitted] (name: fibonacci)
-asset 129.js 937 bytes [emitted]
+asset 129.js 931 bytes [emitted]
asset chat.js 911 bytes [emitted] (name: chat)
-chunk (runtime: ./example.js|80:18-84:2, main) 129.js 103 bytes [rendered]
+chunk (runtime: 9a81d90cfd0dfd13d748, main) 129.js 103 bytes [rendered]
> ./fibonacci ./example.js 70:30-51
> ./fibonacci ./fib-worker.js 2:29-50
./fibonacci.js 103 bytes [built] [code generated]
[exports: fibonacci]
import() ./fibonacci ./example.js 70:30-51
import() ./fibonacci ./fib-worker.js 2:29-50
-chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.64 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.65 KiB (runtime) [entry] [rendered]
> ./example.js main
- runtime modules 5.64 KiB 8 modules
+ runtime modules 5.65 KiB 8 modules
./example.js 2.25 KiB [built] [code generated]
[no exports used]
entry ./example.js main
-chunk (runtime: ./example.js|25:19-31:1) chat.js (chat) 527 bytes [entry] [rendered]
+chunk (runtime: 1fad8bf8de78b0a77bfd) chat.js (chat) 527 bytes [entry] [rendered]
> ./example.js 25:19-31:1
./chat-worker.js + 1 modules 527 bytes [built] [code generated]
[no exports]
[no exports used]
new Worker() ./chat-worker.js ./example.js 25:19-31:1
-chunk (runtime: ./example.js|80:18-84:2) workers/fibonacci.js (fibonacci) 176 bytes (javascript) 2.14 KiB (runtime) [entry] [rendered]
+chunk (runtime: 9a81d90cfd0dfd13d748) workers/fibonacci.js (fibonacci) 176 bytes (javascript) 2.14 KiB (runtime) [entry] [rendered]
> ./example.js 80:18-84:2
runtime modules 2.14 KiB 7 modules
./fib-worker.js 176 bytes [built] [code generated]
[no exports used]
new Worker() ./fib-worker.js ./example.js 80:18-84:2
-webpack 5.27.2 compiled successfully
+webpack 5.40.0 compiled successfully
```
## Production mode
@@ -785,30 +785,30 @@ asset main.js 3.44 KiB [emitted] [minimized] (name: main)
asset workers/fibonacci.js 945 bytes [emitted] [minimized] (name: fibonacci)
asset chat.js 270 bytes [emitted] [minimized] (name: chat)
asset 129.js 166 bytes [emitted] [minimized]
-chunk (runtime: ./example.js|80:18-84:2, main) 129.js 103 bytes [rendered]
+chunk (runtime: 9a81d90cfd0dfd13d748, main) 129.js 103 bytes [rendered]
> ./fibonacci ./example.js 70:30-51
> ./fibonacci ./fib-worker.js 2:29-50
./fibonacci.js 103 bytes [built] [code generated]
[exports: fibonacci]
import() ./fibonacci ./example.js 70:30-51
import() ./fibonacci ./fib-worker.js 2:29-50
-chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.64 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.65 KiB (runtime) [entry] [rendered]
> ./example.js main
- runtime modules 5.64 KiB 8 modules
+ runtime modules 5.65 KiB 8 modules
./example.js 2.25 KiB [built] [code generated]
[no exports used]
entry ./example.js main
-chunk (runtime: ./example.js|25:19-31:1) chat.js (chat) 527 bytes [entry] [rendered]
+chunk (runtime: 1fad8bf8de78b0a77bfd) chat.js (chat) 527 bytes [entry] [rendered]
> ./example.js 25:19-31:1
./chat-worker.js + 1 modules 527 bytes [built] [code generated]
[no exports]
[no exports used]
new Worker() ./chat-worker.js ./example.js 25:19-31:1
-chunk (runtime: ./example.js|80:18-84:2) workers/fibonacci.js (fibonacci) 176 bytes (javascript) 2.14 KiB (runtime) [entry] [rendered]
+chunk (runtime: 9a81d90cfd0dfd13d748) workers/fibonacci.js (fibonacci) 176 bytes (javascript) 2.14 KiB (runtime) [entry] [rendered]
> ./example.js 80:18-84:2
runtime modules 2.14 KiB 7 modules
./fib-worker.js 176 bytes [built] [code generated]
[no exports used]
new Worker() ./fib-worker.js ./example.js 80:18-84:2
-webpack 5.27.2 compiled successfully
+webpack 5.40.0 compiled successfully
```
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
index 832576199..1aa7a982c 100644
--- a/lib/WebpackOptionsApply.js
+++ b/lib/WebpackOptionsApply.js
@@ -318,7 +318,8 @@ class WebpackOptionsApply extends OptionsApply {
new URLPlugin().apply(compiler);
new WorkerPlugin(
options.output.workerChunkLoading,
- options.output.workerWasmLoading
+ options.output.workerWasmLoading,
+ options.output.module
).apply(compiler);
new DefaultStatsFactoryPlugin().apply(compiler);
diff --git a/lib/dependencies/WorkerPlugin.js b/lib/dependencies/WorkerPlugin.js
index 4f3416e42..0db34d73a 100644
--- a/lib/dependencies/WorkerPlugin.js
+++ b/lib/dependencies/WorkerPlugin.js
@@ -48,9 +48,10 @@ const DEFAULT_SYNTAX = [
const workerIndexMap = new WeakMap();
class WorkerPlugin {
- constructor(chunkLoading, wasmLoading) {
+ constructor(chunkLoading, wasmLoading, module) {
this._chunkLoading = chunkLoading;
this._wasmLoading = wasmLoading;
+ this._module = module;
}
/**
* Apply the plugin
@@ -311,31 +312,45 @@ class WorkerPlugin {
if (expressions.type) {
const expr = expressions.type;
if (options.type !== false) {
- const dep = new ConstDependency("undefined", expr.range);
+ const dep = new ConstDependency(
+ this._module ? '"module"' : "undefined",
+ expr.range
+ );
dep.loc = expr.loc;
parser.state.module.addPresentationalDependency(dep);
expressions.type = undefined;
}
- } else if (hasSpreadInOptions && insertType === "comma") {
- const dep = new ConstDependency(
- ", type: undefined",
- insertLocation
- );
- dep.loc = expr.loc;
- parser.state.module.addPresentationalDependency(dep);
+ } else if (insertType === "comma") {
+ if (this._module || hasSpreadInOptions) {
+ const dep = new ConstDependency(
+ `, type: ${this._module ? '"module"' : "undefined"}`,
+ insertLocation
+ );
+ dep.loc = expr.loc;
+ parser.state.module.addPresentationalDependency(dep);
+ }
} else if (insertType === "spread") {
const dep1 = new ConstDependency(
"Object.assign({}, ",
insertLocation[0]
);
const dep2 = new ConstDependency(
- ", { type: undefined })",
+ `, { type: ${this._module ? '"module"' : "undefined"} })`,
insertLocation[1]
);
dep1.loc = expr.loc;
dep2.loc = expr.loc;
parser.state.module.addPresentationalDependency(dep1);
parser.state.module.addPresentationalDependency(dep2);
+ } else if (insertType === "argument") {
+ if (this._module) {
+ const dep = new ConstDependency(
+ ', { type: "module" }',
+ insertLocation
+ );
+ dep.loc = expr.loc;
+ parser.state.module.addPresentationalDependency(dep);
+ }
}
parser.walkExpression(expr.callee);
diff --git a/lib/esm/ModuleChunkLoadingRuntimeModule.js b/lib/esm/ModuleChunkLoadingRuntimeModule.js
index ebeadc5d9..76af7d157 100644
--- a/lib/esm/ModuleChunkLoadingRuntimeModule.js
+++ b/lib/esm/ModuleChunkLoadingRuntimeModule.js
@@ -116,7 +116,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
"chunkId, promises",
hasJsMatcher !== false
? Template.indent([
- "// JSONP chunk loading for javascript",
+ "// import() chunk loading for javascript",
`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
'if(installedChunkData !== 0) { // 0 means "already installed".',
Template.indent([