@atlaspack/runtime-js 2.13.2-dev.3689 → 2.14.1-canary.3710

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaspack/runtime-js
 
+## 2.14.0
+
+### Minor Changes
+
+- [#339](https://github.com/atlassian-labs/atlaspack/pull/339) [`bfe81e5`](https://github.com/atlassian-labs/atlaspack/commit/bfe81e551c4e4bb2cac7fc4745222e66962c1728) Thanks [@yamadapc](https://github.com/yamadapc)! - Update cache invalidation metrics with build type
+
+### Patch Changes
+
+- [#379](https://github.com/atlassian-labs/atlaspack/pull/379) [`8bc3db9`](https://github.com/atlassian-labs/atlaspack/commit/8bc3db94cc7382b22ca8207c92af8f6389c17e2e) Thanks [@JakeLane](https://github.com/JakeLane)! - Support nested conditional imports in runtime for dynamic import edges in graph. Introduces a new feature flag `conditionalBundlingNestedRuntime`
+
+- [#414](https://github.com/atlassian-labs/atlaspack/pull/414) [`eff9809`](https://github.com/atlassian-labs/atlaspack/commit/eff98093703b9999a511b87a19562f5aaccfcb53) Thanks [@alshdavid](https://github.com/alshdavid)! - Added type:commonjs to package.json files
+
+- [#412](https://github.com/atlassian-labs/atlaspack/pull/412) [`be63a51`](https://github.com/atlassian-labs/atlaspack/commit/be63a515ad13dd5ec1e241843d9ef6fdae8699d5) Thanks [@yamadapc](https://github.com/yamadapc)! - Update to internal unit tests
+
+- Updated dependencies [[`bfe81e5`](https://github.com/atlassian-labs/atlaspack/commit/bfe81e551c4e4bb2cac7fc4745222e66962c1728), [`1953d1b`](https://github.com/atlassian-labs/atlaspack/commit/1953d1bec266a39dc4bfce5f6c7959e77e63411e), [`ce4ce95`](https://github.com/atlassian-labs/atlaspack/commit/ce4ce953914e08991cf58c70c98f758690e5ee21), [`8bc3db9`](https://github.com/atlassian-labs/atlaspack/commit/8bc3db94cc7382b22ca8207c92af8f6389c17e2e), [`e962cd7`](https://github.com/atlassian-labs/atlaspack/commit/e962cd735877f7f16163e60868d70d9c10054ebe), [`4837b69`](https://github.com/atlassian-labs/atlaspack/commit/4837b6988e56ca842a24797b796160964d3696ce), [`7e21377`](https://github.com/atlassian-labs/atlaspack/commit/7e21377914e8091d484f67cb11052a1efd2227e3), [`43113f8`](https://github.com/atlassian-labs/atlaspack/commit/43113f8f00232c5a52169a3f11f846d6e4d94b0a), [`eff9809`](https://github.com/atlassian-labs/atlaspack/commit/eff98093703b9999a511b87a19562f5aaccfcb53)]:
+  - @atlaspack/diagnostic@2.14.0
+  - @atlaspack/feature-flags@2.14.0
+  - @atlaspack/plugin@2.14.0
+  - @atlaspack/utils@2.14.0
+  - @atlaspack/domain-sharding@2.14.0
+
 ## 2.13.1
 
 ### Patch Changes

package/lib/JSRuntime.js

@@ -423,15 +423,40 @@ function getLoaderRuntime({
     }
     return code;
   }
-  if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi')) {
-    let conditionalDependencies = externalBundles.flatMap(to => getDependencies(to).conditionalDependencies);
-    for (const cond of bundleGraph.getConditionsForDependencies(conditionalDependencies, bundle)) {
+  function getConditionalLoadersForCondition(dependencies, sourceBundle) {
+    if (dependencies.length === 0) {
+      // Avoid extra work if there are no dependencies, so we don't have to traverse conditions
+      return [];
+    }
+
+    // Get all the condition objects for the conditional dependencies
+    const conditions = bundleGraph.getConditionsForDependencies(dependencies, sourceBundle);
+    const loaders = [];
+    for (const cond of conditions) {
       // This bundle has a conditional dependency, we need to load the bundle group
-      const ifTrueLoaders = cond.ifTrueBundles.map(targetBundle => getLoaderForBundle(bundle, targetBundle));
-      const ifFalseLoaders = cond.ifFalseBundles.map(targetBundle => getLoaderForBundle(bundle, targetBundle));
+      const ifTrueLoaders = cond.ifTrueBundles.flatMap(targetBundle => getConditionalLoadersForCondition(getDependencies(targetBundle).conditionalDependencies, targetBundle)).concat(cond.ifTrueBundles.map(targetBundle => getLoaderForBundle(sourceBundle, targetBundle)));
+      const ifFalseLoaders = cond.ifFalseBundles.flatMap(targetBundle => getConditionalLoadersForCondition(getDependencies(targetBundle).conditionalDependencies, targetBundle)).concat(cond.ifFalseBundles.map(targetBundle => getLoaderForBundle(sourceBundle, targetBundle)));
       if (ifTrueLoaders.length > 0 || ifFalseLoaders.length > 0) {
         // Load conditional bundles with helper (and a dev mode with additional hints)
-        loaderModules.push(`require('./helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return Promise.all([${ifTrueLoaders.join(',')}]);}, function (){return Promise.all([${ifFalseLoaders.join(',')}]);})`);
+        loaders.push(`require('./helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return Promise.all([${ifTrueLoaders.join(',')}]);}, function (){return Promise.all([${ifFalseLoaders.join(',')}]);})`);
+      }
+    }
+    return loaders;
+  }
+  if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi')) {
+    if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingNestedRuntime')) {
+      let conditionalDependencies = externalBundles.flatMap(to => getDependencies(to).conditionalDependencies);
+      loaderModules.push(...getConditionalLoadersForCondition(conditionalDependencies, bundle));
+    } else {
+      let conditionalDependencies = externalBundles.flatMap(to => getDependencies(to).conditionalDependencies);
+      for (const cond of bundleGraph.getConditionsForDependencies(conditionalDependencies, bundle)) {
+        // This bundle has a conditional dependency, we need to load the bundle group
+        const ifTrueLoaders = cond.ifTrueBundles.map(targetBundle => getLoaderForBundle(bundle, targetBundle));
+        const ifFalseLoaders = cond.ifFalseBundles.map(targetBundle => getLoaderForBundle(bundle, targetBundle));
+        if (ifTrueLoaders.length > 0 || ifFalseLoaders.length > 0) {
+          // Load conditional bundles with helper (and a dev mode with additional hints)
+          loaderModules.push(`require('./helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return Promise.all([${ifTrueLoaders.join(',')}]);}, function (){return Promise.all([${ifFalseLoaders.join(',')}]);})`);
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.13.2-dev.3689+7a2e6e783",
+  "version": "2.14.1-canary.3710+d874396ab",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -12,16 +12,17 @@
   "main": "lib/JSRuntime.js",
   "source": "src/JSRuntime.js",
   "engines": {
-    "atlaspack": "^2.13.2-dev.3689+7a2e6e783",
+    "atlaspack": "2.14.1-canary.3710+d874396ab",
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/domain-sharding": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/feature-flags": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/plugin": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/utils": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/diagnostic": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/domain-sharding": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/feature-flags": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/plugin": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/utils": "2.14.1-canary.3710+d874396ab",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "7a2e6e7835fa846b27021b374097c6a4f37541ba"
+  "type": "commonjs",
+  "gitHead": "d874396ab648d0d5505d66c7eb73e1748f1eaf68"
 }

package/src/JSRuntime.js

@@ -1,5 +1,4 @@
 // @flow strict-local
-
 import type {
   BundleGraph,
   BundleGroup,
@@ -446,7 +445,7 @@ function getLoaderRuntime({
     !bundle.env.isLibrary && !bundle.env.supports('dynamic-import', true);
 
   let needsEsmLoadPrelude = false;
-  let loaderModules = [];
+  let loaderModules: Array<string> = [];
 
   function getLoaderForBundle(
     bundle: NamedBundle,
@@ -514,25 +513,53 @@ function getLoaderRuntime({
     return code;
   }
 
-  if (getFeatureFlag('conditionalBundlingApi')) {
-    let conditionalDependencies = externalBundles.flatMap(
-      (to) => getDependencies(to).conditionalDependencies,
+  function getConditionalLoadersForCondition(
+    dependencies: Dependency[],
+    sourceBundle: NamedBundle,
+  ): string[] {
+    if (dependencies.length === 0) {
+      // Avoid extra work if there are no dependencies, so we don't have to traverse conditions
+      return [];
+    }
+
+    // Get all the condition objects for the conditional dependencies
+    const conditions = bundleGraph.getConditionsForDependencies(
+      dependencies,
+      sourceBundle,
     );
-    for (const cond of bundleGraph.getConditionsForDependencies(
-      conditionalDependencies,
-      bundle,
-    )) {
+
+    const loaders = [];
+    for (const cond of conditions) {
       // This bundle has a conditional dependency, we need to load the bundle group
-      const ifTrueLoaders = cond.ifTrueBundles.map((targetBundle) =>
-        getLoaderForBundle(bundle, targetBundle),
-      );
-      const ifFalseLoaders = cond.ifFalseBundles.map((targetBundle) =>
-        getLoaderForBundle(bundle, targetBundle),
-      );
+      const ifTrueLoaders = cond.ifTrueBundles
+        .flatMap((targetBundle) =>
+          getConditionalLoadersForCondition(
+            getDependencies(targetBundle).conditionalDependencies,
+            targetBundle,
+          ),
+        )
+        .concat(
+          cond.ifTrueBundles.map((targetBundle) =>
+            getLoaderForBundle(sourceBundle, targetBundle),
+          ),
+        );
+
+      const ifFalseLoaders = cond.ifFalseBundles
+        .flatMap((targetBundle) =>
+          getConditionalLoadersForCondition(
+            getDependencies(targetBundle).conditionalDependencies,
+            targetBundle,
+          ),
+        )
+        .concat(
+          cond.ifFalseBundles.map((targetBundle) =>
+            getLoaderForBundle(sourceBundle, targetBundle),
+          ),
+        );
 
       if (ifTrueLoaders.length > 0 || ifFalseLoaders.length > 0) {
         // Load conditional bundles with helper (and a dev mode with additional hints)
-        loaderModules.push(
+        loaders.push(
           `require('./helpers/conditional-loader${
             options.mode === 'development' ? '-dev' : ''
           }')('${
@@ -545,6 +572,51 @@ function getLoaderRuntime({
         );
       }
     }
+
+    return loaders;
+  }
+
+  if (getFeatureFlag('conditionalBundlingApi')) {
+    if (getFeatureFlag('conditionalBundlingNestedRuntime')) {
+      let conditionalDependencies = externalBundles.flatMap(
+        (to) => getDependencies(to).conditionalDependencies,
+      );
+
+      loaderModules.push(
+        ...getConditionalLoadersForCondition(conditionalDependencies, bundle),
+      );
+    } else {
+      let conditionalDependencies = externalBundles.flatMap(
+        (to) => getDependencies(to).conditionalDependencies,
+      );
+      for (const cond of bundleGraph.getConditionsForDependencies(
+        conditionalDependencies,
+        bundle,
+      )) {
+        // This bundle has a conditional dependency, we need to load the bundle group
+        const ifTrueLoaders = cond.ifTrueBundles.map((targetBundle) =>
+          getLoaderForBundle(bundle, targetBundle),
+        );
+        const ifFalseLoaders = cond.ifFalseBundles.map((targetBundle) =>
+          getLoaderForBundle(bundle, targetBundle),
+        );
+
+        if (ifTrueLoaders.length > 0 || ifFalseLoaders.length > 0) {
+          // Load conditional bundles with helper (and a dev mode with additional hints)
+          loaderModules.push(
+            `require('./helpers/conditional-loader${
+              options.mode === 'development' ? '-dev' : ''
+            }')('${
+              cond.key
+            }', function (){return Promise.all([${ifTrueLoaders.join(
+              ',',
+            )}]);}, function (){return Promise.all([${ifFalseLoaders.join(
+              ',',
+            )}]);})`,
+          );
+        }
+      }
+    }
   }
 
   for (let to of externalBundles) {

package/test/esm-js-loader-retry.test.ts

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import load from '../src/helpers/browser/esm-js-loader-retry.js';
 import bundleManifest from '../src/helpers/bundle-manifest.js';
 import {mock} from 'node:test';
@@ -33,6 +35,13 @@ describe('esm-js-loader-retry', () => {
     globalThis.navigator = {onLine: true};
     globalThis.CustomEvent = globalThis.CustomEvent || class {};
     globalThis.dispatchEvent = mock.fn();
+
+    // Add mock for addEventListener
+    globalThis.addEventListener = mock.fn((event, callback) => {
+      if (event === 'online') {
+        callback();
+      }
+    });
   });
 
   it('should not throw', async () => {