Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update webpack #35867

Merged
merged 3 commits into from Apr 7, 2022
Merged

update webpack #35867

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1e2327
update webpack
sokra Apr 4, 2022
dc72868
Merge branch 'canary' into webpack/update
ijjk Apr 7, 2022
f77b15e
Merge branch 'canary' into webpack/update
kodiakhq[bot] Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 29 additions & 14 deletions packages/next/bundles/webpack/packages/HotModuleReplacement.runtime.js
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@ module.exports = function () {
var currentStatus = "idle";

// while downloading
var blockingPromises;
var blockingPromises = 0;
var blockingPromisesWaiting = [];

// The update info
var currentUpdateApplyHandlers;
Expand Down Expand Up @@ -218,29 +219,40 @@ module.exports = function () {
return Promise.all(results);
}

function unblock() {
if (--blockingPromises === 0) {
setStatus("ready").then(function () {
if (blockingPromises === 0) {
var list = blockingPromisesWaiting;
blockingPromisesWaiting = [];
for (var i = 0; i < list.length; i++) {
list[i]();
}
}
});
}
}

function trackBlockingPromise(promise) {
switch (currentStatus) {
case "ready":
setStatus("prepare");
blockingPromises.push(promise);
waitForBlockingPromises(function () {
return setStatus("ready");
});
return promise;
/* fallthrough */
case "prepare":
blockingPromises.push(promise);
blockingPromises++;
promise.then(unblock, unblock);
return promise;
default:
return promise;
}
}

function waitForBlockingPromises(fn) {
if (blockingPromises.length === 0) return fn();
var blocker = blockingPromises;
blockingPromises = [];
return Promise.all(blocker).then(function () {
return waitForBlockingPromises(fn);
if (blockingPromises === 0) return fn();
return new Promise(function (resolve) {
blockingPromisesWaiting.push(function () {
resolve(fn());
});
});
}

Expand All @@ -261,7 +273,6 @@ module.exports = function () {

return setStatus("prepare").then(function () {
var updatedModules = [];
blockingPromises = [];
currentUpdateApplyHandlers = [];

return Promise.all(
Expand Down Expand Up @@ -298,7 +309,11 @@ module.exports = function () {
function hotApply(options) {
if (currentStatus !== "ready") {
return Promise.resolve().then(function () {
throw new Error("apply() is only allowed in ready status");
throw new Error(
"apply() is only allowed in ready status (state: " +
currentStatus +
")"
);
});
}
return internalApply(options);
Expand Down
7 changes: 4 additions & 3 deletions packages/next/bundles/webpack/packages/JavascriptHotModuleReplacement.runtime.js
View file
Open in desktop
Expand Up @@ -443,15 +443,16 @@ module.exports = function () {
) {
promises.push($loadUpdateChunk$(chunkId, updatedModulesList));
currentUpdateChunks[chunkId] = true;
} else {
currentUpdateChunks[chunkId] = false;
}
});
if ($ensureChunkHandlers$) {
$ensureChunkHandlers$.$key$Hmr = function (chunkId, promises) {
if (
currentUpdateChunks &&
!$hasOwnProperty$(currentUpdateChunks, chunkId) &&
$hasOwnProperty$($installedChunks$, chunkId) &&
$installedChunks$[chunkId] !== undefined
$hasOwnProperty$(currentUpdateChunks, chunkId) &&
!currentUpdateChunks[chunkId]
) {
promises.push($loadUpdateChunk$(chunkId));
currentUpdateChunks[chunkId] = true;
Expand Down
43 changes: 29 additions & 14 deletions packages/next/compiled/webpack/HotModuleReplacement.runtime.js
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@ module.exports = function () {
var currentStatus = "idle";

// while downloading
var blockingPromises;
var blockingPromises = 0;
var blockingPromisesWaiting = [];

// The update info
var currentUpdateApplyHandlers;
Expand Down Expand Up @@ -218,29 +219,40 @@ module.exports = function () {
return Promise.all(results);
}

function unblock() {
if (--blockingPromises === 0) {
setStatus("ready").then(function () {
if (blockingPromises === 0) {
var list = blockingPromisesWaiting;
blockingPromisesWaiting = [];
for (var i = 0; i < list.length; i++) {
list[i]();
}
}
});
}
}

function trackBlockingPromise(promise) {
switch (currentStatus) {
case "ready":
setStatus("prepare");
blockingPromises.push(promise);
waitForBlockingPromises(function () {
return setStatus("ready");
});
return promise;
/* fallthrough */
case "prepare":
blockingPromises.push(promise);
blockingPromises++;
promise.then(unblock, unblock);
return promise;
default:
return promise;
}
}

function waitForBlockingPromises(fn) {
if (blockingPromises.length === 0) return fn();
var blocker = blockingPromises;
blockingPromises = [];
return Promise.all(blocker).then(function () {
return waitForBlockingPromises(fn);
if (blockingPromises === 0) return fn();
return new Promise(function (resolve) {
blockingPromisesWaiting.push(function () {
resolve(fn());
});
});
}

Expand All @@ -261,7 +273,6 @@ module.exports = function () {

return setStatus("prepare").then(function () {
var updatedModules = [];
blockingPromises = [];
currentUpdateApplyHandlers = [];

return Promise.all(
Expand Down Expand Up @@ -298,7 +309,11 @@ module.exports = function () {
function hotApply(options) {
if (currentStatus !== "ready") {
return Promise.resolve().then(function () {
throw new Error("apply() is only allowed in ready status");
throw new Error(
"apply() is only allowed in ready status (state: " +
currentStatus +
")"
);
});
}
return internalApply(options);
Expand Down
7 changes: 4 additions & 3 deletions packages/next/compiled/webpack/JavascriptHotModuleReplacement.runtime.js
View file
Open in desktop
Expand Up @@ -443,15 +443,16 @@ module.exports = function () {
) {
promises.push($loadUpdateChunk$(chunkId, updatedModulesList));
currentUpdateChunks[chunkId] = true;
} else {
currentUpdateChunks[chunkId] = false;
}
});
if ($ensureChunkHandlers$) {
$ensureChunkHandlers$.$key$Hmr = function (chunkId, promises) {
if (
currentUpdateChunks &&
!$hasOwnProperty$(currentUpdateChunks, chunkId) &&
$hasOwnProperty$($installedChunks$, chunkId) &&
$installedChunks$[chunkId] !== undefined
$hasOwnProperty$(currentUpdateChunks, chunkId) &&
!currentUpdateChunks[chunkId]
) {
promises.push($loadUpdateChunk$(chunkId));
currentUpdateChunks[chunkId] = true;
Expand Down