@atlaspack/packager-js 2.14.5-dev.93 → 2.14.5-dev.95

package/lib/ScopeHoistingPackager.js

@@ -144,7 +144,7 @@ class ScopeHoistingPackager {
       res += content + '\n';
       lineCount += lines + 1;
     };
-    if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix')) {
+    if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) {
       // Write out all constant modules used by this bundle
       for (let asset of constantAssets) {
         if (!this.seenAssets.has(asset.id)) {
@@ -288,7 +288,7 @@ 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) {
+        } else if (((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || (0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) && asset.meta.isConstantModule) {
           constant.push(asset);
         }
       }
@@ -305,7 +305,7 @@ class ScopeHoistingPackager {
             actions.skipChildren();
             return;
           }
-          if (assignedAssets.has(asset) || this.isReExported(asset)) {
+          if (!asset.meta.isConstantModule && (assignedAssets.has(asset) || this.isReExported(asset))) {
             wrapped.push(asset);
             this.wrappedAssets.add(asset.id);
             actions.skipChildren();
@@ -526,7 +526,7 @@ class ScopeHoistingPackager {
                 // 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.wrappedAssets.has(resolved.id)) {
+                  if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved.id)) {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
                     res = depCode + '\n' + res;
                     lines += 1 + depLines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.14.5-dev.93+207d003c0",
+  "version": "2.14.5-dev.95+d8e35a83e",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,16 +15,16 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.161+207d003c0",
-    "@atlaspack/feature-flags": "2.14.1-dev.161+207d003c0",
-    "@atlaspack/plugin": "2.14.5-dev.93+207d003c0",
-    "@atlaspack/rust": "3.2.1-dev.93+207d003c0",
-    "@atlaspack/types": "2.14.5-dev.93+207d003c0",
-    "@atlaspack/utils": "2.14.5-dev.93+207d003c0",
+    "@atlaspack/diagnostic": "2.14.1-dev.163+d8e35a83e",
+    "@atlaspack/feature-flags": "2.14.1-dev.163+d8e35a83e",
+    "@atlaspack/plugin": "2.14.5-dev.95+d8e35a83e",
+    "@atlaspack/rust": "3.2.1-dev.95+d8e35a83e",
+    "@atlaspack/types": "2.14.5-dev.95+d8e35a83e",
+    "@atlaspack/utils": "2.14.5-dev.95+d8e35a83e",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "207d003c0f1d4ffa6a1c52d2f8841d998616c523"
+  "gitHead": "d8e35a83e480e0811b63a319e88ffe9a2cd509e6"
 }

package/src/ScopeHoistingPackager.js

@@ -166,7 +166,10 @@ export class ScopeHoistingPackager {
       lineCount += lines + 1;
     };
 
-    if (getFeatureFlag('inlineConstOptimisationFix')) {
+    if (
+      getFeatureFlag('inlineConstOptimisationFix') ||
+      getFeatureFlag('applyScopeHoistingImprovement')
+    ) {
       // Write out all constant modules used by this bundle
       for (let asset of constantAssets) {
         if (!this.seenAssets.has(asset.id)) {
@@ -396,7 +399,8 @@ export class ScopeHoistingPackager {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
         } else if (
-          getFeatureFlag('inlineConstOptimisationFix') &&
+          (getFeatureFlag('inlineConstOptimisationFix') ||
+            getFeatureFlag('applyScopeHoistingImprovement')) &&
           asset.meta.isConstantModule
         ) {
           constant.push(asset);
@@ -419,7 +423,10 @@ export class ScopeHoistingPackager {
             return;
           }
 
-          if (assignedAssets.has(asset) || this.isReExported(asset)) {
+          if (
+            !asset.meta.isConstantModule &&
+            (assignedAssets.has(asset) || this.isReExported(asset))
+          ) {
             wrapped.push(asset);
             this.wrappedAssets.add(asset.id);
 
@@ -707,7 +714,10 @@ export class ScopeHoistingPackager {
                   // assets referenced by this asset will also be wrapped. Otherwise, inline the
                   // asset content where the import statement was.
                   if (getFeatureFlag('applyScopeHoistingImprovement')) {
-                    if (!this.wrappedAssets.has(resolved.id)) {
+                    if (
+                      !resolved.meta.isConstantModule &&
+                      !this.wrappedAssets.has(resolved.id)
+                    ) {
                       let [depCode, depMap, depLines] =
                         this.visitAsset(resolved);
                       res = depCode + '\n' + res;