diff --git a/package.json b/package.json index 1383b3f9..e1f58165 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "vm2": "^3.6.6", "vue": "^2.5.17", "vue-server-renderer": "^2.5.17", - "webpack": "5.0.0-alpha.12", + "webpack": "5.0.0-alpha.16", "when": "^3.7.8", "yoga-layout": "^1.9.3" } diff --git a/test/unit/externals/output-coverage.js b/test/unit/externals/output-coverage.js index 783fc782..ca362203 100644 --- a/test/unit/externals/output-coverage.js +++ b/test/unit/externals/output-coverage.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(613); +/******/ return __webpack_require__(157); /******/ }; /******/ /******/ // run startup @@ -42,14 +42,7 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 306: -/***/ (function(module) { - -module.exports = require("externalmapped"); - -/***/ }), - -/***/ 613: +/***/ 157: /***/ (function(__unusedmodule, __unusedexports, __webpack_require__) { const external = __webpack_require__(306); @@ -57,6 +50,13 @@ const external = __webpack_require__(306); console.log(external); +/***/ }), + +/***/ 306: +/***/ (function(module) { + +module.exports = require("externalmapped"); + /***/ }) /******/ }); \ No newline at end of file diff --git a/test/unit/externals/output.js b/test/unit/externals/output.js index 5258bdec..5515062c 100644 --- a/test/unit/externals/output.js +++ b/test/unit/externals/output.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(586); +/******/ return __webpack_require__(369); /******/ }; /******/ /******/ // run startup @@ -49,7 +49,7 @@ module.exports = require("externalmapped"); /***/ }), -/***/ 586: +/***/ 369: /***/ (function(__unusedmodule, __unusedexports, __webpack_require__) { const external = __webpack_require__(306); diff --git a/test/unit/runtime-notfound/output-coverage.js b/test/unit/runtime-notfound/output-coverage.js index fdb9922e..0f530efc 100644 --- a/test/unit/runtime-notfound/output-coverage.js +++ b/test/unit/runtime-notfound/output-coverage.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(226); +/******/ return __webpack_require__(159); /******/ }; /******/ /******/ // run startup @@ -42,26 +42,26 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 226: +/***/ 159: /***/ (function(__unusedmodule, __unusedexports, __webpack_require__) { -__webpack_require__(590); -__webpack_require__(548); +__webpack_require__(464); +__webpack_require__(497); /***/ }), -/***/ 548: +/***/ 464: /***/ (function() { -eval("require")("./not-foud2.js"); +eval("require")("./not-found.js"); /***/ }), -/***/ 590: +/***/ 497: /***/ (function() { -eval("require")("./not-found.js"); +eval("require")("./not-foud2.js"); /***/ }) diff --git a/test/unit/runtime-notfound/output.js b/test/unit/runtime-notfound/output.js index 5ab9a70a..10b35a07 100644 --- a/test/unit/runtime-notfound/output.js +++ b/test/unit/runtime-notfound/output.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(768); +/******/ return __webpack_require__(44); /******/ }; /******/ /******/ // run startup @@ -42,26 +42,26 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 663: -/***/ (function() { - -eval("require")("./not-foud2.js"); +/***/ 44: +/***/ (function(__unusedmodule, __unusedexports, __webpack_require__) { +__webpack_require__(367); +__webpack_require__(695); /***/ }), -/***/ 768: -/***/ (function(__unusedmodule, __unusedexports, __webpack_require__) { +/***/ 367: +/***/ (function() { + +eval("require")("./not-found.js"); -__webpack_require__(925); -__webpack_require__(663); /***/ }), -/***/ 925: +/***/ 695: /***/ (function() { -eval("require")("./not-found.js"); +eval("require")("./not-foud2.js"); /***/ }) diff --git a/test/unit/shebang/output-coverage.js b/test/unit/shebang/output-coverage.js index 0725dc40..2d7cae7a 100644 --- a/test/unit/shebang/output-coverage.js +++ b/test/unit/shebang/output-coverage.js @@ -34,7 +34,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(374); +/******/ return __webpack_require__(937); /******/ }; /******/ /******/ // run startup @@ -43,7 +43,7 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 374: +/***/ 937: /***/ (function(module) { module.exports = 'asdf'; diff --git a/test/unit/shebang/output.js b/test/unit/shebang/output.js index 4ac0ac50..700c3afc 100644 --- a/test/unit/shebang/output.js +++ b/test/unit/shebang/output.js @@ -34,7 +34,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(780); +/******/ return __webpack_require__(971); /******/ }; /******/ /******/ // run startup @@ -43,7 +43,7 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 780: +/***/ 971: /***/ (function(module) { module.exports = 'asdf'; diff --git a/test/unit/ts-decl/output-coverage.js b/test/unit/ts-decl/output-coverage.js index 99c12358..a6973e53 100644 --- a/test/unit/ts-decl/output-coverage.js +++ b/test/unit/ts-decl/output-coverage.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(326); +/******/ return __webpack_require__(345); /******/ }; /******/ // initialize runtime /******/ runtime(__webpack_require__); @@ -44,29 +44,29 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 37: -/***/ (function(__unusedmodule, exports) { +/***/ 345: +/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(563); +/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_ts__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_ts__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __webpack_require__.d(__webpack_exports__, __WEBPACK_IMPORT_KEY__, function(key) { return _test_ts__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)); -exports.__esModule = true; -function test(arg) { - return arg; -} -exports.test = test; /***/ }), -/***/ 326: -/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) { +/***/ 563: +/***/ (function(__unusedmodule, exports) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(37); -/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_ts__WEBPACK_IMPORTED_MODULE_0__); -/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_ts__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __webpack_require__.d(__webpack_exports__, __WEBPACK_IMPORT_KEY__, function(key) { return _test_ts__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)); +exports.__esModule = true; +function test(arg) { + return arg; +} +exports.test = test; /***/ }) diff --git a/test/unit/ts-decl/output.js b/test/unit/ts-decl/output.js index 75422d30..b12eda06 100644 --- a/test/unit/ts-decl/output.js +++ b/test/unit/ts-decl/output.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(315); +/******/ return __webpack_require__(582); /******/ }; /******/ // initialize runtime /******/ runtime(__webpack_require__); @@ -44,29 +44,29 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 315: -/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) { +/***/ 250: +/***/ (function(__unusedmodule, exports) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(765); -/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_ts__WEBPACK_IMPORTED_MODULE_0__); -/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_ts__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __webpack_require__.d(__webpack_exports__, __WEBPACK_IMPORT_KEY__, function(key) { return _test_ts__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)); +exports.__esModule = true; +function test(arg) { + return arg; +} +exports.test = test; /***/ }), -/***/ 765: -/***/ (function(__unusedmodule, exports) { +/***/ 582: +/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(250); +/* harmony import */ var _test_ts__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_ts__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_ts__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __webpack_require__.d(__webpack_exports__, __WEBPACK_IMPORT_KEY__, function(key) { return _test_ts__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)); -exports.__esModule = true; -function test(arg) { - return arg; -} -exports.test = test; /***/ }) diff --git a/test/unit/tsconfig-paths-conflicting-external/output-coverage.js b/test/unit/tsconfig-paths-conflicting-external/output-coverage.js index dc2ea4e3..e369ee72 100644 --- a/test/unit/tsconfig-paths-conflicting-external/output-coverage.js +++ b/test/unit/tsconfig-paths-conflicting-external/output-coverage.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(22); +/******/ return __webpack_require__(777); /******/ }; /******/ /******/ // run startup @@ -42,25 +42,25 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 22: -/***/ (function(__unusedmodule, exports, __webpack_require__) { +/***/ 775: +/***/ (function(__unusedmodule, exports) { "use strict"; exports.__esModule = true; -var _module_1 = __webpack_require__(793); -console.log(_module_1["default"]); +exports["default"] = {}; /***/ }), -/***/ 793: -/***/ (function(__unusedmodule, exports) { +/***/ 777: +/***/ (function(__unusedmodule, exports, __webpack_require__) { "use strict"; exports.__esModule = true; -exports["default"] = {}; +var _module_1 = __webpack_require__(775); +console.log(_module_1["default"]); /***/ }) diff --git a/test/unit/tsconfig-paths-conflicting-external/output.js b/test/unit/tsconfig-paths-conflicting-external/output.js index 826004d5..213714f2 100644 --- a/test/unit/tsconfig-paths-conflicting-external/output.js +++ b/test/unit/tsconfig-paths-conflicting-external/output.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(513); +/******/ return __webpack_require__(213); /******/ }; /******/ /******/ // run startup @@ -42,22 +42,22 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 513: -/***/ (function(__unusedmodule, exports, __webpack_require__) { - -"use strict"; +/***/ 17: +/***/ (function() { -exports.__esModule = true; -var _module_1 = __webpack_require__(545); -console.log(_module_1["default"]); +eval("require")("@module"); /***/ }), -/***/ 545: -/***/ (function() { +/***/ 213: +/***/ (function(__unusedmodule, exports, __webpack_require__) { -eval("require")("@module"); +"use strict"; + +exports.__esModule = true; +var _module_1 = __webpack_require__(17); +console.log(_module_1["default"]); /***/ }) diff --git a/test/unit/tsconfig-paths/output-coverage.js b/test/unit/tsconfig-paths/output-coverage.js index ca7b7514..65518eba 100644 --- a/test/unit/tsconfig-paths/output-coverage.js +++ b/test/unit/tsconfig-paths/output-coverage.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(134); +/******/ return __webpack_require__(532); /******/ }; /******/ /******/ // run startup @@ -42,25 +42,25 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 134: -/***/ (function(__unusedmodule, exports, __webpack_require__) { +/***/ 520: +/***/ (function(__unusedmodule, exports) { "use strict"; exports.__esModule = true; -var _module_1 = __webpack_require__(254); -console.log(_module_1["default"]); +exports["default"] = {}; /***/ }), -/***/ 254: -/***/ (function(__unusedmodule, exports) { +/***/ 532: +/***/ (function(__unusedmodule, exports, __webpack_require__) { "use strict"; exports.__esModule = true; -exports["default"] = {}; +var _module_1 = __webpack_require__(520); +console.log(_module_1["default"]); /***/ }) diff --git a/test/unit/tsconfig-paths/output.js b/test/unit/tsconfig-paths/output.js index 001ccb0a..04194837 100644 --- a/test/unit/tsconfig-paths/output.js +++ b/test/unit/tsconfig-paths/output.js @@ -33,7 +33,7 @@ module.exports = /******/ // the startup function /******/ function startup() { /******/ // Load entry module and return exports -/******/ return __webpack_require__(121); +/******/ return __webpack_require__(879); /******/ }; /******/ /******/ // run startup @@ -42,22 +42,22 @@ module.exports = /************************************************************************/ /******/ ({ -/***/ 121: -/***/ (function(__unusedmodule, exports, __webpack_require__) { - -"use strict"; +/***/ 17: +/***/ (function() { -exports.__esModule = true; -var _module_1 = __webpack_require__(545); -console.log(_module_1["default"]); +eval("require")("@module"); /***/ }), -/***/ 545: -/***/ (function() { +/***/ 879: +/***/ (function(__unusedmodule, exports, __webpack_require__) { -eval("require")("@module"); +"use strict"; + +exports.__esModule = true; +var _module_1 = __webpack_require__(17); +console.log(_module_1["default"]); /***/ }) diff --git a/yarn.lock b/yarn.lock index 7ffbec4b..b275b630 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5154,6 +5154,11 @@ glob-stream@^6.1.0: to-absolute-glob "^2.0.0" unique-stream "^2.0.2" +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.2: version "7.1.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" @@ -8281,7 +8286,7 @@ micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -8695,6 +8700,11 @@ neo-async@^2.5.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== +neo-async@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + netmask@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35" @@ -13281,10 +13291,10 @@ webpack-sources@^1.1.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@5.0.0-alpha.12: - version "5.0.0-alpha.12" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.0.0-alpha.12.tgz#c9b24a8bbb4fecb62c47f3d4f3fb2c3939508d44" - integrity sha512-h7evpScCRdMUmV5/EdH2eupucZkmK0v53YxYChSwsPqirgksCz0Ob3b/LCMXauJYk8SnaJ9Ff11OSMIpSB5MTQ== +webpack@5.0.0-alpha.16: + version "5.0.0-alpha.16" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.0.0-alpha.16.tgz#95c880ec923f5d1228e6d34853ee0b4346421af5" + integrity sha512-sMcHUapRGT/rsCy2C1ugvrIJA3J+ysayMO+BCDQj+W9PbU/f+knyINXVx3U2QsqVMCFMYF67GsWwiEJDOomang== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" @@ -13299,13 +13309,13 @@ webpack@5.0.0-alpha.12: eslint-scope "^4.0.0" events "^3.0.0" find-cache-dir "^2.1.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.15" json-parse-better-errors "^1.0.2" loader-runner "3.0.0" loader-utils "^1.1.0" memory-fs "~0.4.1" - micromatch "^3.1.8" - mkdirp "~0.5.0" - neo-async "^2.5.0" + neo-async "^2.6.0" schema-utils "^1.0.0" tapable "2.0.0-beta.4" terser-webpack-plugin "^1.2.1"