@atlaspack/packager-js 2.14.5-canary.79 → 2.14.5-canary.80

package/lib/ScopeHoistingPackager.js

@@ -115,7 +115,10 @@ class ScopeHoistingPackager {
   }
   async package() {
     var _sourceMap;
-    let wrappedAssets = await this.loadAssets();
+    let {
+      wrapped: wrappedAssets,
+      constant: constantAssets
+    } = await this.loadAssets();
     this.buildExportedSymbols();
 
     // If building a library, the target is actually another bundler rather
@@ -143,6 +146,14 @@ class ScopeHoistingPackager {
       res += content + '\n';
       lineCount += lines + 1;
     };
+    if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix')) {
+      // Write out all constant modules used by this bundle
+      for (let asset of constantAssets) {
+        if (!this.seenAssets.has(asset.id)) {
+          processAsset(asset);
+        }
+      }
+    }
 
     // Hoist wrapped asset to the top of the bundle to ensure that they are registered
     // before they are used.
@@ -265,6 +276,7 @@ class ScopeHoistingPackager {
       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]);
@@ -278,6 +290,8 @@ 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') && asset.meta.isConstantModule) {
+          constant.push(asset);
         }
       }
     });
@@ -332,7 +346,10 @@ class ScopeHoistingPackager {
       }
     }
     this.assetOutputs = new Map(await queue.run());
-    return wrapped;
+    return {
+      wrapped,
+      constant
+    };
   }
   isReExported(asset) {
     let parentSymbols = this.bundleGraph.getIncomingDependencies(asset).map(dep => this.bundleGraph.getAssetWithDependency(dep)).flatMap(parent => {
@@ -916,20 +933,26 @@ ${code}
     // If there's no __esModule flag, and default is a used symbol, we need
     // to insert an interop helper.
     let defaultInterop = asset.symbols.hasExportSymbol('*') && usedSymbols.has('default') && !asset.symbols.hasExportSymbol('__esModule');
-    let usedNamespace =
-    // If the asset has * in its used symbols, we might need the exports namespace.
-    // The one case where this isn't true is in ESM library entries, where the only
-    // dependency on * is the entry dependency. In this case, we will use ESM exports
-    // instead of the namespace object.
-    usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && this.bundle.hasDependency(dep) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
-    // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
-    // we fallback on the namespace object.
-    asset.symbols.hasExportSymbol('*') && [...usedSymbols].some(s => !asset.symbols.hasExportSymbol(s)) ||
-    // If the exports has this asset's namespace (e.g. ESM output from CJS input),
-    // include the namespace object for the default export.
-    this.exportedSymbols.has(`$${assetId}$exports`) ||
-    // CommonJS library bundle entries always need a namespace.
-    this.bundle.env.isLibrary && this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry();
+    let usedNamespace;
+    if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') && asset.meta.isConstantModule) {
+      // Only set usedNamespace if there is an incoming dependency in the current bundle that uses '*'
+      usedNamespace = this.bundleGraph.getIncomingDependencies(asset).some(dep => this.bundle.hasDependency(dep) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'));
+    } else {
+      usedNamespace =
+      // If the asset has * in its used symbols, we might need the exports namespace.
+      // The one case where this isn't true is in ESM library entries, where the only
+      // dependency on * is the entry dependency. In this case, we will use ESM exports
+      // instead of the namespace object.
+      usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && this.bundle.hasDependency(dep) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
+      // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
+      // we fallback on the namespace object.
+      asset.symbols.hasExportSymbol('*') && [...usedSymbols].some(s => !asset.symbols.hasExportSymbol(s)) ||
+      // If the exports has this asset's namespace (e.g. ESM output from CJS input),
+      // include the namespace object for the default export.
+      this.exportedSymbols.has(`$${assetId}$exports`) ||
+      // CommonJS library bundle entries always need a namespace.
+      this.bundle.env.isLibrary && this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry();
+    }
 
     // If the asset doesn't have static exports, should wrap, the namespace is used,
     // or we need default interop, then we need to synthesize a namespace object for

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.14.5-canary.79+c97915fe4",
+  "version": "2.14.5-canary.80+10fbcfbfa",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,16 +15,16 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.147+c97915fe4",
-    "@atlaspack/feature-flags": "2.14.1-canary.147+c97915fe4",
-    "@atlaspack/plugin": "2.14.5-canary.79+c97915fe4",
-    "@atlaspack/rust": "3.2.1-canary.79+c97915fe4",
-    "@atlaspack/types": "2.14.5-canary.79+c97915fe4",
-    "@atlaspack/utils": "2.14.5-canary.79+c97915fe4",
+    "@atlaspack/diagnostic": "2.14.1-canary.148+10fbcfbfa",
+    "@atlaspack/feature-flags": "2.14.1-canary.148+10fbcfbfa",
+    "@atlaspack/plugin": "2.14.5-canary.80+10fbcfbfa",
+    "@atlaspack/rust": "3.2.1-canary.80+10fbcfbfa",
+    "@atlaspack/types": "2.14.5-canary.80+10fbcfbfa",
+    "@atlaspack/utils": "2.14.5-canary.80+10fbcfbfa",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "c97915fe4837836d475db8077e6828c19b45a373"
+  "gitHead": "10fbcfbfa49c7a83da5d7c40983e36e87f524a75"
 }

package/src/ScopeHoistingPackager.js

@@ -134,7 +134,8 @@ export class ScopeHoistingPackager {
   }
 
   async package(): Promise<{|contents: string, map: ?SourceMap|}> {
-    let wrappedAssets = await this.loadAssets();
+    let {wrapped: wrappedAssets, constant: constantAssets} =
+      await this.loadAssets();
     this.buildExportedSymbols();
 
     // If building a library, the target is actually another bundler rather
@@ -168,6 +169,15 @@ export class ScopeHoistingPackager {
       lineCount += lines + 1;
     };
 
+    if (getFeatureFlag('inlineConstOptimisationFix')) {
+      // Write out all constant modules used by this bundle
+      for (let asset of constantAssets) {
+        if (!this.seenAssets.has(asset.id)) {
+          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) {
@@ -354,9 +364,13 @@ export class ScopeHoistingPackager {
     return `$parcel$global.rwr(${params.join(', ')});`;
   }
 
-  async loadAssets(): Promise<Array<Asset>> {
+  async loadAssets(): Promise<{|
+    wrapped: Array<Asset>,
+    constant: Array<Asset>,
+  |}> {
     let queue = new PromiseQueue({maxConcurrent: 32});
     let wrapped = [];
+    let constant = [];
     this.bundle.traverseAssets((asset) => {
       queue.add(async () => {
         let [code, map] = await Promise.all([
@@ -384,6 +398,11 @@ export class ScopeHoistingPackager {
         ) {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
+        } else if (
+          getFeatureFlag('inlineConstOptimisationFix') &&
+          asset.meta.isConstantModule
+        ) {
+          constant.push(asset);
         }
       }
     });
@@ -455,8 +474,7 @@ export class ScopeHoistingPackager {
     }
 
     this.assetOutputs = new Map(await queue.run());
-
-    return wrapped;
+    return {wrapped, constant};
   }
 
   isReExported(asset: Asset): boolean {
@@ -1281,34 +1299,49 @@ ${code}
       usedSymbols.has('default') &&
       !asset.symbols.hasExportSymbol('__esModule');
 
-    let usedNamespace =
-      // If the asset has * in its used symbols, we might need the exports namespace.
-      // The one case where this isn't true is in ESM library entries, where the only
-      // dependency on * is the entry dependency. In this case, we will use ESM exports
-      // instead of the namespace object.
-      (usedSymbols.has('*') &&
-        (this.bundle.env.outputFormat !== 'esmodule' ||
-          !this.bundle.env.isLibrary ||
-          asset !== this.bundle.getMainEntry() ||
-          this.bundleGraph
-            .getIncomingDependencies(asset)
-            .some(
-              (dep) =>
-                !dep.isEntry &&
-                this.bundle.hasDependency(dep) &&
-                nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
-            ))) ||
-      // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
-      // we fallback on the namespace object.
-      (asset.symbols.hasExportSymbol('*') &&
-        [...usedSymbols].some((s) => !asset.symbols.hasExportSymbol(s))) ||
-      // If the exports has this asset's namespace (e.g. ESM output from CJS input),
-      // include the namespace object for the default export.
-      this.exportedSymbols.has(`$${assetId}$exports`) ||
-      // CommonJS library bundle entries always need a namespace.
-      (this.bundle.env.isLibrary &&
-        this.bundle.env.outputFormat === 'commonjs' &&
-        asset === this.bundle.getMainEntry());
+    let usedNamespace;
+    if (
+      getFeatureFlag('inlineConstOptimisationFix') &&
+      asset.meta.isConstantModule
+    ) {
+      // Only set usedNamespace if there is an incoming dependency in the current bundle that uses '*'
+      usedNamespace = this.bundleGraph
+        .getIncomingDependencies(asset)
+        .some(
+          (dep) =>
+            this.bundle.hasDependency(dep) &&
+            nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
+        );
+    } else {
+      usedNamespace =
+        // If the asset has * in its used symbols, we might need the exports namespace.
+        // The one case where this isn't true is in ESM library entries, where the only
+        // dependency on * is the entry dependency. In this case, we will use ESM exports
+        // instead of the namespace object.
+        (usedSymbols.has('*') &&
+          (this.bundle.env.outputFormat !== 'esmodule' ||
+            !this.bundle.env.isLibrary ||
+            asset !== this.bundle.getMainEntry() ||
+            this.bundleGraph
+              .getIncomingDependencies(asset)
+              .some(
+                (dep) =>
+                  !dep.isEntry &&
+                  this.bundle.hasDependency(dep) &&
+                  nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
+              ))) ||
+        // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
+        // we fallback on the namespace object.
+        (asset.symbols.hasExportSymbol('*') &&
+          [...usedSymbols].some((s) => !asset.symbols.hasExportSymbol(s))) ||
+        // If the exports has this asset's namespace (e.g. ESM output from CJS input),
+        // include the namespace object for the default export.
+        this.exportedSymbols.has(`$${assetId}$exports`) ||
+        // CommonJS library bundle entries always need a namespace.
+        (this.bundle.env.isLibrary &&
+          this.bundle.env.outputFormat === 'commonjs' &&
+          asset === this.bundle.getMainEntry());
+    }
 
     // If the asset doesn't have static exports, should wrap, the namespace is used,
     // or we need default interop, then we need to synthesize a namespace object for