hanzoai/next.js
2
0
Fork 0
mirror of https://github.com/hanzoai/next.js.git synced 2026-09-24 17:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turbopack hmr: fix missing factories (#89934)

Browse Source 
This fixes a bug introduced in d77eb04091 where
installCompressedModuleFactories would skip installing factories for an
entire group of module IDs if any ID in the group already had a factory
registered.

Test Plan: build
https://github.com/vercel/workflow/tree/main/workbench/nextjs-turbopack
This commit is contained in:
Will Binns-Smith
2026-02-12 19:18:12 -08:00
committed by GitHub
parent 5070ad0df4
commit dbb7791e8f
19 changed files with 178 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
turbopack/crates/turbopack-ecmascript-runtime/js/src/shared/runtime/runtime-utils.ts
+12 -18
View File
@@ -564,26 +564,20 @@ function installCompressedModuleFactories(
throw new Error('malformed chunk format, expected a factory function')
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false
const groupIds: ModuleId[] = []
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end] as Function
let didInstallFactory = false
for (let j = i; j < end; j++) {
const id = chunkModules[j] as ModuleId
groupIds.push(id)
if (moduleFactories.has(id)) {
hasExistingFactory = true
break
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end] as Function
applyModuleFactoryName(moduleFactoryFn)
newModuleId?.(moduleId)
for (; i < end; i++) {
moduleId = chunkModules[i] as ModuleId
moduleFactories.set(moduleId, moduleFactoryFn)
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn)
newModuleId?.(moduleId)
didInstallFactory = true
}
moduleFactories.set(id, moduleFactoryFn)
}
}
i = end + 1 // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/browser/output/aaf3a_crates_turbopack-tests_tests_snapshot_debug-ids_browser_input_index_0151fefb.js.map
+7 -7
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/browser/output/ba425_crates_turbopack-tests_tests_snapshot_debug-ids_browser_input_index_0151fefb.js
+14 -19
View File
@@ -1,4 +1,4 @@
;!function(){try { var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof global?global:"undefined"!=typeof window?window:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&((e._debugIds|| (e._debugIds={}))[n]="7f9e79d5-5e60-b3c4-778c-17c7a5b53b63")}catch(e){}}();
;!function(){try { var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof global?global:"undefined"!=typeof window?window:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&((e._debugIds|| (e._debugIds={}))[n]="3804020b-9b04-847a-6d0e-e56ae49220ac")}catch(e){}}();
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
"output/ba425_crates_turbopack-tests_tests_snapshot_debug-ids_browser_input_index_0151fefb.js",
{"otherChunks":["output/aaf3a_crates_turbopack-tests_tests_snapshot_debug-ids_browser_input_index_0b8736b3.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/browser/input/index.js [test] (ecmascript)"]}
@@ -391,25 +391,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
@@ -2086,5 +2081,5 @@ chunkListsToRegister.forEach(registerChunkList);
})();
//# debugId=7f9e79d5-5e60-b3c4-778c-17c7a5b53b63
//# debugId=3804020b-9b04-847a-6d0e-e56ae49220ac
//# sourceMappingURL=aaf3a_crates_turbopack-tests_tests_snapshot_debug-ids_browser_input_index_0151fefb.js.map
turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/node/output/[turbopack]_runtime.js
+12 -17
View File
@@ -380,25 +380,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/debug-ids/node/output/[turbopack]_runtime.js.map
+9 -9
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js
+12 -17
View File
@@ -380,25 +380,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js.map
+6 -6
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/runtime/default_dev_runtime/output/5c1d0_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_c0f7e0b0.js
+12 -17
View File
@@ -390,25 +390,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/runtime/default_dev_runtime/output/780ce_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_c0f7e0b0.js.map
+6 -6
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/5c1d0_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_5aaf1327.js
+12 -17
View File
@@ -627,25 +627,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
var hasExistingFactory = false;
var groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
var moduleFactoryFn = chunkModules[end];
var didInstallFactory = false;
for(var j = i; j < end; j++){
var id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
var moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId === null || newModuleId === void 0 ? void 0 : newModuleId(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId === null || newModuleId === void 0 ? void 0 : newModuleId(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/780ce_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_5aaf1327.js.map
+4 -4
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/workers/basic/output/aaf3a_crates_turbopack-tests_tests_snapshot_workers_basic_input_index_96b0ffc6.js.map
+6 -6
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/workers/basic/output/aaf3a_crates_turbopack-tests_tests_snapshot_workers_basic_input_worker_01a12aa6.js.map
+6 -6
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/workers/basic/output/ba425_crates_turbopack-tests_tests_snapshot_workers_basic_input_index_96b0ffc6.js
+12 -17
View File
@@ -390,25 +390,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/workers/basic/output/ba425_crates_turbopack-tests_tests_snapshot_workers_basic_input_worker_01a12aa6.js
+12 -17
View File
@@ -390,25 +390,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/workers/shared/output/aaf3a_crates_turbopack-tests_tests_snapshot_workers_shared_input_index_818b7886.js.map
+6 -6
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/workers/shared/output/aaf3a_crates_turbopack-tests_tests_snapshot_workers_shared_input_worker_87533493.js.map
+6 -6
View File
File diff suppressed because one or more lines are too long
turbopack/crates/turbopack-tests/tests/snapshot/workers/shared/output/ba425_crates_turbopack-tests_tests_snapshot_workers_shared_input_index_818b7886.js
+12 -17
View File
@@ -390,25 +390,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.
turbopack/crates/turbopack-tests/tests/snapshot/workers/shared/output/ba425_crates_turbopack-tests_tests_snapshot_workers_shared_input_worker_87533493.js
+12 -17
View File
@@ -390,25 +390,20 @@ function installCompressedModuleFactories(chunkModules, offset, moduleFactories,
if (end === chunkModules.length) {
throw new Error('malformed chunk format, expected a factory function');
}
// Check if ANY of the module IDs in this group already have factories (e.g., from HMR updates).
// If so, skip installing the old factory from disk to preserve the HMR-updated code.
let hasExistingFactory = false;
const groupIds = [];
// Install the factory for each module ID that doesn't already have one.
// This handles both the normal case and the case where some IDs in a group
// may have been registered separately (e.g., from another chunk or HMR update).
const moduleFactoryFn = chunkModules[end];
let didInstallFactory = false;
for(let j = i; j < end; j++){
const id = chunkModules[j];
groupIds.push(id);
if (moduleFactories.has(id)) {
hasExistingFactory = true;
break;
}
}
if (!hasExistingFactory) {
const moduleFactoryFn = chunkModules[end];
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
for(; i < end; i++){
moduleId = chunkModules[i];
moduleFactories.set(moduleId, moduleFactoryFn);
if (!moduleFactories.has(id)) {
if (!didInstallFactory) {
applyModuleFactoryName(moduleFactoryFn);
newModuleId?.(moduleId);
didInstallFactory = true;
}
moduleFactories.set(id, moduleFactoryFn);
}
}
i = end + 1; // end is pointing at the last factory advance to the next id or the end of the array.