@atlaspack/core 2.25.2-dev-5779cd2e2.0 → 2.25.2-dev-9dac9ed3a.0

package/dist/Atlaspack.js

@@ -373,7 +373,7 @@ class Atlaspack {
                 requestedAssetIds: __classPrivateFieldGet(this, _Atlaspack_requestedAssetIds, "f"),
                 signal,
             });
-            let { bundleGraph, bundleInfo, changedAssets, assetRequests } = await __classPrivateFieldGet(this, _Atlaspack_requestTracker, "f").runRequest(request, { force: true });
+            let { bundleGraph, bundleInfo, changedAssets, assetRequests, scopeHoistingStats, } = await __classPrivateFieldGet(this, _Atlaspack_requestTracker, "f").runRequest(request, { force: true });
             __classPrivateFieldGet(this, _Atlaspack_requestedAssetIds, "f").clear();
             await (0, dumpGraphToGraphViz_1.default)(
             // @ts-expect-error TS2345
@@ -403,6 +403,7 @@ class Atlaspack {
                             buildTime: 0,
                             requestBundle: event.requestBundle,
                             unstable_requestStats: {},
+                            scopeHoistingStats: event.scopeHoistingStats,
                         };
                     }
                     for (let assetId of bundleNode.value.entryAssetIds) {
@@ -424,6 +425,7 @@ class Atlaspack {
                     return result;
                 },
                 unstable_requestStats: __classPrivateFieldGet(this, _Atlaspack_requestTracker, "f").flushStats(),
+                scopeHoistingStats,
             };
             // @ts-expect-error TS2345
             await __classPrivateFieldGet(this, _Atlaspack_reporterRunner, "f").report(event);

package/dist/PackagerRunner.js

@@ -170,7 +170,7 @@ class PackagerRunner {
         return this.options.cache.get(infoKey);
     }
     async getBundleInfo(bundle, bundleGraph, configs, bundleConfigs) {
-        let { type, contents, map } = await this.getBundleResult(bundle, bundleGraph, configs, bundleConfigs);
+        let { type, contents, map, scopeHoistingStats } = await this.getBundleResult(bundle, bundleGraph, configs, bundleConfigs);
         // Recompute cache keys as they may have changed due to dev dependencies.
         let cacheKey = await this.getCacheKey(bundle, bundleGraph, configs, bundleConfigs, [...this.invalidations.values()]);
         let cacheKeys = {
@@ -178,7 +178,11 @@ class PackagerRunner {
             map: PackagerRunner.getMapKey(cacheKey),
             info: PackagerRunner.getInfoKey(cacheKey),
         };
-        return this.writeToCache(cacheKeys, type, contents, map);
+        let cachedResult = await this.writeToCache(cacheKeys, type, contents, map);
+        if (utils_1.debugTools['scope-hoisting-stats']) {
+            return { ...cachedResult, scopeHoistingStats };
+        }
+        return cachedResult;
     }
     async getBundleResult(bundle, bundleGraph, configs, bundleConfigs) {
         let packaged = await this.package(bundle, bundleGraph, configs, bundleConfigs);
@@ -189,6 +193,7 @@ class PackagerRunner {
             type: res.type ?? type,
             contents: res.contents,
             map,
+            scopeHoistingStats: packaged.scopeHoistingStats,
         };
     }
     getSourceMapReference(bundle, map) {
@@ -237,8 +242,8 @@ class PackagerRunner {
                         bundle.bundleBehavior !== 'inlineIsolated') {
                         throw new Error('Bundle is not inline and unable to retrieve contents');
                     }
-                    let res = await this.getBundleResult((0, Bundle_1.bundleToInternalBundle)(bundle), (0, BundleGraph_1.bundleGraphToInternalBundleGraph)(bundleGraph), configs, bundleConfigs);
-                    return { contents: res.contents };
+                    let { contents } = await this.getBundleResult((0, Bundle_1.bundleToInternalBundle)(bundle), (0, BundleGraph_1.bundleGraphToInternalBundleGraph)(bundleGraph), configs, bundleConfigs);
+                    return { contents };
                 },
             });
         }

package/dist/requests/AtlaspackBuildRequest.js

@@ -23,8 +23,7 @@ function createAtlaspackBuildRequest(input) {
         input,
     };
 }
-// @ts-expect-error TS7031
-async function run({ input, api, options, rustAtlaspack }) {
+async function run({ input, api, options, rustAtlaspack, }) {
     let { optionsRef, requestedAssetIds, signal } = input;
     let bundleGraphRequest = (0, BundleGraphRequest_1.default)({
         optionsRef,
@@ -53,8 +52,14 @@ async function run({ input, api, options, rustAtlaspack }) {
         bundleGraph,
         optionsRef,
     });
-    let bundleInfo = await api.runRequest(writeBundlesRequest);
+    let { bundleInfo, scopeHoistingStats } = await api.runRequest(writeBundlesRequest);
     packagingMeasurement && packagingMeasurement.end();
     (0, utils_1.assertSignalNotAborted)(signal);
-    return { bundleGraph, bundleInfo, changedAssets, assetRequests };
+    return {
+        bundleGraph,
+        bundleInfo,
+        changedAssets,
+        assetRequests,
+        scopeHoistingStats,
+    };
 }

package/dist/requests/PackageRequest.js

@@ -17,15 +17,12 @@ function createPackageRequest(input) {
         input,
     };
 }
-// @ts-expect-error TS7031
 async function run({ input, api, farm }) {
     let { bundleGraphReference, optionsRef, bundle, useMainThread } = input;
     let runPackage = farm.createHandle('runPackage', useMainThread);
     let start = Date.now();
     let { devDeps, invalidDevDeps } = await (0, DevDepRequest_1.getDevDepRequests)(api);
-    let { cachePath } = (0, nullthrows_1.default)(
-    // @ts-expect-error TS2347
-    await api.runRequest((0, AtlaspackConfigRequest_1.default)()));
+    let { cachePath } = (0, nullthrows_1.default)(await api.runRequest((0, AtlaspackConfigRequest_1.default)()));
     let { devDepRequests, configRequests, bundleInfo, invalidations } = (await runPackage({
         bundle,
         bundleGraphReference,

package/dist/requests/TargetRequest.js

@@ -887,6 +887,7 @@ class TargetResolver {
                                 : descriptor.optimize !== false),
                         shouldScopeHoist: shouldScopeHoist && descriptor.scopeHoist !== false,
                         sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
+                        customEnv: descriptor.env,
                     }),
                     loc: (0, utils_2.toInternalSourceLocation)(this.options.projectRoot, loc),
                 });

package/dist/requests/WriteBundlesRequest.js

@@ -14,6 +14,7 @@ const nullthrows_1 = __importDefault(require("nullthrows"));
 const rust_1 = require("@atlaspack/rust");
 const PackageRequest_1 = require("./PackageRequest");
 const WriteBundleRequest_1 = __importDefault(require("./WriteBundleRequest"));
+const utils_1 = require("@atlaspack/utils");
 function reportPackagingProgress(completeBundles, totalBundles) {
     if (!(0, feature_flags_1.getFeatureFlag)('cliProgressReportingImprovements')) {
         return;
@@ -131,8 +132,26 @@ async function run({ input, api, farm, options, }) {
                 }));
             return promise.then((r) => res.set(bundle.id, r));
         }));
-        api.storeResult(res);
-        return res;
+        let result = { bundleInfo: res };
+        if (utils_1.debugTools['scope-hoisting-stats']) {
+            // Aggregate scope hoisting stats from all bundles
+            let aggregatedScopeHoistingStats = {
+                totalAssets: 0,
+                wrappedAssets: 0,
+            };
+            for (let bundle of bundles) {
+                let bundleInfo = bundleInfoMap[bundle.id];
+                if (bundleInfo?.scopeHoistingStats) {
+                    aggregatedScopeHoistingStats.totalAssets +=
+                        bundleInfo.scopeHoistingStats.totalAssets;
+                    aggregatedScopeHoistingStats.wrappedAssets +=
+                        bundleInfo.scopeHoistingStats.wrappedAssets;
+                }
+            }
+            result.scopeHoistingStats = aggregatedScopeHoistingStats;
+        }
+        api.storeResult(result);
+        return result;
     }
     finally {
         await dispose();

package/lib/Atlaspack.js

@@ -431,7 +431,8 @@ class Atlaspack {
         bundleGraph,
         bundleInfo,
         changedAssets,
-        assetRequests
+        assetRequests,
+        scopeHoistingStats
       } = await this.#requestTracker.runRequest(request, {
         force: true
       });
@@ -456,7 +457,8 @@ class Atlaspack {
               bundleGraph: event.bundleGraph,
               buildTime: 0,
               requestBundle: event.requestBundle,
-              unstable_requestStats: {}
+              unstable_requestStats: {},
+              scopeHoistingStats: event.scopeHoistingStats
             };
           }
           for (let assetId of bundleNode.value.entryAssetIds) {
@@ -477,7 +479,8 @@ class Atlaspack {
           }
           return result;
         },
-        unstable_requestStats: this.#requestTracker.flushStats()
+        unstable_requestStats: this.#requestTracker.flushStats(),
+        scopeHoistingStats
       };
 
       // @ts-expect-error TS2345

package/lib/PackagerRunner.js

@@ -230,7 +230,8 @@ class PackagerRunner {
     let {
       type,
       contents,
-      map
+      map,
+      scopeHoistingStats
     } = await this.getBundleResult(bundle, bundleGraph, configs, bundleConfigs);
 
     // Recompute cache keys as they may have changed due to dev dependencies.
@@ -240,7 +241,14 @@ class PackagerRunner {
       map: PackagerRunner.getMapKey(cacheKey),
       info: PackagerRunner.getInfoKey(cacheKey)
     };
-    return this.writeToCache(cacheKeys, type, contents, map);
+    let cachedResult = await this.writeToCache(cacheKeys, type, contents, map);
+    if (_utils().debugTools['scope-hoisting-stats']) {
+      return {
+        ...cachedResult,
+        scopeHoistingStats
+      };
+    }
+    return cachedResult;
   }
   async getBundleResult(bundle, bundleGraph, configs, bundleConfigs) {
     let packaged = await this.package(bundle, bundleGraph, configs, bundleConfigs);
@@ -250,7 +258,8 @@ class PackagerRunner {
     return {
       type: res.type ?? type,
       contents: res.contents,
-      map
+      map,
+      scopeHoistingStats: packaged.scopeHoistingStats
     };
   }
   getSourceMapReference(bundle, map) {
@@ -303,9 +312,11 @@ class PackagerRunner {
           if (bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inlineIsolated') {
             throw new Error('Bundle is not inline and unable to retrieve contents');
           }
-          let res = await this.getBundleResult((0, _Bundle.bundleToInternalBundle)(bundle), (0, _BundleGraph.bundleGraphToInternalBundleGraph)(bundleGraph), configs, bundleConfigs);
+          let {
+            contents
+          } = await this.getBundleResult((0, _Bundle.bundleToInternalBundle)(bundle), (0, _BundleGraph.bundleGraphToInternalBundleGraph)(bundleGraph), configs, bundleConfigs);
           return {
-            contents: res.contents
+            contents
           };
         }
       });
@@ -420,7 +431,7 @@ class PackagerRunner {
     let isInlineMap = bundleEnv.sourceMap && bundleEnv.sourceMap.inline;
     if ((0, _featureFlags().getFeatureFlag)('omitSourcesContentInMemory') && !isInlineMap) {
       if (!(bundleEnv.sourceMap && bundleEnv.sourceMap.inlineSources === false)) {
-        /* 
+        /*
           We're omitting sourcesContent during transformation to allow GC to run.
           Ensure sources are still inlined into the final source maps written to disk. UNLESS the user explicitly disabled inlineSources.
         */

package/lib/requests/AtlaspackBuildRequest.js

@@ -30,8 +30,6 @@ function createAtlaspackBuildRequest(input) {
     input
   };
 }
-
-// @ts-expect-error TS7031
 async function run({
   input,
   api,
@@ -71,13 +69,17 @@ async function run({
     bundleGraph,
     optionsRef
   });
-  let bundleInfo = await api.runRequest(writeBundlesRequest);
+  let {
+    bundleInfo,
+    scopeHoistingStats
+  } = await api.runRequest(writeBundlesRequest);
   packagingMeasurement && packagingMeasurement.end();
   (0, _utils.assertSignalNotAborted)(signal);
   return {
     bundleGraph,
     bundleInfo,
     changedAssets,
-    assetRequests
+    assetRequests,
+    scopeHoistingStats
   };
 }

package/lib/requests/PackageRequest.js

@@ -24,8 +24,6 @@ function createPackageRequest(input) {
     input
   };
 }
-
-// @ts-expect-error TS7031
 async function run({
   input,
   api,
@@ -45,9 +43,7 @@ async function run({
   } = await (0, _DevDepRequest.getDevDepRequests)(api);
   let {
     cachePath
-  } = (0, _nullthrows().default)(
-  // @ts-expect-error TS2347
-  await api.runRequest((0, _AtlaspackConfigRequest.default)()));
+  } = (0, _nullthrows().default)(await api.runRequest((0, _AtlaspackConfigRequest.default)()));
   let {
     devDepRequests,
     configRequests,

package/lib/requests/TargetRequest.js

@@ -830,7 +830,8 @@ class TargetResolver {
             // Libraries are not optimized by default, users must explicitly configure this.
             isLibrary ? descriptor.optimize === true : descriptor.optimize !== false),
             shouldScopeHoist: shouldScopeHoist && descriptor.scopeHoist !== false,
-            sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap)
+            sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
+            customEnv: descriptor.env
           }),
           loc: (0, _utils2.toInternalSourceLocation)(this.options.projectRoot, loc)
         });

package/lib/requests/WriteBundlesRequest.js

@@ -32,6 +32,13 @@ function _rust() {
 }
 var _PackageRequest = require("./PackageRequest");
 var _WriteBundleRequest = _interopRequireDefault(require("./WriteBundleRequest"));
+function _utils() {
+  const data = require("@atlaspack/utils");
+  _utils = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function reportPackagingProgress(completeBundles, totalBundles) {
   if (!(0, _featureFlags().getFeatureFlag)('cliProgressReportingImprovements')) {
@@ -159,8 +166,26 @@ async function run({
       }));
       return promise.then(r => res.set(bundle.id, r));
     }));
-    api.storeResult(res);
-    return res;
+    let result = {
+      bundleInfo: res
+    };
+    if (_utils().debugTools['scope-hoisting-stats']) {
+      // Aggregate scope hoisting stats from all bundles
+      let aggregatedScopeHoistingStats = {
+        totalAssets: 0,
+        wrappedAssets: 0
+      };
+      for (let bundle of bundles) {
+        let bundleInfo = bundleInfoMap[bundle.id];
+        if (bundleInfo !== null && bundleInfo !== void 0 && bundleInfo.scopeHoistingStats) {
+          aggregatedScopeHoistingStats.totalAssets += bundleInfo.scopeHoistingStats.totalAssets;
+          aggregatedScopeHoistingStats.wrappedAssets += bundleInfo.scopeHoistingStats.wrappedAssets;
+        }
+      }
+      result.scopeHoistingStats = aggregatedScopeHoistingStats;
+    }
+    api.storeResult(result);
+    return result;
   } finally {
     await dispose();
   }

package/lib/types/PackagerRunner.d.ts

@@ -30,6 +30,10 @@ export type BundleInfo = {
     readonly time?: number;
     readonly cacheKeys: CacheKeyMap;
     readonly isLargeBlob: boolean;
+    readonly scopeHoistingStats?: {
+        totalAssets: number;
+        wrappedAssets: number;
+    };
 };
 type CacheKeyMap = {
     content: string;
@@ -61,6 +65,7 @@ export default class PackagerRunner {
         type: string;
         contents: Blob;
         map: string | null | undefined;
+        scopeHoistingStats?: BundleResult['scopeHoistingStats'];
     }>;
     getSourceMapReference(bundle: NamedBundle, map?: SourceMap | null): Async<string | null | undefined>;
     package(internalBundle: InternalBundle, bundleGraph: InternalBundleGraph, configs: Map<string, Config>, bundleConfigs: Map<string, Config>): Promise<BundleResult>;

package/lib/types/requests/AtlaspackBuildRequest.d.ts

@@ -15,6 +15,10 @@ export type AtlaspackBuildRequestResult = {
     bundleInfo: Map<string, PackagedBundleInfo>;
     changedAssets: Map<string, Asset>;
     assetRequests: Array<AssetGroup>;
+    scopeHoistingStats?: {
+        totalAssets: number;
+        wrappedAssets: number;
+    };
 };
 type RunInput<TResult> = {
     input: AtlaspackBuildRequestInput;

package/lib/types/requests/WriteBundlesRequest.d.ts

@@ -9,7 +9,13 @@ type WriteBundlesRequestInput = {
     bundleGraph: BundleGraph;
     optionsRef: SharedReference;
 };
-export type WriteBundlesRequestResult = Map<string, PackagedBundleInfo>;
+export type WriteBundlesRequestResult = {
+    bundleInfo: Map<string, PackagedBundleInfo>;
+    scopeHoistingStats?: {
+        totalAssets: number;
+        wrappedAssets: number;
+    };
+};
 type RunInput<TResult> = {
     input: WriteBundlesRequestInput;
 } & StaticRunOpts<TResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.25.2-dev-5779cd2e2.0",
+  "version": "2.25.2-dev-9dac9ed3a.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -22,22 +22,22 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.7-dev-5779cd2e2.0",
-    "@atlaspack/cache": "3.2.30-dev-5779cd2e2.0",
-    "@atlaspack/diagnostic": "2.14.5-dev-5779cd2e2.0",
-    "@atlaspack/events": "2.14.5-dev-5779cd2e2.0",
-    "@atlaspack/feature-flags": "2.25.5-dev-5779cd2e2.0",
-    "@atlaspack/fs": "2.15.30-dev-5779cd2e2.0",
-    "@atlaspack/graph": "3.5.24-dev-5779cd2e2.0",
-    "@atlaspack/logger": "2.14.27-dev-5779cd2e2.0",
-    "@atlaspack/package-manager": "2.14.35-dev-5779cd2e2.0",
-    "@atlaspack/plugin": "2.14.35-dev-5779cd2e2.0",
-    "@atlaspack/profiler": "2.14.32-dev-5779cd2e2.0",
-    "@atlaspack/rust": "3.8.3-dev-5779cd2e2.0",
-    "@atlaspack/source-map": "3.0.1-dev-5779cd2e2.0",
-    "@atlaspack/types": "2.15.25-dev-5779cd2e2.0",
-    "@atlaspack/utils": "3.0.3-dev-5779cd2e2.0",
-    "@atlaspack/workers": "2.14.35-dev-5779cd2e2.0",
+    "@atlaspack/build-cache": "2.13.7-dev-9dac9ed3a.0",
+    "@atlaspack/cache": "3.2.30-dev-9dac9ed3a.0",
+    "@atlaspack/diagnostic": "2.14.5-dev-9dac9ed3a.0",
+    "@atlaspack/events": "2.14.5-dev-9dac9ed3a.0",
+    "@atlaspack/feature-flags": "2.25.5-dev-9dac9ed3a.0",
+    "@atlaspack/fs": "2.15.30-dev-9dac9ed3a.0",
+    "@atlaspack/graph": "3.5.24-dev-9dac9ed3a.0",
+    "@atlaspack/logger": "2.14.27-dev-9dac9ed3a.0",
+    "@atlaspack/package-manager": "2.14.35-dev-9dac9ed3a.0",
+    "@atlaspack/plugin": "2.14.35-dev-9dac9ed3a.0",
+    "@atlaspack/profiler": "2.14.32-dev-9dac9ed3a.0",
+    "@atlaspack/rust": "3.8.3-dev-9dac9ed3a.0",
+    "@atlaspack/source-map": "3.0.1-dev-9dac9ed3a.0",
+    "@atlaspack/types": "2.15.25-dev-9dac9ed3a.0",
+    "@atlaspack/utils": "3.0.3-dev-9dac9ed3a.0",
+    "@atlaspack/workers": "2.14.35-dev-9dac9ed3a.0",
     "@mischnic/json-sourcemap": "^0.1.0",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
@@ -50,7 +50,7 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.5-dev-5779cd2e2.0",
+    "@atlaspack/babel-register": "2.14.5-dev-9dac9ed3a.0",
     "@types/node": ">= 18",
     "graphviz": "^0.0.9",
     "jest-diff": "*",
@@ -61,5 +61,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "5779cd2e2d554546c84fe2b7e4c57611975a15b2"
+  "gitHead": "9dac9ed3ab18934ba96e184638b45e9f171ecfc7"
 }

package/src/Atlaspack.ts

@@ -427,8 +427,13 @@ export default class Atlaspack {
         signal,
       });
 
-      let {bundleGraph, bundleInfo, changedAssets, assetRequests} =
-        await this.#requestTracker.runRequest(request, {force: true});
+      let {
+        bundleGraph,
+        bundleInfo,
+        changedAssets,
+        assetRequests,
+        scopeHoistingStats,
+      } = await this.#requestTracker.runRequest(request, {force: true});
 
       this.#requestedAssetIds.clear();
 
@@ -479,6 +484,7 @@ export default class Atlaspack {
               buildTime: 0,
               requestBundle: event.requestBundle,
               unstable_requestStats: {},
+              scopeHoistingStats: event.scopeHoistingStats,
             };
           }
 
@@ -505,6 +511,7 @@ export default class Atlaspack {
           return result;
         },
         unstable_requestStats: this.#requestTracker.flushStats(),
+        scopeHoistingStats,
       };
 
       // @ts-expect-error TS2345

package/src/PackagerRunner.ts

@@ -24,7 +24,7 @@ import type {DevDepSpecifier} from './requests/DevDepRequest';
 
 import invariant from 'assert';
 import {createBuildCache} from '@atlaspack/build-cache';
-import {blobToStream, TapStream} from '@atlaspack/utils';
+import {blobToStream, debugTools, TapStream} from '@atlaspack/utils';
 import {PluginLogger} from '@atlaspack/logger';
 import ThrowableDiagnostic, {errorToDiagnostic} from '@atlaspack/diagnostic';
 import {Readable} from 'stream';
@@ -87,6 +87,10 @@ export type BundleInfo = {
   readonly time?: number;
   readonly cacheKeys: CacheKeyMap;
   readonly isLargeBlob: boolean;
+  readonly scopeHoistingStats?: {
+    totalAssets: number;
+    wrappedAssets: number;
+  };
 };
 
 type CacheKeyMap = {
@@ -313,7 +317,7 @@ export default class PackagerRunner {
     configs: Map<string, Config>,
     bundleConfigs: Map<string, Config>,
   ): Promise<BundleInfo> {
-    let {type, contents, map} = await this.getBundleResult(
+    let {type, contents, map, scopeHoistingStats} = await this.getBundleResult(
       bundle,
       bundleGraph,
       configs,
@@ -334,7 +338,13 @@ export default class PackagerRunner {
       info: PackagerRunner.getInfoKey(cacheKey),
     };
 
-    return this.writeToCache(cacheKeys, type, contents, map);
+    let cachedResult = await this.writeToCache(cacheKeys, type, contents, map);
+
+    if (debugTools['scope-hoisting-stats']) {
+      return {...cachedResult, scopeHoistingStats};
+    }
+
+    return cachedResult;
   }
 
   async getBundleResult(
@@ -346,6 +356,7 @@ export default class PackagerRunner {
     type: string;
     contents: Blob;
     map: string | null | undefined;
+    scopeHoistingStats?: BundleResult['scopeHoistingStats'];
   }> {
     let packaged = await this.package(
       bundle,
@@ -370,6 +381,7 @@ export default class PackagerRunner {
       type: res.type ?? type,
       contents: res.contents,
       map,
+      scopeHoistingStats: packaged.scopeHoistingStats,
     };
   }
 
@@ -441,14 +453,14 @@ export default class PackagerRunner {
             );
           }
 
-          let res = await this.getBundleResult(
+          let {contents} = await this.getBundleResult(
             bundleToInternalBundle(bundle),
             bundleGraphToInternalBundleGraph(bundleGraph),
             configs,
             bundleConfigs,
           );
 
-          return {contents: res.contents};
+          return {contents};
         },
       });
     } catch (e: any) {
@@ -621,7 +633,7 @@ export default class PackagerRunner {
       if (
         !(bundleEnv.sourceMap && bundleEnv.sourceMap.inlineSources === false)
       ) {
-        /* 
+        /*
           We're omitting sourcesContent during transformation to allow GC to run.
           Ensure sources are still inlined into the final source maps written to disk. UNLESS the user explicitly disabled inlineSources.
         */

package/src/requests/AtlaspackBuildRequest.ts

@@ -32,6 +32,10 @@ export type AtlaspackBuildRequestResult = {
   bundleInfo: Map<string, PackagedBundleInfo>;
   changedAssets: Map<string, Asset>;
   assetRequests: Array<AssetGroup>;
+  scopeHoistingStats?: {
+    totalAssets: number;
+    wrappedAssets: number;
+  };
 };
 
 type RunInput<TResult> = {
@@ -58,8 +62,12 @@ export default function createAtlaspackBuildRequest(
   };
 }
 
-// @ts-expect-error TS7031
-async function run({input, api, options, rustAtlaspack}) {
+async function run({
+  input,
+  api,
+  options,
+  rustAtlaspack,
+}: RunInput<AtlaspackBuildRequestResult>) {
   let {optionsRef, requestedAssetIds, signal} = input;
 
   let bundleGraphRequest = createBundleGraphRequest({
@@ -102,9 +110,16 @@ async function run({input, api, options, rustAtlaspack}) {
     optionsRef,
   });
 
-  let bundleInfo = await api.runRequest(writeBundlesRequest);
+  let {bundleInfo, scopeHoistingStats} =
+    await api.runRequest(writeBundlesRequest);
   packagingMeasurement && packagingMeasurement.end();
   assertSignalNotAborted(signal);
 
-  return {bundleGraph, bundleInfo, changedAssets, assetRequests};
+  return {
+    bundleGraph,
+    bundleInfo,
+    changedAssets,
+    assetRequests,
+    scopeHoistingStats,
+  };
 }

package/src/requests/PackageRequest.ts

@@ -46,15 +46,13 @@ export function createPackageRequest(
   };
 }
 
-// @ts-expect-error TS7031
-async function run({input, api, farm}) {
+async function run({input, api, farm}: RunInput<BundleInfo>) {
   let {bundleGraphReference, optionsRef, bundle, useMainThread} = input;
   let runPackage = farm.createHandle('runPackage', useMainThread);
 
   let start = Date.now();
   let {devDeps, invalidDevDeps} = await getDevDepRequests(api);
   let {cachePath} = nullthrows(
-    // @ts-expect-error TS2347
     await api.runRequest<null, ConfigAndCachePath>(
       createAtlaspackConfigRequest(),
     ),

package/src/requests/TargetRequest.ts

@@ -1151,6 +1151,7 @@ export class TargetResolver {
             shouldScopeHoist:
               shouldScopeHoist && descriptor.scopeHoist !== false,
             sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
+            customEnv: descriptor.env,
           }),
           loc: toInternalSourceLocation(this.options.projectRoot, loc),
         });