@atlaspack/packager-js 2.21.4-dev-export-func-removal-960dd335d.0 → 2.22.1

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaspack/packager-js
 
+## 2.22.1
+
+### Patch Changes
+
+- [#763](https://github.com/atlassian-labs/atlaspack/pull/763) [`830261d`](https://github.com/atlassian-labs/atlaspack/commit/830261dcf4a40293090b61cab52fd75d5683c73f) Thanks [@benjervis](https://github.com/benjervis)! - Fixes scope hoisting by iterating from the main entry asset of a bundle when packaging. Behind the feature flag `applyScopeHoistingImprovementsV2`.
+
+- Updated dependencies [[`830261d`](https://github.com/atlassian-labs/atlaspack/commit/830261dcf4a40293090b61cab52fd75d5683c73f), [`53dd47b`](https://github.com/atlassian-labs/atlaspack/commit/53dd47bd6d23cd47f87297347f03a609ab38a03d)]:
+  - @atlaspack/feature-flags@2.24.1
+  - @atlaspack/rust@3.7.0
+  - @atlaspack/utils@2.19.1
+  - @atlaspack/plugin@2.14.29
+  - @atlaspack/types@2.15.19
+
+## 2.22.0
+
+### Minor Changes
+
+- [#762](https://github.com/atlassian-labs/atlaspack/pull/762) [`a5081c3`](https://github.com/atlassian-labs/atlaspack/commit/a5081c3f9207d28716ee4edd3841de1830ea4b80) Thanks [@JakeLane](https://github.com/JakeLane)! - Add feature flag 'useNewPrelude' which enables a micro-optimisation removing a 'for in' call and replacing with undefined check
+
+### Patch Changes
+
+- Updated dependencies [[`f0349a6`](https://github.com/atlassian-labs/atlaspack/commit/f0349a6b9b04755088f121095ca6301a2ada3767), [`a5081c3`](https://github.com/atlassian-labs/atlaspack/commit/a5081c3f9207d28716ee4edd3841de1830ea4b80), [`f930003`](https://github.com/atlassian-labs/atlaspack/commit/f930003364fdc31e5487520ebe256f1a9389f579), [`f930003`](https://github.com/atlassian-labs/atlaspack/commit/f930003364fdc31e5487520ebe256f1a9389f579), [`8843980`](https://github.com/atlassian-labs/atlaspack/commit/88439807be20025fd3433380204ff1205079729e)]:
+  - @atlaspack/feature-flags@2.24.0
+  - @atlaspack/utils@2.19.0
+  - @atlaspack/plugin@2.14.28
+  - @atlaspack/types@2.15.18
+
 ## 2.21.3
 
 ### Patch Changes

package/lib/ScopeHoistingPackager.js

@@ -105,9 +105,11 @@ class ScopeHoistingPackager {
   seenAssets = new Set();
   wrappedAssets = new Set();
   hoistedRequires = new Map();
+  seenHoistedRequires = new Set();
   needsPrelude = false;
   usedHelpers = new Set();
   externalAssets = new Set();
+  useBothScopeHoistingImprovements = (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2') || (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement');
   constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, logger) {
     this.options = options;
     this.bundleGraph = bundleGraph;
@@ -145,7 +147,9 @@ class ScopeHoistingPackager {
     // @ts-expect-error TS7034
     let sourceMap = null;
     let processAsset = asset => {
+      this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
+
       // @ts-expect-error TS7005
       if (sourceMap && map) {
         sourceMap.addSourceMap(map, lineCount);
@@ -155,7 +159,7 @@ class ScopeHoistingPackager {
       res += content + '\n';
       lineCount += lines + 1;
     };
-    if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) {
+    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)) {
@@ -190,7 +194,7 @@ class ScopeHoistingPackager {
     let entries = this.bundle.getEntryAssets();
     let mainEntry = this.bundle.getMainEntry();
     if (this.isAsyncBundle) {
-      if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement') || (0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+      if (this.useBothScopeHoistingImprovements || (0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
         // Generally speaking, async bundles should not be executed on load, as
         // they're just collections of assets that other assets require.
         // However, there are some special cases where a runtime asset needs to be
@@ -317,25 +321,38 @@ class ScopeHoistingPackager {
         if (!asset.meta.isConstantModule || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.priority === 'lazy')) {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
-        } else if (((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) && asset.meta.isConstantModule) {
+        } else if (((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || this.useBothScopeHoistingImprovements) && asset.meta.isConstantModule) {
           constant.push(asset);
         }
       }
     });
-    if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) {
-      // 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.useBothScopeHoistingImprovements) {
       // Tracks which assets have been assigned to a wrap group
       let assignedAssets = new Set();
-      for (let wrappedAsset of wrapped) {
+
+      // In V2 scope hoisting, we iterate from the main entry, rather than
+      // wrapping the entry assets
+      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);
+          }
+        }
+      }
+      let moduleGroupParents = [...wrapped];
+      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) {
+          moduleGroupParents.unshift(mainEntry);
+        }
+      }
+      for (let moduleGroupParentAsset of moduleGroupParents) {
         this.bundle.traverseAssets((asset, _, actions) => {
-          if (asset === wrappedAsset) {
+          if (asset === moduleGroupParentAsset) {
             return;
           }
           if (this.wrappedAssets.has(asset.id)) {
@@ -345,11 +362,15 @@ class ScopeHoistingPackager {
           if (!asset.meta.isConstantModule && (assignedAssets.has(asset) || this.isReExported(asset))) {
             wrapped.push(asset);
             this.wrappedAssets.add(asset.id);
+
+            // This also needs to be added to the traversal so that we iterate
+            // it during this check.
+            moduleGroupParents.push(asset);
             actions.skipChildren();
             return;
           }
           assignedAssets.add(asset);
-        }, wrappedAsset);
+        }, moduleGroupParentAsset);
       }
     } else {
       for (let wrappedAssetRoot of [...wrapped]) {
@@ -568,14 +589,18 @@ class ScopeHoistingPackager {
               // after the dependency is declared. This handles the case where the resulting asset
               // is wrapped, but the dependency in this asset is not marked as wrapped. This means
               // that it was imported/required at the top-level, so its side effects should run immediately.
-              let [res, lines] = this.getHoistedParcelRequires(asset, dep, resolved);
+              let res = '';
+              let lines = 0;
               let map;
+              if (!(0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
+                [res, lines] = this.getHoistedParcelRequires(asset, dep, resolved);
+              }
               if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved.id)) {
                 // 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 ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) {
+                if (this.useBothScopeHoistingImprovements) {
                   if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved.id)) {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
                     if (_utils().debugTools['asset-file-names-in-output']) {
@@ -604,6 +629,13 @@ class ScopeHoistingPackager {
                   }
                 }
               }
+              if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
+                let [requiresCode, requiresLines] = this.getHoistedParcelRequires(asset, dep, resolved);
+                if (requiresCode) {
+                  res = requiresCode + '\n' + res;
+                  lines += requiresLines + 1;
+                }
+              }
 
               // Push this asset's source mappings down by the number of lines in the dependency
               // plus the number of hoisted parcelRequires. Then insert the source map for the dependency.
@@ -1020,8 +1052,17 @@ ${code}
     }
     if (hoisted) {
       this.needsPrelude = true;
-      res += '\n' + [...hoisted.values()].join('\n');
-      lineCount += hoisted.size;
+      if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
+        let hoistedValues = [...hoisted.values()].filter(val => !this.seenHoistedRequires.has(val));
+        for (let val of hoistedValues) {
+          this.seenHoistedRequires.add(val);
+        }
+        res += '\n' + hoistedValues.join('\n');
+        lineCount += hoisted.size;
+      } else {
+        res += '\n' + [...hoisted.values()].join('\n');
+        lineCount += hoisted.size;
+      }
     }
     return [res, lineCount];
   }
@@ -1144,11 +1185,9 @@ ${code}
                 symbol, undefined, replacements);
                 let get = this.buildFunctionExpression([], resolvedSymbol);
                 let set = asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolvedSymbol} = v`) : '';
-                // prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(
-                //   symbol,
-                // )}, ${get}${set});\n`;
-                // this.usedHelpers.add('$parcel$export');
-                append += `$${assetId}$exports[${JSON.stringify(symbol)}] = ${resolvedSymbol};\n`;
+                prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(symbol)}, ${get}${set});\n`;
+                this.usedHelpers.add('$parcel$export');
+                prependLineCount++;
               }
             }
           }
@@ -1186,7 +1225,7 @@ ${code}
         // for the symbol so that when the value changes the object property also changes. This is
         // required to simulate ESM live bindings. It's easier to do it this way rather than inserting
         // additional assignments after each mutation of the original binding.
-        append += `\n${usedExports.map(exp => {
+        prepend += `\n${usedExports.map(exp => {
           var _asset$symbols$get2;
           let resolved = this.getSymbolResolution(asset, asset,
           // @ts-expect-error TS2345
@@ -1194,16 +1233,12 @@ ${code}
           let get = this.buildFunctionExpression([], resolved);
           let isEsmExport = !!((_asset$symbols$get2 = asset.symbols.get(exp)) !== null && _asset$symbols$get2 !== void 0 && (_asset$symbols$get2 = _asset$symbols$get2.meta) !== null && _asset$symbols$get2 !== void 0 && _asset$symbols$get2.isEsm);
           let set = !isEsmExport && asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`) : '';
-          // return `$parcel$export($${assetId}$exports, ${JSON.stringify(
-          //   exp,
-          // )}, ${get}${set});`;
-          return `$${assetId}$exports[${JSON.stringify(exp)}] = ${resolved};\n`;
+          return `$parcel$export($${assetId}$exports, ${JSON.stringify(exp)}, ${get}${set});`;
         }).join('\n')}\n`;
-        // this.usedHelpers.add('$parcel$export');
-        // prependLineCount += 1 + usedExports.length;
+        this.usedHelpers.add('$parcel$export');
+        prependLineCount += 1 + usedExports.length;
       }
     }
-
     return [prepend, prependLineCount, append];
   }
   buildBundlePrelude() {
@@ -1251,7 +1286,7 @@ ${code}
       // Conditional deps may be loaded before entrypoints on the server
       this.hasConditionalDependency();
       if (mightBeFirstJS) {
-        let preludeCode = (0, _helpers.prelude)(this.parcelRequireName);
+        let preludeCode = ((0, _featureFlags().getFeatureFlag)('useNewPrelude') ? _helpers.preludeNew : _helpers.preludeOld)(this.parcelRequireName);
         res += preludeCode;
         if (enableSourceMaps) {
           lines += (0, _utils().countLines)(preludeCode) - 1;

package/lib/helpers.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prelude = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
-const prelude = parcelRequireName => `
+exports.preludeOld = exports.preludeNew = exports.helpers = exports.fnExpr = exports.bundleQueuePrelude = void 0;
+const preludeOld = parcelRequireName => `
 var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -37,7 +37,42 @@ if (parcelRequire == null) {
 
 var parcelRegister = parcelRequire.register;
 `;
-exports.prelude = prelude;
+exports.preludeOld = preludeOld;
+const preludeNew = parcelRequireName => `
+var $parcel$modules = {};
+var $parcel$inits = {};
+
+var parcelRequire = $parcel$global[${JSON.stringify(parcelRequireName)}];
+
+if (parcelRequire == null) {
+  parcelRequire = function(id) {
+    var mod = $parcel$modules[id];
+    if (mod !== undefined) {
+      return mod.exports;
+    }
+    var init = $parcel$inits[id];
+    if (init !== undefined) {
+      delete $parcel$inits[id];
+      var module = {id: id, exports: {}};
+      $parcel$modules[id] = module;
+      init.call(module.exports, module, module.exports);
+      return module.exports;
+    }
+    var err = new Error("Cannot find module '" + id + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
+  };
+
+  parcelRequire.register = function register(id, init) {
+    $parcel$inits[id] = init;
+  };
+
+  $parcel$global[${JSON.stringify(parcelRequireName)}] = parcelRequire;
+}
+
+var parcelRegister = parcelRequire.register;
+`;
+exports.preludeNew = preludeNew;
 const fnExpr = (env, params, body) => {
   let block = `{ ${body.join(' ')} }`;
   if (env.supports('arrow-functions')) {

package/lib/types/ScopeHoistingPackager.d.ts

@@ -28,10 +28,12 @@ export declare class ScopeHoistingPackager {
     seenAssets: Set<string>;
     wrappedAssets: Set<string>;
     hoistedRequires: Map<string, Map<string, string>>;
+    seenHoistedRequires: Set<string>;
     needsPrelude: boolean;
     usedHelpers: Set<string>;
     externalAssets: Set<Asset>;
     logger: PluginLogger;
+    useBothScopeHoistingImprovements: boolean;
     constructor(options: PluginOptions, bundleGraph: BundleGraph<NamedBundle>, bundle: NamedBundle, parcelRequireName: string, useAsyncBundleRuntime: boolean, logger: PluginLogger);
     package(): Promise<{
         contents: string;

package/lib/types/helpers.d.ts

@@ -1,5 +1,6 @@
 import type { Environment } from '@atlaspack/types';
-export declare const prelude: (parcelRequireName: string) => string;
+export declare const preludeOld: (parcelRequireName: string) => string;
+export declare const preludeNew: (parcelRequireName: string) => string;
 export declare const fnExpr: (env: Environment, params: Array<string>, body: Array<string>) => string;
 export declare const bundleQueuePrelude: (env: Environment) => string;
 export declare const helpers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.21.4-dev-export-func-removal-960dd335d.0",
+  "version": "2.22.1",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,13 +16,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.4-dev-export-func-removal-960dd335d.0",
-    "@atlaspack/feature-flags": "2.23.3-dev-export-func-removal-960dd335d.0",
-    "@atlaspack/plugin": "2.14.28-dev-export-func-removal-960dd335d.0",
-    "@atlaspack/rust": "3.6.3-dev-export-func-removal-960dd335d.0",
-    "@atlaspack/types": "2.15.18-dev-export-func-removal-960dd335d.0",
-    "@atlaspack/utils": "2.18.5-dev-export-func-removal-960dd335d.0",
+    "@atlaspack/diagnostic": "2.14.3",
+    "@atlaspack/feature-flags": "2.24.1",
+    "@atlaspack/plugin": "2.14.29",
+    "@atlaspack/rust": "3.7.0",
     "@parcel/source-map": "^2.1.1",
+    "@atlaspack/types": "2.15.19",
+    "@atlaspack/utils": "2.19.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.8.0"
@@ -31,6 +31,5 @@
   "scripts": {
     "check-ts": "tsc --emitDeclarationOnly --rootDir src",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  },
-  "gitHead": "960dd335d08a04220a07b36f4bb83cd7e130903e"
+  }
 }

package/src/ScopeHoistingPackager.ts

@@ -29,7 +29,13 @@ import {outdent} from 'outdent';
 import {ESMOutputFormat} from './ESMOutputFormat';
 import {CJSOutputFormat} from './CJSOutputFormat';
 import {GlobalOutputFormat} from './GlobalOutputFormat';
-import {prelude, helpers, bundleQueuePrelude, fnExpr} from './helpers';
+import {
+  preludeOld,
+  preludeNew,
+  helpers,
+  bundleQueuePrelude,
+  fnExpr,
+} from './helpers';
 import {
   replaceScriptDependencies,
   getSpecifier,
@@ -106,10 +112,14 @@ export class ScopeHoistingPackager {
   seenAssets: Set<string> = new Set();
   wrappedAssets: Set<string> = new Set();
   hoistedRequires: Map<string, Map<string, string>> = new Map();
+  seenHoistedRequires: Set<string> = new Set();
   needsPrelude: boolean = false;
   usedHelpers: Set<string> = new Set();
   externalAssets: Set<Asset> = new Set();
   logger: PluginLogger;
+  useBothScopeHoistingImprovements: boolean =
+    getFeatureFlag('applyScopeHoistingImprovementV2') ||
+    getFeatureFlag('applyScopeHoistingImprovement');
 
   constructor(
     options: PluginOptions,
@@ -167,7 +177,9 @@ export class ScopeHoistingPackager {
     // @ts-expect-error TS7034
     let sourceMap = null;
     let processAsset = (asset: Asset) => {
+      this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
+
       // @ts-expect-error TS7005
       if (sourceMap && map) {
         sourceMap.addSourceMap(map, lineCount);
@@ -181,7 +193,7 @@ export class ScopeHoistingPackager {
 
     if (
       getFeatureFlag('inlineConstOptimisationFix') ||
-      getFeatureFlag('applyScopeHoistingImprovement')
+      this.useBothScopeHoistingImprovements
     ) {
       // Write out all constant modules used by this bundle
       for (let asset of constantAssets) {
@@ -221,7 +233,7 @@ export class ScopeHoistingPackager {
     let mainEntry = this.bundle.getMainEntry();
     if (this.isAsyncBundle) {
       if (
-        getFeatureFlag('applyScopeHoistingImprovement') ||
+        this.useBothScopeHoistingImprovements ||
         getFeatureFlag('supportWebpackChunkName')
       ) {
         // Generally speaking, async bundles should not be executed on load, as
@@ -427,7 +439,7 @@ export class ScopeHoistingPackager {
           wrapped.push(asset);
         } else if (
           (getFeatureFlag('inlineConstOptimisationFix') ||
-            getFeatureFlag('applyScopeHoistingImprovement')) &&
+            this.useBothScopeHoistingImprovements) &&
           asset.meta.isConstantModule
         ) {
           constant.push(asset);
@@ -435,21 +447,36 @@ export class ScopeHoistingPackager {
       }
     });
 
-    if (getFeatureFlag('applyScopeHoistingImprovement')) {
-      // 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.useBothScopeHoistingImprovements) {
+      // Tracks which assets have been assigned to a wrap group
+      let assignedAssets = new Set<Asset>();
+
+      // In V2 scope hoisting, we iterate from the main entry, rather than
+      // wrapping the entry assets
+      if (!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);
+          }
         }
       }
 
-      // Tracks which assets have been assigned to a wrap group
-      let assignedAssets = new Set<Asset>();
+      let moduleGroupParents = [...wrapped];
 
-      for (let wrappedAsset of wrapped) {
+      if (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) {
+          moduleGroupParents.unshift(mainEntry);
+        }
+      }
+
+      for (let moduleGroupParentAsset of moduleGroupParents) {
         this.bundle.traverseAssets((asset, _, actions) => {
-          if (asset === wrappedAsset) {
+          if (asset === moduleGroupParentAsset) {
             return;
           }
 
@@ -465,12 +492,16 @@ export class ScopeHoistingPackager {
             wrapped.push(asset);
             this.wrappedAssets.add(asset.id);
 
+            // This also needs to be added to the traversal so that we iterate
+            // it during this check.
+            moduleGroupParents.push(asset);
+
             actions.skipChildren();
             return;
           }
 
           assignedAssets.add(asset);
-        }, wrappedAsset);
+        }, moduleGroupParentAsset);
       }
     } else {
       for (let wrappedAssetRoot of [...wrapped]) {
@@ -746,12 +777,18 @@ export class ScopeHoistingPackager {
                 // after the dependency is declared. This handles the case where the resulting asset
                 // is wrapped, but the dependency in this asset is not marked as wrapped. This means
                 // that it was imported/required at the top-level, so its side effects should run immediately.
-                let [res, lines] = this.getHoistedParcelRequires(
-                  asset,
-                  dep,
-                  resolved,
-                );
+                let res = '';
+                let lines = 0;
                 let map;
+
+                if (!getFeatureFlag('applyScopeHoistingImprovementV2')) {
+                  [res, lines] = this.getHoistedParcelRequires(
+                    asset,
+                    dep,
+                    resolved,
+                  );
+                }
+
                 if (
                   this.bundle.hasAsset(resolved) &&
                   !this.seenAssets.has(resolved.id)
@@ -760,7 +797,7 @@ export class ScopeHoistingPackager {
                   // 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 (getFeatureFlag('applyScopeHoistingImprovement')) {
+                  if (this.useBothScopeHoistingImprovements) {
                     if (
                       !resolved.meta.isConstantModule &&
                       !this.wrappedAssets.has(resolved.id)
@@ -795,6 +832,16 @@ export class ScopeHoistingPackager {
                   }
                 }
 
+                if (getFeatureFlag('applyScopeHoistingImprovementV2')) {
+                  let [requiresCode, requiresLines] =
+                    this.getHoistedParcelRequires(asset, dep, resolved);
+
+                  if (requiresCode) {
+                    res = requiresCode + '\n' + res;
+                    lines += requiresLines + 1;
+                  }
+                }
+
                 // Push this asset's source mappings down by the number of lines in the dependency
                 // plus the number of hoisted parcelRequires. Then insert the source map for the dependency.
                 if (sourceMap) {
@@ -1363,8 +1410,22 @@ ${code}
 
     if (hoisted) {
       this.needsPrelude = true;
-      res += '\n' + [...hoisted.values()].join('\n');
-      lineCount += hoisted.size;
+
+      if (getFeatureFlag('applyScopeHoistingImprovementV2')) {
+        let hoistedValues = [...hoisted.values()].filter(
+          (val) => !this.seenHoistedRequires.has(val),
+        );
+
+        for (let val of hoistedValues) {
+          this.seenHoistedRequires.add(val);
+        }
+
+        res += '\n' + hoistedValues.join('\n');
+        lineCount += hoisted.size;
+      } else {
+        res += '\n' + [...hoisted.values()].join('\n');
+        lineCount += hoisted.size;
+      }
     }
 
     return [res, lineCount];
@@ -1543,13 +1604,11 @@ ${code}
                   ? ', ' +
                     this.buildFunctionExpression(['v'], `${resolvedSymbol} = v`)
                   : '';
-                // prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(
-                //   symbol,
-                // )}, ${get}${set});\n`;
-                // this.usedHelpers.add('$parcel$export');
-                append += `$${assetId}$exports[${JSON.stringify(
+                prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(
                   symbol,
-                )}] = ${resolvedSymbol};\n`;
+                )}, ${get}${set});\n`;
+                this.usedHelpers.add('$parcel$export');
+                prependLineCount++;
               }
             }
           }
@@ -1589,7 +1648,7 @@ ${code}
         // for the symbol so that when the value changes the object property also changes. This is
         // required to simulate ESM live bindings. It's easier to do it this way rather than inserting
         // additional assignments after each mutation of the original binding.
-        append += `\n${usedExports
+        prepend += `\n${usedExports
           .map((exp) => {
             let resolved = this.getSymbolResolution(
               asset,
@@ -1605,16 +1664,13 @@ ${code}
               !isEsmExport && asset.meta.hasCJSExports
                 ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`)
                 : '';
-            // return `$parcel$export($${assetId}$exports, ${JSON.stringify(
-            //   exp,
-            // )}, ${get}${set});`;
-            return `$${assetId}$exports[${JSON.stringify(
+            return `$parcel$export($${assetId}$exports, ${JSON.stringify(
               exp,
-            )}] = ${resolved};\n`;
+            )}, ${get}${set});`;
           })
           .join('\n')}\n`;
-        // this.usedHelpers.add('$parcel$export');
-        // prependLineCount += 1 + usedExports.length;
+        this.usedHelpers.add('$parcel$export');
+        prependLineCount += 1 + usedExports.length;
       }
     }
 
@@ -1682,7 +1738,9 @@ ${code}
         this.hasConditionalDependency();
 
       if (mightBeFirstJS) {
-        let preludeCode = prelude(this.parcelRequireName);
+        let preludeCode = (
+          getFeatureFlag('useNewPrelude') ? preludeNew : preludeOld
+        )(this.parcelRequireName);
         res += preludeCode;
         if (enableSourceMaps) {
           lines += countLines(preludeCode) - 1;

package/src/helpers.ts

@@ -1,6 +1,6 @@
 import type {Environment} from '@atlaspack/types';
 
-export const prelude = (parcelRequireName: string): string => `
+export const preludeOld = (parcelRequireName: string): string => `
 var $parcel$modules = {};
 var $parcel$inits = {};
 
@@ -34,6 +34,41 @@ if (parcelRequire == null) {
 var parcelRegister = parcelRequire.register;
 `;
 
+export const preludeNew = (parcelRequireName: string): string => `
+var $parcel$modules = {};
+var $parcel$inits = {};
+
+var parcelRequire = $parcel$global[${JSON.stringify(parcelRequireName)}];
+
+if (parcelRequire == null) {
+  parcelRequire = function(id) {
+    var mod = $parcel$modules[id];
+    if (mod !== undefined) {
+      return mod.exports;
+    }
+    var init = $parcel$inits[id];
+    if (init !== undefined) {
+      delete $parcel$inits[id];
+      var module = {id: id, exports: {}};
+      $parcel$modules[id] = module;
+      init.call(module.exports, module, module.exports);
+      return module.exports;
+    }
+    var err = new Error("Cannot find module '" + id + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
+  };
+
+  parcelRequire.register = function register(id, init) {
+    $parcel$inits[id] = init;
+  };
+
+  $parcel$global[${JSON.stringify(parcelRequireName)}] = parcelRequire;
+}
+
+var parcelRegister = parcelRequire.register;
+`;
+
 export const fnExpr = (
   env: Environment,
   params: Array<string>,

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) 2024 Atlassian US., Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.