@atlaspack/packager-js 2.14.1-dev.53 → 2.14.1-dev.58

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaspack/packager-js
 
+## 2.14.2
+
+### Patch Changes
+
+- Updated dependencies [[`9b85d3e`](https://github.com/atlassian-labs/atlaspack/commit/9b85d3e645b10bd027eed2304afc970a5ba40062), [`a891d65`](https://github.com/atlassian-labs/atlaspack/commit/a891d652bc4eb3d757d381adf65c5083f706effc), [`d02eab9`](https://github.com/atlassian-labs/atlaspack/commit/d02eab95eb60bf7457e0869af0b773608592c0e6), [`fb87a90`](https://github.com/atlassian-labs/atlaspack/commit/fb87a901973776b33ca4ce530e9d71669a9bd36d), [`7b9e8cf`](https://github.com/atlassian-labs/atlaspack/commit/7b9e8cf29e01a98e72e46b2b2fb74ccc514f4463), [`17b9579`](https://github.com/atlassian-labs/atlaspack/commit/17b9579484eced0ed8f23e2aba6d23b3c7238c39), [`8f4e6c1`](https://github.com/atlassian-labs/atlaspack/commit/8f4e6c1b0e7c1fd48624afda48c1dcc599f1460f)]:
+  - @atlaspack/feature-flags@2.14.2
+  - @atlaspack/rust@3.1.0
+  - @atlaspack/utils@2.14.2
+  - @atlaspack/types@2.14.2
+  - @atlaspack/plugin@2.14.2
+
+## 2.14.1
+
+### Patch Changes
+
+- [#450](https://github.com/atlassian-labs/atlaspack/pull/450) [`b9d41b1`](https://github.com/atlassian-labs/atlaspack/commit/b9d41b175ad5771651a5b0278a5a0147e669234a) Thanks [@benjervis](https://github.com/benjervis)! - Remove the Atlaspack engines compatibility check
+
+- [#478](https://github.com/atlassian-labs/atlaspack/pull/478) [`570493b`](https://github.com/atlassian-labs/atlaspack/commit/570493beaf754e7985aebc7daaaf6dfcfa8fe56b) Thanks [@yamadapc](https://github.com/yamadapc)! - The first attempt at Version Packages didn't include the built artifacts.
+  This has hopefully been fixed, so this change will force those packages to re-release.
+- Updated dependencies [[`80bd57b`](https://github.com/atlassian-labs/atlaspack/commit/80bd57b9f9e966563957dee0780d956a682eb2d4), [`ae70b81`](https://github.com/atlassian-labs/atlaspack/commit/ae70b810384cf58f9c57d341ab4c925c7bb2060c), [`ce13d5e`](https://github.com/atlassian-labs/atlaspack/commit/ce13d5e885d55518ee6318e7a72e3a6e4e5126f2), [`4aab060`](https://github.com/atlassian-labs/atlaspack/commit/4aab0605c0d4ee8e0dcc3ffa1162eae5b360b677), [`c0a61a9`](https://github.com/atlassian-labs/atlaspack/commit/c0a61a92405b6830fe39cc17622cc2e97bf02dd7), [`cb35e7d`](https://github.com/atlassian-labs/atlaspack/commit/cb35e7d2b90b372de8401792915f12f410508d24), [`e1422ad`](https://github.com/atlassian-labs/atlaspack/commit/e1422ad0a801faaa4bc4f1023bed042ffe236e9b), [`6ec11f1`](https://github.com/atlassian-labs/atlaspack/commit/6ec11f10a9366fb8a9fc0475c7678235056bd80e), [`570493b`](https://github.com/atlassian-labs/atlaspack/commit/570493beaf754e7985aebc7daaaf6dfcfa8fe56b)]:
+  - @atlaspack/rust@3.0.1
+  - @atlaspack/utils@2.14.1
+  - @atlaspack/feature-flags@2.14.1
+  - @atlaspack/diagnostic@2.14.1
+  - @atlaspack/plugin@2.14.1
+  - @atlaspack/types@2.14.1
+
 ## 2.14.0
 
 ### Minor Changes

package/lib/ScopeHoistingPackager.js

@@ -127,12 +127,6 @@ 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());
       }
     }
@@ -235,15 +229,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() {
@@ -574,14 +588,6 @@ ${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.53+75290c6cb",
+  "version": "2.14.1-dev.58+304528673",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,16 +15,16 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.53+75290c6cb",
-    "@atlaspack/feature-flags": "2.14.1-dev.53+75290c6cb",
-    "@atlaspack/plugin": "2.14.1-dev.53+75290c6cb",
-    "@atlaspack/rust": "3.0.1-dev.53+75290c6cb",
-    "@atlaspack/types": "2.14.1-dev.53+75290c6cb",
-    "@atlaspack/utils": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/diagnostic": "2.14.1-dev.58+304528673",
+    "@atlaspack/feature-flags": "2.14.1-dev.58+304528673",
+    "@atlaspack/plugin": "2.14.1-dev.58+304528673",
+    "@atlaspack/rust": "3.0.1-dev.58+304528673",
+    "@atlaspack/types": "2.14.1-dev.58+304528673",
+    "@atlaspack/utils": "2.14.1-dev.58+304528673",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "75290c6cb03e7253ab1f9bfc6859d518a7d313cc"
+  "gitHead": "304528673208007ba9e03ec6360fdf99a4945910"
 }

package/src/ScopeHoistingPackager.js

@@ -149,13 +149,6 @@ 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());
       }
     }
@@ -286,6 +279,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' &&
@@ -293,7 +299,7 @@ export class ScopeHoistingPackager {
       bundle.env.outputFormat === 'esmodule' &&
       !bundle.env.isIsolated() &&
       bundle.bundleBehavior !== 'isolated' &&
-      hasHtmlReference
+      (hasHtmlReference || hasConditionalReference || isConditionalBundle)
     );
   }
 
@@ -303,7 +309,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;
     }
@@ -311,7 +342,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(', ')});`;
@@ -772,21 +809,6 @@ ${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) {