diff --git a/package.json b/package.json index d472ba02..fcaab576 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "vue": "^2.5.17", "vue-server-renderer": "^2.5.17", "web-vitals": "^0.2.4", - "webpack": "5.44.0", + "webpack": "5.61.0", "when": "^3.7.8" }, "resolutions": { diff --git a/test/unit/bundle-subasset/output.js b/test/unit/bundle-subasset/output.js index 8ba72bcc..db50e5fc 100644 --- a/test/unit/bundle-subasset/output.js +++ b/test/unit/bundle-subasset/output.js @@ -2,7 +2,7 @@ /******/ "use strict"; /******/ var __webpack_modules__ = ({ -/***/ 622: +/***/ 17: /***/ ((module) => { module.exports = require("path"); @@ -91,7 +91,7 @@ var __webpack_exports__ = {}; // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. (() => { __nccwpck_require__.r(__webpack_exports__); -/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(622); +/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(17); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(path__WEBPACK_IMPORTED_MODULE_0__); diff --git a/test/unit/custom-emit/output.js b/test/unit/custom-emit/output.js index e860540f..7af3db9b 100644 --- a/test/unit/custom-emit/output.js +++ b/test/unit/custom-emit/output.js @@ -1,7 +1,7 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 747: +/***/ 147: /***/ ((module) => { "use strict"; @@ -50,7 +50,7 @@ module.exports = require("fs"); var __webpack_exports__ = {}; // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. (() => { -const { readFileSync } = __nccwpck_require__(747); +const { readFileSync } = __nccwpck_require__(147); console.log(readFileSync(__dirname + './test.json')); diff --git a/test/unit/double-nested-builds/output.js b/test/unit/double-nested-builds/output.js index d586927f..e6038738 100644 --- a/test/unit/double-nested-builds/output.js +++ b/test/unit/double-nested-builds/output.js @@ -128,7 +128,7 @@ /***/ ((module) => { "use strict"; -module.exports = __nccwpck_require__(622); +module.exports = __nccwpck_require__(17); /***/ }) @@ -182,7 +182,7 @@ module.exports = __nccwpck_require__(622); /***/ }), -/***/ 622: +/***/ 17: /***/ ((module) => { "use strict"; diff --git a/test/unit/exports-nomodule/output.js b/test/unit/exports-nomodule/output.js index 376d6075..63d25ba8 100644 --- a/test/unit/exports-nomodule/output.js +++ b/test/unit/exports-nomodule/output.js @@ -1,4 +1,3 @@ -/******/ "use strict"; /******/ /* webpack/runtime/compat */ /******/ /******/ if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = new URL('.', import.meta.url).pathname.slice(import.meta.url.match(/^file:\/\/\/\w:/) ? 1 : 0, -1) + "/"; diff --git a/test/unit/exports-wildcard/output.js b/test/unit/exports-wildcard/output.js index 2d0fa3ae..36cc6b47 100644 --- a/test/unit/exports-wildcard/output.js +++ b/test/unit/exports-wildcard/output.js @@ -1,4 +1,3 @@ -/******/ "use strict"; /******/ /* webpack/runtime/compat */ /******/ /******/ if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = new URL('.', import.meta.url).pathname.slice(import.meta.url.match(/^file:\/\/\/\w:/) ? 1 : 0, -1) + "/"; diff --git a/test/unit/externals/output.js b/test/unit/externals/output.js index 37ad607a..50eaa538 100644 --- a/test/unit/externals/output.js +++ b/test/unit/externals/output.js @@ -1,7 +1,7 @@ /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 306: +/***/ 830: /***/ ((module) => { "use strict"; @@ -9,7 +9,7 @@ module.exports = require("externalmapped"); /***/ }), -/***/ 196: +/***/ 958: /***/ ((module) => { "use strict"; @@ -58,8 +58,8 @@ module.exports = require("regexexternal"); var __webpack_exports__ = {}; // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. (() => { -const external = __nccwpck_require__(306); -const regexpExternal = __nccwpck_require__(196); +const external = __nccwpck_require__(830); +const regexpExternal = __nccwpck_require__(958); console.log(external); console.log(regexpExternal); diff --git a/test/unit/imports/output.js b/test/unit/imports/output.js index 1c32d92c..c9cf2863 100644 --- a/test/unit/imports/output.js +++ b/test/unit/imports/output.js @@ -1,4 +1,3 @@ -/******/ "use strict"; /******/ /* webpack/runtime/compat */ /******/ /******/ if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = new URL('.', import.meta.url).pathname.slice(import.meta.url.match(/^file:\/\/\/\w:/) ? 1 : 0, -1) + "/"; diff --git a/test/unit/minify-err/output.js b/test/unit/minify-err/output.js index 7479315a..0ea68bff 100644 --- a/test/unit/minify-err/output.js +++ b/test/unit/minify-err/output.js @@ -16,7 +16,7 @@ module.exports = webpackEmptyContext; /***/ }), -/***/ 747: +/***/ 147: /***/ ((module) => { "use strict"; @@ -71,7 +71,7 @@ var __webpack_exports__ = {}; // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. (() => { if (global.GENTLY) __nccwpck_require__(875) = GENTLY.hijack(eval("require")); -console.log(__nccwpck_require__(747)); +console.log(__nccwpck_require__(147)); })(); diff --git a/test/unit/nested-builds/output.js b/test/unit/nested-builds/output.js index 38689961..30e39110 100644 --- a/test/unit/nested-builds/output.js +++ b/test/unit/nested-builds/output.js @@ -11,7 +11,7 @@ /***/ 622: /***/ ((module) => { - module.exports = __nccwpck_require__(622); + module.exports = __nccwpck_require__(17); /***/ }) @@ -118,7 +118,7 @@ /***/ }), -/***/ 622: +/***/ 17: /***/ ((module) => { "use strict"; diff --git a/test/unit/ts-exts/output.js b/test/unit/ts-exts/output.js index bff675cc..a6bf1111 100644 --- a/test/unit/ts-exts/output.js +++ b/test/unit/ts-exts/output.js @@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.default = {}; +exports["default"] = {}; /***/ }), @@ -17,7 +17,7 @@ exports.default = {}; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.default = void 0; +exports["default"] = void 0; var dep_dep_js_1 = __nccwpck_require__(668); Object.defineProperty(exports, "default", ({ enumerable: true, get: function () { return dep_dep_js_1.default; } })); diff --git a/test/watcher.test.js b/test/watcher.test.js index f1280bd7..4bce804b 100644 --- a/test/watcher.test.js +++ b/test/watcher.test.js @@ -71,7 +71,7 @@ class CustomWatchFileSystem { this.paused = false; this.changeCallback = changeCallback; - // ...Start watching files, dirs, mising + // ...Start watching files, dirs, missing setImmediate(() => { this.watchStart(files, dirs, missing); }); @@ -101,7 +101,6 @@ it('Should support custom watch API', async () => { await new Promise((resolve, reject) => { const watcher = new CustomWatchFileSystem(function watchStart (files, dirs, missing) { expect(files._set.size).toBeGreaterThan(100); - expect(missing._set.size).toBeGreaterThan(40); if (buildCnt < 3) { setTimeout(() => { // NOTE: We actually have to make the change for the rebuild to happen! diff --git a/yarn.lock b/yarn.lock index dacaaa10..ab6810f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2116,6 +2116,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== +"@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + "@types/keygrip@*": version "1.0.2" resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72" @@ -2499,6 +2504,11 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" +acorn-import-assertions@^1.7.6: + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== + acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1: version "1.8.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" @@ -5477,10 +5487,10 @@ enhanced-resolve@^5.7.0: graceful-fs "^4.2.4" tapable "^2.2.0" -enhanced-resolve@^5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz#d9deae58f9d3773b6a111a5a46831da5be5c9ac0" - integrity sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ== +enhanced-resolve@^5.8.3: + version "5.8.3" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -5555,10 +5565,10 @@ es-abstract@^1.18.0-next.2: string.prototype.trimstart "^1.0.4" unbox-primitive "^1.0.0" -es-module-lexer@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d" - integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw== +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== es-to-primitive@^1.2.1: version "1.2.1" @@ -13025,6 +13035,15 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" +schema-utils@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + scmp@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a" @@ -13507,7 +13526,7 @@ sorted-union-stream@~2.1.3: from2 "^1.3.0" stream-iterate "^1.1.0" -source-list-map@^2.0.0, source-list-map@^2.0.1: +source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== @@ -15302,18 +15321,15 @@ webpack-sources@^1.2.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack-sources@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa" - integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ== - dependencies: - source-list-map "^2.0.1" - source-map "^0.6.1" +webpack-sources@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.1.tgz#251a7d9720d75ada1469ca07dbb62f3641a05b6d" + integrity sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA== -webpack@5.44.0: - version "5.44.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.44.0.tgz#97b13a02bd79fb71ac6301ce697920660fa214a1" - integrity sha512-I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ== +webpack@5.61.0: + version "5.61.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.61.0.tgz#fa827f0ee9bdfd141dd73c3e891e955ebd52fe7f" + integrity sha512-fPdTuaYZ/GMGFm4WrPi2KRCqS1vDp773kj9S0iI5Uc//5cszsFEDgHNaX4Rj1vobUiU1dFIV3mA9k1eHeluFpw== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -15321,10 +15337,11 @@ webpack@5.44.0: "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" acorn "^8.4.1" + acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.8.0" - es-module-lexer "^0.7.1" + enhanced-resolve "^5.8.3" + es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" @@ -15333,11 +15350,11 @@ webpack@5.44.0: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.0.0" + schema-utils "^3.1.0" tapable "^2.1.1" terser-webpack-plugin "^5.1.3" watchpack "^2.2.0" - webpack-sources "^2.3.0" + webpack-sources "^3.2.0" websocket-driver@>=0.5.1: version "0.7.4"