@atlaspack/packager-js 2.14.5-canary.201 → 2.14.5-canary.203

package/dist/ESMOutputFormat.js

@@ -70,7 +70,7 @@ class ESMOutputFormat {
         let lines = 0;
         let exportSpecifiers = [];
         for (let { asset, exportSymbol, local, exportAs, } of this.packager.exportedSymbols.values()) {
-            if (this.packager.wrappedAssets.has(asset.id)) {
+            if (this.packager.wrappedAssets.has(asset)) {
                 let obj = `parcelRequire("${this.packager.bundleGraph.getAssetPublicId(asset)}")`;
                 res += `\nvar ${local} = ${this.packager.getPropertyAccess(obj, exportSymbol)};`;
                 lines++;

package/dist/ScopeHoistingPackager.js

@@ -86,6 +86,7 @@ class ScopeHoistingPackager {
         this.topLevelNames = new Map();
         this.seenAssets = new Set();
         this.wrappedAssets = new Set();
+        this.constantAssets = new Set();
         this.hoistedRequires = new Map();
         this.seenHoistedRequires = new Set();
         this.needsPrelude = false;
@@ -109,7 +110,7 @@ class ScopeHoistingPackager {
         this.globalNames = GLOBALS_BY_CONTEXT[bundle.env.context];
     }
     async package() {
-        let { wrapped: wrappedAssets, constant: constantAssets } = await this.loadAssets();
+        await this.loadAssets();
         this.buildExportedSymbols();
         // If building a library, the target is actually another bundler rather
         // than the final output that could be loaded in a browser. So, loader
@@ -144,23 +145,23 @@ class ScopeHoistingPackager {
         if ((0, feature_flags_1.getFeatureFlag)('inlineConstOptimisationFix') ||
             this.useBothScopeHoistingImprovements) {
             // Write out all constant modules used by this bundle
-            for (let asset of constantAssets) {
-                if (!this.seenAssets.has(asset.id)) {
+            for (let asset of this.constantAssets) {
+                if (!this.seenAssets.has(asset)) {
                     processAsset(asset);
                 }
             }
         }
         // Hoist wrapped asset to the top of the bundle to ensure that they are registered
         // before they are used.
-        for (let asset of wrappedAssets) {
-            if (!this.seenAssets.has(asset.id)) {
+        for (let asset of this.wrappedAssets) {
+            if (!this.seenAssets.has(asset)) {
                 processAsset(asset);
             }
         }
         // Add each asset that is directly connected to the bundle. Dependencies will be handled
         // by replacing `import` statements in the code.
         this.bundle.traverseAssets((asset, _, actions) => {
-            if (this.seenAssets.has(asset.id)) {
+            if (this.seenAssets.has(asset)) {
                 actions.skipChildren();
                 return;
             }
@@ -193,7 +194,7 @@ class ScopeHoistingPackager {
         let needsBundleQueue = this.shouldBundleQueue(this.bundle);
         // If any of the entry assets are wrapped, call parcelRequire so they are executed.
         for (let entry of entries) {
-            if (this.wrappedAssets.has(entry.id) && !this.isScriptEntry(entry)) {
+            if (this.wrappedAssets.has(entry) && !this.isScriptEntry(entry)) {
                 let parcelRequire = `parcelRequire(${JSON.stringify(this.bundleGraph.getAssetPublicId(entry))});\n`;
                 let entryExports = entry.symbols.get('*')?.local;
                 if (entryExports &&
@@ -222,7 +223,7 @@ class ScopeHoistingPackager {
             res += '\n';
             lineCount++;
             let mainEntry = (0, nullthrows_1.default)(this.bundle.getMainEntry());
-            let { code, map: mapBuffer } = (0, nullthrows_1.default)(this.assetOutputs.get(mainEntry.id));
+            let { code, map: mapBuffer } = (0, nullthrows_1.default)(this.assetOutputs.get(mainEntry));
             let map;
             if (mapBuffer) {
                 map = new source_map_1.default(this.options.projectRoot, mapBuffer);
@@ -295,16 +296,16 @@ class ScopeHoistingPackager {
         return `$parcel$global.rwr(${params.join(', ')});`;
     }
     async loadAssets() {
-        let queue = new utils_1.PromiseQueue({ maxConcurrent: 32 });
-        let wrapped = [];
-        let constant = [];
+        let queue = new utils_1.PromiseQueue({
+            maxConcurrent: 32,
+        });
         this.bundle.traverseAssets((asset) => {
             queue.add(async () => {
                 let [code, map] = await Promise.all([
                     asset.getCode(),
                     this.bundle.env.sourceMap ? asset.getMapBuffer() : null,
                 ]);
-                return [asset.id, { code, map }];
+                return [asset, { code, map }];
             });
             if (asset.meta.shouldWrap ||
                 this.bundle.env.sourceType === 'script' ||
@@ -317,13 +318,12 @@ class ScopeHoistingPackager {
                     this.bundleGraph
                         .getIncomingDependencies(asset)
                         .some((dep) => dep.priority === 'lazy')) {
-                    this.wrappedAssets.add(asset.id);
-                    wrapped.push(asset);
+                    this.wrappedAssets.add(asset);
                 }
                 else if (((0, feature_flags_1.getFeatureFlag)('inlineConstOptimisationFix') ||
                     this.useBothScopeHoistingImprovements) &&
                     asset.meta.isConstantModule) {
-                    constant.push(asset);
+                    this.constantAssets.add(asset);
                 }
             }
         });
@@ -335,18 +335,19 @@ class ScopeHoistingPackager {
             if (!(0, feature_flags_1.getFeatureFlag)('applyScopeHoistingImprovementV2')) {
                 // Make all entry assets wrapped, to avoid any top level hoisting
                 for (let entryAsset of this.bundle.getEntryAssets()) {
-                    if (!this.wrappedAssets.has(entryAsset.id)) {
-                        this.wrappedAssets.add(entryAsset.id);
-                        wrapped.push(entryAsset);
+                    if (!this.wrappedAssets.has(entryAsset)) {
+                        this.wrappedAssets.add(entryAsset);
                     }
                 }
             }
-            let moduleGroupParents = [...wrapped];
+            // We need to make a new copy here so that we can add to the list and
+            // iterate the newly added items, without mutating the wrappedAssets set
+            let moduleGroupParents = [...this.wrappedAssets.values()];
             if ((0, feature_flags_1.getFeatureFlag)('applyScopeHoistingImprovementV2')) {
                 // The main entry needs to be check to find assets that would have gone in
                 // the top level scope
                 let mainEntry = this.bundle.getMainEntry();
-                if (mainEntry && !this.wrappedAssets.has(mainEntry.id)) {
+                if (mainEntry && !this.wrappedAssets.has(mainEntry)) {
                     moduleGroupParents.unshift(mainEntry);
                 }
             }
@@ -355,14 +356,13 @@ class ScopeHoistingPackager {
                     if (asset === moduleGroupParentAsset) {
                         return;
                     }
-                    if (this.wrappedAssets.has(asset.id)) {
+                    if (this.wrappedAssets.has(asset)) {
                         actions.skipChildren();
                         return;
                     }
                     if (!asset.meta.isConstantModule &&
                         (assignedAssets.has(asset) || this.isReExported(asset))) {
-                        wrapped.push(asset);
-                        this.wrappedAssets.add(asset.id);
+                        this.wrappedAssets.add(asset);
                         // This also needs to be added to the traversal so that we iterate
                         // it during this check.
                         moduleGroupParents.push(asset);
@@ -374,25 +374,22 @@ class ScopeHoistingPackager {
             }
         }
         else {
-            for (let wrappedAssetRoot of [...wrapped]) {
+            for (let wrappedAssetRoot of this.wrappedAssets) {
                 this.bundle.traverseAssets((asset, _, actions) => {
                     if (asset === wrappedAssetRoot) {
                         return;
                     }
-                    if (this.wrappedAssets.has(asset.id)) {
+                    if (this.wrappedAssets.has(asset)) {
                         actions.skipChildren();
                         return;
                     }
                     if (!asset.meta.isConstantModule) {
-                        this.wrappedAssets.add(asset.id);
-                        wrapped.push(asset);
+                        this.wrappedAssets.add(asset);
                     }
                 }, wrappedAssetRoot);
             }
         }
-        // @ts-expect-error TS2769
         this.assetOutputs = new Map(await queue.run());
-        return { wrapped, constant };
     }
     isReExported(asset) {
         let parentSymbols = this.bundleGraph
@@ -414,7 +411,7 @@ class ScopeHoistingPackager {
         }
         // TODO: handle ESM exports of wrapped entry assets...
         let entry = this.bundle.getMainEntry();
-        if (entry && !this.wrappedAssets.has(entry.id)) {
+        if (entry && !this.wrappedAssets.has(entry)) {
             let hasNamespace = entry.symbols.hasExportSymbol('*');
             for (let { asset, exportAs, symbol, exportSymbol, } of this.bundleGraph.getExportedSymbols(entry)) {
                 if (typeof symbol === 'string') {
@@ -479,16 +476,16 @@ class ScopeHoistingPackager {
         return `${obj}[${JSON.stringify(property)}]`;
     }
     visitAsset(asset) {
-        (0, assert_1.default)(!this.seenAssets.has(asset.id), 'Already visited asset');
-        this.seenAssets.add(asset.id);
-        let { code, map } = (0, nullthrows_1.default)(this.assetOutputs.get(asset.id));
+        (0, assert_1.default)(!this.seenAssets.has(asset), 'Already visited asset');
+        this.seenAssets.add(asset);
+        let { code, map } = (0, nullthrows_1.default)(this.assetOutputs.get(asset));
         return this.buildAsset(asset, code, map);
     }
     getAssetFilePath(asset) {
         return path_1.default.relative(this.options.projectRoot, asset.filePath);
     }
     buildAsset(asset, code, map) {
-        let shouldWrap = this.wrappedAssets.has(asset.id);
+        let shouldWrap = this.wrappedAssets.has(asset);
         let deps = this.bundleGraph.getDependencies(asset);
         let sourceMap = this.bundle.env.sourceMap && map
             ? new source_map_1.default(this.options.projectRoot, map)
@@ -509,8 +506,7 @@ class ScopeHoistingPackager {
                     }
                     continue;
                 }
-                if (this.bundle.hasAsset(resolved) &&
-                    !this.seenAssets.has(resolved.id)) {
+                if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved)) {
                     let [code, map, lines] = this.visitAsset(resolved);
                     depCode += code + '\n';
                     if (sourceMap && map) {
@@ -585,14 +581,14 @@ class ScopeHoistingPackager {
                                 [res, lines] = this.getHoistedParcelRequires(asset, dep, resolved);
                             }
                             if (this.bundle.hasAsset(resolved) &&
-                                !this.seenAssets.has(resolved.id)) {
+                                !this.seenAssets.has(resolved)) {
                                 // If this asset is wrapped, we need to hoist the code for the dependency
                                 // outside our parcelRequire.register wrapper. This is safe because all
                                 // assets referenced by this asset will also be wrapped. Otherwise, inline the
                                 // asset content where the import statement was.
                                 if (this.useBothScopeHoistingImprovements) {
                                     if (!resolved.meta.isConstantModule &&
-                                        !this.wrappedAssets.has(resolved.id)) {
+                                        !this.wrappedAssets.has(resolved)) {
                                         let [depCode, depMap, depLines] = this.visitAsset(resolved);
                                         if (utils_1.debugTools['asset-file-names-in-output']) {
                                             let resolvedPath = this.getAssetFilePath(resolved);
@@ -759,7 +755,7 @@ ${code}
         }
         // If this asset is wrapped, we need to replace the exports namespace with `module.exports`,
         // which will be provided to us by the wrapper.
-        if (this.wrappedAssets.has(asset.id) ||
+        if (this.wrappedAssets.has(asset) ||
             (this.bundle.env.outputFormat === 'commonjs' &&
                 asset === this.bundle.getMainEntry())) {
             let exportsName = asset.symbols.get('*')?.local || `$${assetId}$exports`;
@@ -913,7 +909,7 @@ ${code}
             return false;
         }
         return ((!this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved)) ||
-            (this.wrappedAssets.has(resolved.id) && resolved !== parentAsset));
+            (this.wrappedAssets.has(resolved) && resolved !== parentAsset));
     }
     getSymbolResolution(parentAsset, resolved, imported, dep, replacements) {
         let { asset: resolvedAsset, exportSymbol, symbol, } = this.bundleGraph.getSymbolResolution(resolved, imported, this.bundle);
@@ -942,12 +938,12 @@ ${code}
             // parcelRequire.register'ed there), or if it is indeed registered in this bundle.
             (!this.bundle.hasAsset(resolvedAsset) ||
                 !this.shouldSkipAsset(resolvedAsset))) {
-            let hoisted = this.hoistedRequires.get(dep.id);
+            let hoisted = this.hoistedRequires.get(dep);
             if (!hoisted) {
                 hoisted = new Map();
-                this.hoistedRequires.set(dep.id, hoisted);
+                this.hoistedRequires.set(dep, hoisted);
             }
-            hoisted.set(resolvedAsset.id, `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`);
+            hoisted.set(resolvedAsset, `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`);
         }
         if (isWrapped) {
             this.needsPrelude = true;
@@ -982,7 +978,7 @@ ${code}
         if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
             // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
             if (parentAsset === resolvedAsset &&
-                this.wrappedAssets.has(resolvedAsset.id)) {
+                this.wrappedAssets.has(resolvedAsset)) {
                 // Directly use module.exports for wrapped assets importing themselves.
                 return 'module.exports';
             }
@@ -1019,7 +1015,7 @@ ${code}
         if (resolved.type !== 'js') {
             return ['', 0];
         }
-        let hoisted = this.hoistedRequires.get(dep.id);
+        let hoisted = this.hoistedRequires.get(dep);
         let res = '';
         let lineCount = 0;
         let isWrapped = this.isWrapped(resolved, parentAsset);
@@ -1029,7 +1025,7 @@ ${code}
         // so it runs first.
         if (isWrapped &&
             !dep.meta.shouldWrap &&
-            (!hoisted || hoisted.keys().next().value !== resolved.id) &&
+            (!hoisted || hoisted.keys().next().value !== resolved) &&
             !this.bundleGraph.isDependencySkipped(dep) &&
             !this.shouldSkipAsset(resolved)) {
             this.needsPrelude = true;
@@ -1056,7 +1052,7 @@ ${code}
         let prepend = '';
         let prependLineCount = 0;
         let append = '';
-        let shouldWrap = this.wrappedAssets.has(asset.id);
+        let shouldWrap = this.wrappedAssets.has(asset);
         let usedSymbols = (0, nullthrows_1.default)(this.bundleGraph.getUsedSymbols(asset));
         let assetId = asset.meta.id;
         (0, assert_1.default)(typeof assetId === 'string');

package/lib/ESMOutputFormat.js

@@ -75,7 +75,7 @@ class ESMOutputFormat {
       local,
       exportAs
     } of this.packager.exportedSymbols.values()) {
-      if (this.packager.wrappedAssets.has(asset.id)) {
+      if (this.packager.wrappedAssets.has(asset)) {
         let obj = `parcelRequire("${this.packager.bundleGraph.getAssetPublicId(asset)}")`;
         res += `\nvar ${local} = ${this.packager.getPropertyAccess(obj, exportSymbol)};`;
         lines++;

package/lib/ScopeHoistingPackager.js

@@ -104,6 +104,7 @@ class ScopeHoistingPackager {
   topLevelNames = new Map();
   seenAssets = new Set();
   wrappedAssets = new Set();
+  constantAssets = new Set();
   hoistedRequires = new Map();
   seenHoistedRequires = new Set();
   needsPrelude = false;
@@ -124,10 +125,7 @@ class ScopeHoistingPackager {
   }
   async package() {
     var _sourceMap;
-    let {
-      wrapped: wrappedAssets,
-      constant: constantAssets
-    } = await this.loadAssets();
+    await this.loadAssets();
     this.buildExportedSymbols();
 
     // If building a library, the target is actually another bundler rather
@@ -161,8 +159,8 @@ class ScopeHoistingPackager {
     };
     if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || this.useBothScopeHoistingImprovements) {
       // Write out all constant modules used by this bundle
-      for (let asset of constantAssets) {
-        if (!this.seenAssets.has(asset.id)) {
+      for (let asset of this.constantAssets) {
+        if (!this.seenAssets.has(asset)) {
           processAsset(asset);
         }
       }
@@ -170,8 +168,8 @@ class ScopeHoistingPackager {
 
     // Hoist wrapped asset to the top of the bundle to ensure that they are registered
     // before they are used.
-    for (let asset of wrappedAssets) {
-      if (!this.seenAssets.has(asset.id)) {
+    for (let asset of this.wrappedAssets) {
+      if (!this.seenAssets.has(asset)) {
         processAsset(asset);
       }
     }
@@ -179,7 +177,7 @@ class ScopeHoistingPackager {
     // Add each asset that is directly connected to the bundle. Dependencies will be handled
     // by replacing `import` statements in the code.
     this.bundle.traverseAssets((asset, _, actions) => {
-      if (this.seenAssets.has(asset.id)) {
+      if (this.seenAssets.has(asset)) {
         actions.skipChildren();
         return;
       }
@@ -217,7 +215,7 @@ class ScopeHoistingPackager {
 
     // If any of the entry assets are wrapped, call parcelRequire so they are executed.
     for (let entry of entries) {
-      if (this.wrappedAssets.has(entry.id) && !this.isScriptEntry(entry)) {
+      if (this.wrappedAssets.has(entry) && !this.isScriptEntry(entry)) {
         var _entry$symbols$get;
         let parcelRequire = `parcelRequire(${JSON.stringify(this.bundleGraph.getAssetPublicId(entry))});\n`;
         let entryExports = (_entry$symbols$get = entry.symbols.get('*')) === null || _entry$symbols$get === void 0 ? void 0 : _entry$symbols$get.local;
@@ -247,7 +245,7 @@ class ScopeHoistingPackager {
       let {
         code,
         map: mapBuffer
-      } = (0, _nullthrows().default)(this.assetOutputs.get(mainEntry.id));
+      } = (0, _nullthrows().default)(this.assetOutputs.get(mainEntry));
       let map;
       if (mapBuffer) {
         map = new (_sourceMap2().default)(this.options.projectRoot, mapBuffer);
@@ -301,12 +299,10 @@ class ScopeHoistingPackager {
     let queue = new (_utils().PromiseQueue)({
       maxConcurrent: 32
     });
-    let wrapped = [];
-    let constant = [];
     this.bundle.traverseAssets(asset => {
       queue.add(async () => {
         let [code, map] = await Promise.all([asset.getCode(), this.bundle.env.sourceMap ? asset.getMapBuffer() : null]);
-        return [asset.id, {
+        return [asset, {
           code,
           map
         }];
@@ -314,10 +310,9 @@ class ScopeHoistingPackager {
       if (asset.meta.shouldWrap || this.bundle.env.sourceType === 'script' || this.bundleGraph.isAssetReferenced(this.bundle, asset) || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')) {
         // Don't wrap constant "entry" modules _except_ if they are referenced by any lazy dependency
         if (!asset.meta.isConstantModule || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.priority === 'lazy')) {
-          this.wrappedAssets.add(asset.id);
-          wrapped.push(asset);
+          this.wrappedAssets.add(asset);
         } else if (((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || this.useBothScopeHoistingImprovements) && asset.meta.isConstantModule) {
-          constant.push(asset);
+          this.constantAssets.add(asset);
         }
       }
     });
@@ -330,18 +325,20 @@ class ScopeHoistingPackager {
       if (!(0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
         // Make all entry assets wrapped, to avoid any top level hoisting
         for (let entryAsset of this.bundle.getEntryAssets()) {
-          if (!this.wrappedAssets.has(entryAsset.id)) {
-            this.wrappedAssets.add(entryAsset.id);
-            wrapped.push(entryAsset);
+          if (!this.wrappedAssets.has(entryAsset)) {
+            this.wrappedAssets.add(entryAsset);
           }
         }
       }
-      let moduleGroupParents = [...wrapped];
+
+      // We need to make a new copy here so that we can add to the list and
+      // iterate the newly added items, without mutating the wrappedAssets set
+      let moduleGroupParents = [...this.wrappedAssets.values()];
       if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
         // The main entry needs to be check to find assets that would have gone in
         // the top level scope
         let mainEntry = this.bundle.getMainEntry();
-        if (mainEntry && !this.wrappedAssets.has(mainEntry.id)) {
+        if (mainEntry && !this.wrappedAssets.has(mainEntry)) {
           moduleGroupParents.unshift(mainEntry);
         }
       }
@@ -350,13 +347,12 @@ class ScopeHoistingPackager {
           if (asset === moduleGroupParentAsset) {
             return;
           }
-          if (this.wrappedAssets.has(asset.id)) {
+          if (this.wrappedAssets.has(asset)) {
             actions.skipChildren();
             return;
           }
           if (!asset.meta.isConstantModule && (assignedAssets.has(asset) || this.isReExported(asset))) {
-            wrapped.push(asset);
-            this.wrappedAssets.add(asset.id);
+            this.wrappedAssets.add(asset);
 
             // This also needs to be added to the traversal so that we iterate
             // it during this check.
@@ -368,29 +364,22 @@ class ScopeHoistingPackager {
         }, moduleGroupParentAsset);
       }
     } else {
-      for (let wrappedAssetRoot of [...wrapped]) {
+      for (let wrappedAssetRoot of this.wrappedAssets) {
         this.bundle.traverseAssets((asset, _, actions) => {
           if (asset === wrappedAssetRoot) {
             return;
           }
-          if (this.wrappedAssets.has(asset.id)) {
+          if (this.wrappedAssets.has(asset)) {
             actions.skipChildren();
             return;
           }
           if (!asset.meta.isConstantModule) {
-            this.wrappedAssets.add(asset.id);
-            wrapped.push(asset);
+            this.wrappedAssets.add(asset);
           }
         }, wrappedAssetRoot);
       }
     }
-
-    // @ts-expect-error TS2769
     this.assetOutputs = new Map(await queue.run());
-    return {
-      wrapped,
-      constant
-    };
   }
   isReExported(asset) {
     let parentSymbols = this.bundleGraph.getIncomingDependencies(asset).map(dep => this.bundleGraph.getAssetWithDependency(dep)).flatMap(parent => {
@@ -409,7 +398,7 @@ class ScopeHoistingPackager {
 
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
-    if (entry && !this.wrappedAssets.has(entry.id)) {
+    if (entry && !this.wrappedAssets.has(entry)) {
       let hasNamespace = entry.symbols.hasExportSymbol('*');
       for (let {
         asset,
@@ -478,19 +467,19 @@ class ScopeHoistingPackager {
     return `${obj}[${JSON.stringify(property)}]`;
   }
   visitAsset(asset) {
-    (0, _assert().default)(!this.seenAssets.has(asset.id), 'Already visited asset');
-    this.seenAssets.add(asset.id);
+    (0, _assert().default)(!this.seenAssets.has(asset), 'Already visited asset');
+    this.seenAssets.add(asset);
     let {
       code,
       map
-    } = (0, _nullthrows().default)(this.assetOutputs.get(asset.id));
+    } = (0, _nullthrows().default)(this.assetOutputs.get(asset));
     return this.buildAsset(asset, code, map);
   }
   getAssetFilePath(asset) {
     return _path().default.relative(this.options.projectRoot, asset.filePath);
   }
   buildAsset(asset, code, map) {
-    let shouldWrap = this.wrappedAssets.has(asset.id);
+    let shouldWrap = this.wrappedAssets.has(asset);
     let deps = this.bundleGraph.getDependencies(asset);
     let sourceMap = this.bundle.env.sourceMap && map ? new (_sourceMap2().default)(this.options.projectRoot, map) : null;
 
@@ -510,7 +499,7 @@ class ScopeHoistingPackager {
           }
           continue;
         }
-        if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved.id)) {
+        if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved)) {
           let [code, map, lines] = this.visitAsset(resolved);
           depCode += code + '\n';
           if (sourceMap && map) {
@@ -584,13 +573,13 @@ class ScopeHoistingPackager {
               if (!(0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
                 [res, lines] = this.getHoistedParcelRequires(asset, dep, resolved);
               }
-              if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved.id)) {
+              if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved)) {
                 // If this asset is wrapped, we need to hoist the code for the dependency
                 // outside our parcelRequire.register wrapper. This is safe because all
                 // assets referenced by this asset will also be wrapped. Otherwise, inline the
                 // asset content where the import statement was.
                 if (this.useBothScopeHoistingImprovements) {
-                  if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved.id)) {
+                  if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved)) {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
                     if (_utils().debugTools['asset-file-names-in-output']) {
                       let resolvedPath = this.getAssetFilePath(resolved);
@@ -747,7 +736,7 @@ ${code}
 
     // If this asset is wrapped, we need to replace the exports namespace with `module.exports`,
     // which will be provided to us by the wrapper.
-    if (this.wrappedAssets.has(asset.id) || this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry()) {
+    if (this.wrappedAssets.has(asset) || this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry()) {
       var _asset$symbols$get;
       let exportsName = ((_asset$symbols$get = asset.symbols.get('*')) === null || _asset$symbols$get === void 0 ? void 0 : _asset$symbols$get.local) || `$${assetId}$exports`;
       replacements.set(exportsName, 'module.exports');
@@ -888,7 +877,7 @@ ${code}
       }
       return false;
     }
-    return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;
+    return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved) && resolved !== parentAsset;
   }
   getSymbolResolution(parentAsset, resolved, imported, dep, replacements) {
     let {
@@ -915,12 +904,12 @@ ${code}
     // Only do this if the asset is part of a different bundle (so it was definitely
     // parcelRequire.register'ed there), or if it is indeed registered in this bundle.
     !this.bundle.hasAsset(resolvedAsset) || !this.shouldSkipAsset(resolvedAsset))) {
-      let hoisted = this.hoistedRequires.get(dep.id);
+      let hoisted = this.hoistedRequires.get(dep);
       if (!hoisted) {
         hoisted = new Map();
-        this.hoistedRequires.set(dep.id, hoisted);
+        this.hoistedRequires.set(dep, hoisted);
       }
-      hoisted.set(resolvedAsset.id, `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`);
+      hoisted.set(resolvedAsset, `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`);
     }
     if (isWrapped) {
       this.needsPrelude = true;
@@ -949,7 +938,7 @@ ${code}
     }
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
-      if (parentAsset === resolvedAsset && this.wrappedAssets.has(resolvedAsset.id)) {
+      if (parentAsset === resolvedAsset && this.wrappedAssets.has(resolvedAsset)) {
         // Directly use module.exports for wrapped assets importing themselves.
         return 'module.exports';
       } else {
@@ -977,7 +966,7 @@ ${code}
     if (resolved.type !== 'js') {
       return ['', 0];
     }
-    let hoisted = this.hoistedRequires.get(dep.id);
+    let hoisted = this.hoistedRequires.get(dep);
     let res = '';
     let lineCount = 0;
     let isWrapped = this.isWrapped(resolved, parentAsset);
@@ -986,7 +975,7 @@ ${code}
     // we need to run side effects when this asset runs. If the resolved asset is not
     // the first one in the hoisted requires, we need to insert a parcelRequire here
     // so it runs first.
-    if (isWrapped && !dep.meta.shouldWrap && (!hoisted || hoisted.keys().next().value !== resolved.id) && !this.bundleGraph.isDependencySkipped(dep) && !this.shouldSkipAsset(resolved)) {
+    if (isWrapped && !dep.meta.shouldWrap && (!hoisted || hoisted.keys().next().value !== resolved) && !this.bundleGraph.isDependencySkipped(dep) && !this.shouldSkipAsset(resolved)) {
       this.needsPrelude = true;
       res += `parcelRequire(${JSON.stringify(this.bundleGraph.getAssetPublicId(resolved))});`;
     }
@@ -1010,7 +999,7 @@ ${code}
     let prepend = '';
     let prependLineCount = 0;
     let append = '';
-    let shouldWrap = this.wrappedAssets.has(asset.id);
+    let shouldWrap = this.wrappedAssets.has(asset);
     let usedSymbols = (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(asset));
     let assetId = asset.meta.id;
     (0, _assert().default)(typeof assetId === 'string');

package/lib/types/ScopeHoistingPackager.d.ts

@@ -13,7 +13,7 @@ export declare class ScopeHoistingPackager {
     outputFormat: OutputFormat;
     isAsyncBundle: boolean;
     globalNames: ReadonlySet<string>;
-    assetOutputs: Map<string, {
+    assetOutputs: Map<Asset, {
         code: string;
         map: Buffer | null | undefined;
     }>;
@@ -25,9 +25,10 @@ export declare class ScopeHoistingPackager {
     }>;
     externals: Map<string, Map<string, string>>;
     topLevelNames: Map<string, number>;
-    seenAssets: Set<string>;
-    wrappedAssets: Set<string>;
-    hoistedRequires: Map<string, Map<string, string>>;
+    seenAssets: Set<Asset>;
+    wrappedAssets: Set<Asset>;
+    constantAssets: Set<Asset>;
+    hoistedRequires: Map<Dependency, Map<Asset, string>>;
     seenHoistedRequires: Set<string>;
     needsPrelude: boolean;
     usedHelpers: Set<string>;
@@ -41,10 +42,7 @@ export declare class ScopeHoistingPackager {
     }>;
     shouldBundleQueue(bundle: NamedBundle): boolean;
     runWhenReady(bundle: NamedBundle, codeToRun: string): string;
-    loadAssets(): Promise<{
-        wrapped: Array<Asset>;
-        constant: Array<Asset>;
-    }>;
+    loadAssets(): Promise<void>;
     isReExported(asset: Asset): boolean;
     buildExportedSymbols(): void;
     getTopLevelName(name: string): string;