@atlaspack/runtime-js 2.14.5-canary.122 → 2.14.5-canary.124

package/lib/JSRuntime.js

@@ -446,21 +446,8 @@ function getLoaderRuntime({
     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(',')}]);})`);
-        }
-      }
-    }
+    let conditionalDependencies = externalBundles.flatMap(to => getDependencies(to).conditionalDependencies);
+    loaderModules.push(...getConditionalLoadersForCondition(conditionalDependencies, bundle));
   }
   for (let to of externalBundles) {
     let loaderModule = getLoaderForBundle(bundle, to, shardingConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.14.5-canary.122+482572aea",
+  "version": "2.14.5-canary.124+c4415a455",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,13 +15,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.190+482572aea",
-    "@atlaspack/domain-sharding": "2.14.1-canary.190+482572aea",
-    "@atlaspack/feature-flags": "2.14.1-canary.190+482572aea",
-    "@atlaspack/plugin": "2.14.5-canary.122+482572aea",
-    "@atlaspack/utils": "2.14.5-canary.122+482572aea",
+    "@atlaspack/diagnostic": "2.14.1-canary.192+c4415a455",
+    "@atlaspack/domain-sharding": "2.14.1-canary.192+c4415a455",
+    "@atlaspack/feature-flags": "2.14.1-canary.192+c4415a455",
+    "@atlaspack/plugin": "2.14.5-canary.124+c4415a455",
+    "@atlaspack/utils": "2.14.5-canary.124+c4415a455",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "482572aeac05b281be5e8b7c8909dd02482c8af7"
+  "gitHead": "c4415a455543d984ca28452c2cb87a794d22497c"
 }

package/src/JSRuntime.js

@@ -583,46 +583,13 @@ function getLoaderRuntime({
   }
 
   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),
-        );
+    let conditionalDependencies = externalBundles.flatMap(
+      (to) => getDependencies(to).conditionalDependencies,
+    );
 
-        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(
-              ',',
-            )}]);})`,
-          );
-        }
-      }
-    }
+    loaderModules.push(
+      ...getConditionalLoadersForCondition(conditionalDependencies, bundle),
+    );
   }
 
   for (let to of externalBundles) {