Unverified Commit 4b33cef9 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

upgrade to webpack 5.47.0 and webpack-sources 3.1.1 (#27538)

* improve source-map performance
* improve watch performance
* bugfixes
* improvements to Data URIs
parent f5ee9ed5
{ {
"dependencies": { "dependencies": {
"schema-utils3": "npm:schema-utils@3.0.0", "schema-utils3": "npm:schema-utils@3.0.0",
"webpack-sources2": "npm:webpack-sources@2.3.0", "webpack-sources3": "npm:webpack-sources@3.1.1",
"webpack5": "npm:webpack@5.44.0" "webpack5": "npm:webpack@5.47.0"
}, },
"resolutions": { "resolutions": {
"browserslist": "4.16.6", "browserslist": "4.16.6",
......
...@@ -9,6 +9,7 @@ var $interceptModuleExecution$ = undefined; ...@@ -9,6 +9,7 @@ var $interceptModuleExecution$ = undefined;
var $moduleCache$ = undefined; var $moduleCache$ = undefined;
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
var $hmrModuleData$ = undefined; var $hmrModuleData$ = undefined;
/** @type {() => Promise} */
var $hmrDownloadManifest$ = undefined; var $hmrDownloadManifest$ = undefined;
var $hmrDownloadUpdateHandlers$ = undefined; var $hmrDownloadUpdateHandlers$ = undefined;
var $hmrInvalidateModuleHandlers$ = undefined; var $hmrInvalidateModuleHandlers$ = undefined;
...@@ -209,8 +210,12 @@ module.exports = function () { ...@@ -209,8 +210,12 @@ module.exports = function () {
function setStatus(newStatus) { function setStatus(newStatus) {
currentStatus = newStatus; currentStatus = newStatus;
var results = [];
for (var i = 0; i < registeredStatusHandlers.length; i++) for (var i = 0; i < registeredStatusHandlers.length; i++)
registeredStatusHandlers[i].call(null, newStatus); results[i] = registeredStatusHandlers[i].call(null, newStatus);
return Promise.all(results);
} }
function trackBlockingPromise(promise) { function trackBlockingPromise(promise) {
...@@ -219,7 +224,7 @@ module.exports = function () { ...@@ -219,7 +224,7 @@ module.exports = function () {
setStatus("prepare"); setStatus("prepare");
blockingPromises.push(promise); blockingPromises.push(promise);
waitForBlockingPromises(function () { waitForBlockingPromises(function () {
setStatus("ready"); return setStatus("ready");
}); });
return promise; return promise;
case "prepare": case "prepare":
...@@ -243,47 +248,47 @@ module.exports = function () { ...@@ -243,47 +248,47 @@ module.exports = function () {
if (currentStatus !== "idle") { if (currentStatus !== "idle") {
throw new Error("check() is only allowed in idle status"); throw new Error("check() is only allowed in idle status");
} }
setStatus("check"); return setStatus("check")
return $hmrDownloadManifest$().then(function (update) { .then($hmrDownloadManifest$)
if (!update) { .then(function (update) {
setStatus(applyInvalidatedModules() ? "ready" : "idle"); if (!update) {
return null; return setStatus(applyInvalidatedModules() ? "ready" : "idle");
} }
setStatus("prepare");
var updatedModules = [];
blockingPromises = [];
currentUpdateApplyHandlers = [];
return Promise.all(
Object.keys($hmrDownloadUpdateHandlers$).reduce(function (
promises,
key
) {
$hmrDownloadUpdateHandlers$[key](
update.c,
update.r,
update.m,
promises,
currentUpdateApplyHandlers,
updatedModules
);
return promises;
},
[])
).then(function () {
return waitForBlockingPromises(function () {
if (applyOnUpdate) {
return internalApply(applyOnUpdate);
} else {
setStatus("ready");
return updatedModules; return setStatus("prepare").then(function () {
} var updatedModules = [];
blockingPromises = [];
currentUpdateApplyHandlers = [];
return Promise.all(
Object.keys($hmrDownloadUpdateHandlers$).reduce(function (
promises,
key
) {
$hmrDownloadUpdateHandlers$[key](
update.c,
update.r,
update.m,
promises,
currentUpdateApplyHandlers,
updatedModules
);
return promises;
},
[])
).then(function () {
return waitForBlockingPromises(function () {
if (applyOnUpdate) {
return internalApply(applyOnUpdate);
} else {
return setStatus("ready").then(function () {
return updatedModules;
});
}
});
});
}); });
}); });
});
} }
function hotApply(options) { function hotApply(options) {
...@@ -312,21 +317,20 @@ module.exports = function () { ...@@ -312,21 +317,20 @@ module.exports = function () {
.filter(Boolean); .filter(Boolean);
if (errors.length > 0) { if (errors.length > 0) {
setStatus("abort"); return setStatus("abort").then(function () {
return Promise.resolve().then(function () {
throw errors[0]; throw errors[0];
}); });
} }
// Now in "dispose" phase // Now in "dispose" phase
setStatus("dispose"); var disposePromise = setStatus("dispose");
results.forEach(function (result) { results.forEach(function (result) {
if (result.dispose) result.dispose(); if (result.dispose) result.dispose();
}); });
// Now in "apply" phase // Now in "apply" phase
setStatus("apply"); var applyPromise = setStatus("apply");
var error; var error;
var reportError = function (err) { var reportError = function (err) {
...@@ -345,25 +349,27 @@ module.exports = function () { ...@@ -345,25 +349,27 @@ module.exports = function () {
} }
}); });
// handle errors in accept handlers and self accepted module load return Promise.all([disposePromise, applyPromise]).then(function () {
if (error) { // handle errors in accept handlers and self accepted module load
setStatus("fail"); if (error) {
return Promise.resolve().then(function () { return setStatus("fail").then(function () {
throw error; throw error;
}); });
} }
if (queuedInvalidatedModules) { if (queuedInvalidatedModules) {
return internalApply(options).then(function (list) { return internalApply(options).then(function (list) {
outdatedModules.forEach(function (moduleId) { outdatedModules.forEach(function (moduleId) {
if (list.indexOf(moduleId) < 0) list.push(moduleId); if (list.indexOf(moduleId) < 0) list.push(moduleId);
});
return list;
}); });
return list; }
});
}
setStatus("idle"); return setStatus("idle").then(function () {
return Promise.resolve(outdatedModules); return outdatedModules;
});
});
} }
function applyInvalidatedModules() { function applyInvalidatedModules() {
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
"@types/estree" "*" "@types/estree" "*"
"@types/eslint@*": "@types/eslint@*":
version "7.2.14" version "7.28.0"
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.14.tgz#088661518db0c3c23089ab45900b99dd9214b92a" resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
integrity sha512-pESyhSbUOskqrGcaN+bCXIQDyT5zTaRWfj5ZjjSlMatgGjIn3QQPfocAu4WSabUR7CGyLZ2CQaZyISOEX7/saw== integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
dependencies: dependencies:
"@types/estree" "*" "@types/estree" "*"
"@types/json-schema" "*" "@types/json-schema" "*"
...@@ -23,15 +23,15 @@ ...@@ -23,15 +23,15 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
"@types/json-schema@*", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7": "@types/json-schema@*", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.8":
version "7.0.8" version "7.0.8"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
"@types/node@*": "@types/node@*":
version "16.0.0" version "16.4.4"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.0.tgz#067a6c49dc7a5c2412a505628e26902ae967bf6f" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.4.tgz#bb0744c1dcc1fc374f51d3fd41d028331a2420d4"
integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg== integrity sha512-BH/jX0HjzElFCQdAwaEMwuGBQwm6ViDZ00X6LKdnRRmGWOzkWugEH4+7a0BwfHQ8DfPPCSd/mdsm3Nu8FKFu0w==
"@webassemblyjs/ast@1.11.1": "@webassemblyjs/ast@1.11.1":
version "1.11.1" version "1.11.1"
...@@ -221,9 +221,9 @@ commander@^2.20.0: ...@@ -221,9 +221,9 @@ commander@^2.20.0:
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
electron-to-chromium@^1.3.723: electron-to-chromium@^1.3.723:
version "1.3.769" version "1.3.789"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.769.tgz#73ad7e3f2d435810b6f8b29617ec344c782fcbed" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.789.tgz#c3ea060ba1e36e41c87943a47ed2daadc545be2b"
integrity sha512-B+3hW8D76/uoTPSobWI3D/CFn2S4jPn88dVJ+BkD88Lz6LijQpL+hfdzIFJGTQK4KdE0XwmNbjUQFH1OQVwKdQ== integrity sha512-lK4xn6C6ZF1kgLaC/EhOtC1MSKENExj3rMwGVnBTfHW81Z/Hb1Rge5YaWawN/YOXy3xCaESuE4KWSD50kOZ9rQ==
enhanced-resolve@^5.8.0: enhanced-resolve@^5.8.0:
version "5.8.2" version "5.8.2"
...@@ -327,17 +327,17 @@ merge-stream@^2.0.0: ...@@ -327,17 +327,17 @@ merge-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
mime-db@1.48.0: mime-db@1.49.0:
version "1.48.0" version "1.49.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
mime-types@^2.1.27: mime-types@^2.1.27:
version "2.1.31" version "2.1.32"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
dependencies: dependencies:
mime-db "1.48.0" mime-db "1.49.0"
neo-async@^2.6.2: neo-async@^2.6.2:
version "2.6.2" version "2.6.2"
...@@ -382,12 +382,12 @@ safe-buffer@^5.1.0: ...@@ -382,12 +382,12 @@ safe-buffer@^5.1.0:
ajv "^6.12.5" ajv "^6.12.5"
ajv-keywords "^3.5.2" ajv-keywords "^3.5.2"
schema-utils@^3.0.0: schema-utils@^3.0.0, schema-utils@^3.1.0:
version "3.1.0" version "3.1.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.0.tgz#95986eb604f66daadeed56e379bfe7a7f963cdb9" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
integrity sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w== integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
dependencies: dependencies:
"@types/json-schema" "^7.0.7" "@types/json-schema" "^7.0.8"
ajv "^6.12.5" ajv "^6.12.5"
ajv-keywords "^3.5.2" ajv-keywords "^3.5.2"
...@@ -398,11 +398,6 @@ serialize-javascript@^6.0.0: ...@@ -398,11 +398,6 @@ serialize-javascript@^6.0.0:
dependencies: dependencies:
randombytes "^2.1.0" randombytes "^2.1.0"
source-list-map@^2.0.1:
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==
source-map-support@~0.5.19: source-map-support@~0.5.19:
version "0.5.19" version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
...@@ -469,19 +464,15 @@ watchpack@^2.2.0: ...@@ -469,19 +464,15 @@ watchpack@^2.2.0:
glob-to-regexp "^0.4.1" glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2" graceful-fs "^4.1.2"
"webpack-sources2@npm:webpack-sources@2.3.0", webpack-sources@^2.3.0: "webpack-sources3@npm:webpack-sources@3.1.1", webpack-sources@^3.0.1:
name webpack-sources2 version "3.1.1"
version "2.3.0" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.1.1.tgz#586d15bc9a9723765f6a735f672357d6402f9c57"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa" integrity sha512-ztUmIWq0LWaw+1YyR3bXtUPjt8vQedtI9WxGn/q1V1ASHsombnaso7MN9S25lzKS/OuC9Q8lEg3GsZexjDbdlQ==
integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
dependencies:
source-list-map "^2.0.1"
source-map "^0.6.1"
"webpack5@npm:webpack@5.44.0": "webpack5@npm:webpack@5.47.0":
version "5.44.0" version "5.47.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.44.0.tgz#97b13a02bd79fb71ac6301ce697920660fa214a1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.47.0.tgz#3c13862b5d7b428792bfe76c5f67a0f43ba685f8"
integrity sha512-I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ== integrity sha512-soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q==
dependencies: dependencies:
"@types/eslint-scope" "^3.7.0" "@types/eslint-scope" "^3.7.0"
"@types/estree" "^0.0.50" "@types/estree" "^0.0.50"
...@@ -501,11 +492,11 @@ watchpack@^2.2.0: ...@@ -501,11 +492,11 @@ watchpack@^2.2.0:
loader-runner "^4.2.0" loader-runner "^4.2.0"
mime-types "^2.1.27" mime-types "^2.1.27"
neo-async "^2.6.2" neo-async "^2.6.2"
schema-utils "^3.0.0" schema-utils "^3.1.0"
tapable "^2.1.1" tapable "^2.1.1"
terser-webpack-plugin "^5.1.3" terser-webpack-plugin "^5.1.3"
watchpack "^2.2.0" watchpack "^2.2.0"
webpack-sources "^2.3.0" webpack-sources "^3.0.1"
yocto-queue@^0.1.0: yocto-queue@^0.1.0:
version "0.1.0" version "0.1.0"
......
This diff is collapsed.
This diff is collapsed.
...@@ -9,6 +9,7 @@ var $interceptModuleExecution$ = undefined; ...@@ -9,6 +9,7 @@ var $interceptModuleExecution$ = undefined;
var $moduleCache$ = undefined; var $moduleCache$ = undefined;
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
var $hmrModuleData$ = undefined; var $hmrModuleData$ = undefined;
/** @type {() => Promise} */
var $hmrDownloadManifest$ = undefined; var $hmrDownloadManifest$ = undefined;
var $hmrDownloadUpdateHandlers$ = undefined; var $hmrDownloadUpdateHandlers$ = undefined;
var $hmrInvalidateModuleHandlers$ = undefined; var $hmrInvalidateModuleHandlers$ = undefined;
...@@ -209,8 +210,12 @@ module.exports = function () { ...@@ -209,8 +210,12 @@ module.exports = function () {
function setStatus(newStatus) { function setStatus(newStatus) {
currentStatus = newStatus; currentStatus = newStatus;
var results = [];
for (var i = 0; i < registeredStatusHandlers.length; i++) for (var i = 0; i < registeredStatusHandlers.length; i++)
registeredStatusHandlers[i].call(null, newStatus); results[i] = registeredStatusHandlers[i].call(null, newStatus);
return Promise.all(results);
} }
function trackBlockingPromise(promise) { function trackBlockingPromise(promise) {
...@@ -219,7 +224,7 @@ module.exports = function () { ...@@ -219,7 +224,7 @@ module.exports = function () {
setStatus("prepare"); setStatus("prepare");
blockingPromises.push(promise); blockingPromises.push(promise);
waitForBlockingPromises(function () { waitForBlockingPromises(function () {
setStatus("ready"); return setStatus("ready");
}); });
return promise; return promise;
case "prepare": case "prepare":
...@@ -243,47 +248,47 @@ module.exports = function () { ...@@ -243,47 +248,47 @@ module.exports = function () {
if (currentStatus !== "idle") { if (currentStatus !== "idle") {
throw new Error("check() is only allowed in idle status"); throw new Error("check() is only allowed in idle status");
} }
setStatus("check"); return setStatus("check")
return $hmrDownloadManifest$().then(function (update) { .then($hmrDownloadManifest$)
if (!update) { .then(function (update) {
setStatus(applyInvalidatedModules() ? "ready" : "idle"); if (!update) {
return null; return setStatus(applyInvalidatedModules() ? "ready" : "idle");
} }
setStatus("prepare");
var updatedModules = [];
blockingPromises = [];
currentUpdateApplyHandlers = [];
return Promise.all(
Object.keys($hmrDownloadUpdateHandlers$).reduce(function (
promises,
key
) {
$hmrDownloadUpdateHandlers$[key](
update.c,
update.r,
update.m,
promises,
currentUpdateApplyHandlers,
updatedModules
);
return promises;
},
[])
).then(function () {
return waitForBlockingPromises(function () {
if (applyOnUpdate) {
return internalApply(applyOnUpdate);
} else {
setStatus("ready");
return updatedModules; return setStatus("prepare").then(function () {
} var updatedModules = [];
blockingPromises = [];
currentUpdateApplyHandlers = [];
return Promise.all(
Object.keys($hmrDownloadUpdateHandlers$).reduce(function (
promises,
key
) {
$hmrDownloadUpdateHandlers$[key](
update.c,
update.r,
update.m,
promises,
currentUpdateApplyHandlers,
updatedModules
);
return promises;
},
[])
).then(function () {
return waitForBlockingPromises(function () {
if (applyOnUpdate) {
return internalApply(applyOnUpdate);
} else {
return setStatus("ready").then(function () {
return updatedModules;
});
}
});
});
}); });
}); });
});
} }
function hotApply(options) { function hotApply(options) {
...@@ -312,21 +317,20 @@ module.exports = function () { ...@@ -312,21 +317,20 @@ module.exports = function () {
.filter(Boolean); .filter(Boolean);
if (errors.length > 0) { if (errors.length > 0) {
setStatus("abort"); return setStatus("abort").then(function () {
return Promise.resolve().then(function () {
throw errors[0]; throw errors[0];
}); });
} }
// Now in "dispose" phase // Now in "dispose" phase
setStatus("dispose"); var disposePromise = setStatus("dispose");
results.forEach(function (result) { results.forEach(function (result) {
if (result.dispose) result.dispose(); if (result.dispose) result.dispose();
}); });
// Now in "apply" phase // Now in "apply" phase
setStatus("apply"); var applyPromise = setStatus("apply");
var error; var error;
var reportError = function (err) { var reportError = function (err) {
...@@ -345,25 +349,27 @@ module.exports = function () { ...@@ -345,25 +349,27 @@ module.exports = function () {
} }
}); });
// handle errors in accept handlers and self accepted module load return Promise.all([disposePromise, applyPromise]).then(function () {
if (error) { // handle errors in accept handlers and self accepted module load
setStatus("fail"); if (error) {
return Promise.resolve().then(function () { return setStatus("fail").then(function () {
throw error; throw error;
}); });
} }
if (queuedInvalidatedModules) { if (queuedInvalidatedModules) {
return internalApply(options).then(function (list) { return internalApply(options).then(function (list) {
outdatedModules.forEach(function (moduleId) { outdatedModules.forEach(function (moduleId) {
if (list.indexOf(moduleId) < 0) list.push(moduleId); if (list.indexOf(moduleId) < 0) list.push(moduleId);
});
return list;
}); });
return list; }
});
}
setStatus("idle"); return setStatus("idle").then(function () {
return Promise.resolve(outdatedModules); return outdatedModules;
});
});
} }
function applyInvalidatedModules() { function applyInvalidatedModules() {
......
This diff is collapsed.
...@@ -614,14 +614,14 @@ export async function ncc_webpack_sources(task, opts) { ...@@ -614,14 +614,14 @@ export async function ncc_webpack_sources(task, opts) {
.target('compiled/webpack-sources') .target('compiled/webpack-sources')
} }
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
externals['webpack-sources2'] = 'next/dist/compiled/webpack-sources2' externals['webpack-sources3'] = 'next/dist/compiled/webpack-sources3'
export async function ncc_webpack_sources2(task, opts) { export async function ncc_webpack_sources3(task, opts) {
await task await task
.source( .source(
opts.src || relative(__dirname, bundleRequire.resolve('webpack-sources2')) opts.src || relative(__dirname, bundleRequire.resolve('webpack-sources3'))
) )
.ncc({ packageName: 'webpack-sources2', externals, target: 'es5' }) .ncc({ packageName: 'webpack-sources3', externals, target: 'es5' })
.target('compiled/webpack-sources2') .target('compiled/webpack-sources3')
} }
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
externals['mini-css-extract-plugin'] = externals['mini-css-extract-plugin'] =
...@@ -685,7 +685,7 @@ export async function ncc_webpack_bundle5(task, opts) { ...@@ -685,7 +685,7 @@ export async function ncc_webpack_bundle5(task, opts) {
externals: { externals: {
...externals, ...externals,
'schema-utils': 'next/dist/compiled/schema-utils3', 'schema-utils': 'next/dist/compiled/schema-utils3',
'webpack-sources': 'next/dist/compiled/webpack-sources2', 'webpack-sources': 'next/dist/compiled/webpack-sources3',
}, },
minify: false, minify: false,
target: 'es5', target: 'es5',
...@@ -789,7 +789,7 @@ export async function ncc(task, opts) { ...@@ -789,7 +789,7 @@ export async function ncc(task, opts) {
'ncc_webpack_bundle5', 'ncc_webpack_bundle5',
'ncc_webpack_bundle_packages', 'ncc_webpack_bundle_packages',
'ncc_webpack_sources', 'ncc_webpack_sources',
'ncc_webpack_sources2', 'ncc_webpack_sources3',
'ncc_mini_css_extract_plugin', 'ncc_mini_css_extract_plugin',
], ],
opts opts
......
...@@ -182,9 +182,13 @@ export async function sandbox( ...@@ -182,9 +182,13 @@ export async function sandbox(
) )
) )
const root = portal.shadowRoot const root = portal.shadowRoot
return root.querySelector( const frame = root.querySelector(
'[data-nextjs-codeframe], [data-nextjs-terminal]' '[data-nextjs-codeframe], [data-nextjs-terminal]'
).innerText )
if (!frame) {
throw new Error(`No source found in redbox`)
}
return frame.innerText
}) })
if (includeHeader) { if (includeHeader) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment