@atlaspack/packager-js 2.14.1-dev.9 → 2.14.1-dev.91

package/lib/ScopeHoistingPackager.js

@@ -127,6 +127,12 @@ class ScopeHoistingPackager {
       for (let b of this.bundleGraph.getReferencedBundles(this.bundle, {
         recursive: false
       })) {
+        // If the referenced bundle is a native node bundle then don't require it as
+        // an external as we don't want to require native node bundles from other
+        // OS architectures
+        if (process.env.ATLASPACK_SUPER_BUILD === 'true' && b.type === 'node') {
+          continue;
+        }
         this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), new Map());
       }
     }
@@ -229,15 +235,35 @@ class ScopeHoistingPackager {
   shouldBundleQueue(bundle) {
     let referencingBundles = this.bundleGraph.getReferencingBundles(bundle);
     let hasHtmlReference = referencingBundles.some(b => b.type === 'html');
-    return this.useAsyncBundleRuntime && bundle.type === 'js' && bundle.bundleBehavior !== 'inline' && bundle.env.outputFormat === 'esmodule' && !bundle.env.isIsolated() && bundle.bundleBehavior !== 'isolated' && hasHtmlReference;
+    let hasConditionalReference = false;
+    let isConditionalBundle = false;
+    if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && (0, _featureFlags().getFeatureFlag)('conditionalBundlingAsyncRuntime')) {
+      // If the bundle has a conditional bundle reference (has an importCond)
+      hasConditionalReference = this.bundleGraph.getReferencedConditionalBundles(bundle).length > 0;
+      // If the bundle is a conditional bundle
+      isConditionalBundle = this.hasConditionalDependency();
+    }
+    return this.useAsyncBundleRuntime && bundle.type === 'js' && bundle.bundleBehavior !== 'inline' && bundle.env.outputFormat === 'esmodule' && !bundle.env.isIsolated() && bundle.bundleBehavior !== 'isolated' && (hasHtmlReference || hasConditionalReference || isConditionalBundle);
   }
   runWhenReady(bundle, codeToRun) {
     let deps = this.bundleGraph.getReferencedBundles(bundle).filter(b => this.shouldBundleQueue(b)).map(b => b.publicId);
-    if (deps.length === 0) {
+    const conditions = [];
+    if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && (0, _featureFlags().getFeatureFlag)('conditionalBundlingAsyncRuntime')) {
+      const conditionSet = this.bundleGraph.getConditionalBundleMapping().get(bundle.id);
+      for (const [key, {
+        ifTrueBundles,
+        ifFalseBundles
+      }] of (conditionSet === null || conditionSet === void 0 ? void 0 : conditionSet.entries()) ?? []) {
+        const ifTrueBundleIds = ifTrueBundles.map(b => `"${b.publicId}"`).join(',');
+        const ifFalseBundleIds = ifFalseBundles.map(b => `"${b.publicId}"`).join(',');
+        conditions.push(`(globalThis.__MCOND && globalThis.__MCOND('${key}') ? [${ifTrueBundleIds}] : [${ifFalseBundleIds}])`);
+      }
+    }
+    if (deps.length === 0 && conditions.length === 0) {
       // If no deps we can safely execute immediately
       return codeToRun;
     }
-    let params = [JSON.stringify(this.bundle.publicId), (0, _helpers.fnExpr)(this.bundle.env, [], [codeToRun]), JSON.stringify(deps)];
+    let params = [JSON.stringify(this.bundle.publicId), (0, _helpers.fnExpr)(this.bundle.env, [], [codeToRun]), `${JSON.stringify(deps)}${conditions.length > 0 ? `.concat([${conditions.map(conditions => `...${conditions}`).join(',')}])` : ''}`];
     return `$parcel$global.rwr(${params.join(', ')});`;
   }
   async loadAssets() {
@@ -568,6 +594,14 @@ ${code}
           this.externalAssets.add(resolved);
           continue;
         }
+
+        // If the referencedBundle is a native node import then require it
+        // directly
+        // Only enabled for internal builds for now
+        if (process.env.ATLASPACK_SUPER_BUILD === 'true' && referencedBundle && referencedBundle.type === 'node') {
+          replacements.set((0, _nullthrows().default)(dep.symbols.get('*')).local, `require('${(0, _utils().relativeBundlePath)(this.bundle, referencedBundle)}')`);
+          continue;
+        }
       }
       for (let [imported, {
         local

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.14.1-dev.9+6d1d32abe",
+  "version": "2.14.1-dev.91+08020e0e1",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -12,20 +12,19 @@
   "main": "lib/index.js",
   "source": "src/index.js",
   "engines": {
-    "atlaspack": "^2.14.1-dev.9+6d1d32abe",
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/feature-flags": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/plugin": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/rust": "3.0.1-dev.9+6d1d32abe",
-    "@atlaspack/types": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/utils": "2.14.1-dev.9+6d1d32abe",
+    "@atlaspack/diagnostic": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/feature-flags": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/plugin": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/rust": "3.0.1-dev.91+08020e0e1",
+    "@atlaspack/types": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/utils": "2.14.1-dev.91+08020e0e1",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "6d1d32abed2fbfdf4c318f311a0ac3aea9210e4a"
+  "gitHead": "08020e0e18819f3e15e74726f9ffa697892f7bfa"
 }

package/src/ScopeHoistingPackager.js

@@ -149,6 +149,13 @@ export class ScopeHoistingPackager {
       for (let b of this.bundleGraph.getReferencedBundles(this.bundle, {
         recursive: false,
       })) {
+        // If the referenced bundle is a native node bundle then don't require it as
+        // an external as we don't want to require native node bundles from other
+        // OS architectures
+        if (process.env.ATLASPACK_SUPER_BUILD === 'true' && b.type === 'node') {
+          continue;
+        }
+
         this.externals.set(relativeBundlePath(this.bundle, b), new Map());
       }
     }
@@ -279,6 +286,19 @@ export class ScopeHoistingPackager {
     let referencingBundles = this.bundleGraph.getReferencingBundles(bundle);
     let hasHtmlReference = referencingBundles.some((b) => b.type === 'html');
 
+    let hasConditionalReference = false;
+    let isConditionalBundle = false;
+    if (
+      getFeatureFlag('conditionalBundlingApi') &&
+      getFeatureFlag('conditionalBundlingAsyncRuntime')
+    ) {
+      // If the bundle has a conditional bundle reference (has an importCond)
+      hasConditionalReference =
+        this.bundleGraph.getReferencedConditionalBundles(bundle).length > 0;
+      // If the bundle is a conditional bundle
+      isConditionalBundle = this.hasConditionalDependency();
+    }
+
     return (
       this.useAsyncBundleRuntime &&
       bundle.type === 'js' &&
@@ -286,7 +306,7 @@ export class ScopeHoistingPackager {
       bundle.env.outputFormat === 'esmodule' &&
       !bundle.env.isIsolated() &&
       bundle.bundleBehavior !== 'isolated' &&
-      hasHtmlReference
+      (hasHtmlReference || hasConditionalReference || isConditionalBundle)
     );
   }
 
@@ -296,7 +316,32 @@ export class ScopeHoistingPackager {
       .filter((b) => this.shouldBundleQueue(b))
       .map((b) => b.publicId);
 
-    if (deps.length === 0) {
+    const conditions = [];
+    if (
+      getFeatureFlag('conditionalBundlingApi') &&
+      getFeatureFlag('conditionalBundlingAsyncRuntime')
+    ) {
+      const conditionSet = this.bundleGraph
+        .getConditionalBundleMapping()
+        .get(bundle.id);
+
+      for (const [
+        key,
+        {ifTrueBundles, ifFalseBundles},
+      ] of conditionSet?.entries() ?? []) {
+        const ifTrueBundleIds = ifTrueBundles
+          .map((b) => `"${b.publicId}"`)
+          .join(',');
+        const ifFalseBundleIds = ifFalseBundles
+          .map((b) => `"${b.publicId}"`)
+          .join(',');
+        conditions.push(
+          `(globalThis.__MCOND && globalThis.__MCOND('${key}') ? [${ifTrueBundleIds}] : [${ifFalseBundleIds}])`,
+        );
+      }
+    }
+
+    if (deps.length === 0 && conditions.length === 0) {
       // If no deps we can safely execute immediately
       return codeToRun;
     }
@@ -304,7 +349,13 @@ export class ScopeHoistingPackager {
     let params = [
       JSON.stringify(this.bundle.publicId),
       fnExpr(this.bundle.env, [], [codeToRun]),
-      JSON.stringify(deps),
+      `${JSON.stringify(deps)}${
+        conditions.length > 0
+          ? `.concat([${conditions
+              .map((conditions) => `...${conditions}`)
+              .join(',')}])`
+          : ''
+      }`,
     ];
 
     return `$parcel$global.rwr(${params.join(', ')});`;
@@ -765,6 +816,21 @@ ${code}
           this.externalAssets.add(resolved);
           continue;
         }
+
+        // If the referencedBundle is a native node import then require it
+        // directly
+        // Only enabled for internal builds for now
+        if (
+          process.env.ATLASPACK_SUPER_BUILD === 'true' &&
+          referencedBundle &&
+          referencedBundle.type === 'node'
+        ) {
+          replacements.set(
+            nullthrows(dep.symbols.get('*')).local,
+            `require('${relativeBundlePath(this.bundle, referencedBundle)}')`,
+          );
+          continue;
+        }
       }
 
       for (let [imported, {local}] of dep.symbols) {