@atlaspack/runtime-js 2.12.1-dev.3478 → 2.12.1-dev.3520

package/lib/JSRuntime.js

@@ -192,14 +192,17 @@ var _default = exports.default = new (_plugin().Runtime)({
       // For any conditions that are used in this bundle, we want to produce a runtime asset that is used to
       // select the correct dependency that condition maps to at runtime - the conditions in the bundle will then be
       // replaced with a reference to this asset to implement the selection.
-      const conditions = bundleGraph.getConditionsForDependencies(conditionalDependencies);
+      const conditions = bundleGraph.getConditionsForDependencies(conditionalDependencies, bundle);
       for (const cond of conditions) {
         const requireName = bundle.env.shouldScopeHoist ? 'parcelRequire' : '__parcel__require__';
         const assetCode = `module.exports = require('../helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return ${requireName}('${cond.ifTrueAssetId}')}, function (){return ${requireName}('${cond.ifFalseAssetId}')})`;
         assets.push({
           filePath: _path().default.join(__dirname, `/conditions/${cond.publicId}.js`),
           code: assetCode,
-          dependency: cond.ifTrueDependency,
+          // This dependency is important, as it's the last symbol handled in scope hoisting.
+          // That means that scope hoisting will use the module id for this asset to replace the symbol
+          // (rather than the actual conditional deps)
+          dependency: cond.ifFalseDependency,
           env: {
             sourceType: 'module'
           }
@@ -401,13 +404,11 @@ function getLoaderRuntime({
   }
   if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi')) {
     let conditionalDependencies = externalBundles.flatMap(to => getDependencies(to).conditionalDependencies);
-    for (const cond of bundleGraph.getConditionsForDependencies(conditionalDependencies)) {
-      // This bundle has a conditional dependency, we need to load it as it may not be present
-      let ifTrueBundle = (0, _nullthrows().default)(bundleGraph.getReferencedBundle(cond.ifTrueDependency, bundle), 'ifTrueBundle was null');
-      let ifFalseBundle = (0, _nullthrows().default)(bundleGraph.getReferencedBundle(cond.ifFalseDependency, bundle), 'ifFalseBundle was null');
+    for (const cond of bundleGraph.getConditionsForDependencies(conditionalDependencies, bundle)) {
+      // This bundle has a conditional dependency, we need to load the bundle group
 
       // 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 ${getLoaderForBundle(bundle, ifTrueBundle) ?? `Promise.resolve()`}}, function (){return ${getLoaderForBundle(bundle, ifFalseBundle) ?? `Promise.resolve()`}})`);
+      loaderModules.push(`require('./helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return Promise.all([${cond.ifTrueBundles.map(targetBundle => getLoaderForBundle(bundle, targetBundle)).join(',')}]);}, function (){return Promise.all([${cond.ifFalseBundles.map(targetBundle => getLoaderForBundle(bundle, targetBundle)).join(',')}]);})`);
     }
   }
   for (let to of externalBundles) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.12.1-dev.3478+5fd2da535",
+  "version": "2.12.1-dev.3520+8a5346e28",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -13,14 +13,14 @@
   "source": "src/JSRuntime.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.12.1-dev.3478+5fd2da535"
+    "parcel": "^2.12.1-dev.3520+8a5346e28"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/feature-flags": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/plugin": "2.12.1-dev.3478+5fd2da535",
-    "@atlaspack/utils": "2.12.1-dev.3478+5fd2da535",
+    "@atlaspack/diagnostic": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/feature-flags": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/plugin": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/utils": "2.12.1-dev.3520+8a5346e28",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "5fd2da535ecbe096d57e03aec15e80bb1d7601f7"
+  "gitHead": "8a5346e28c1bb3b9cd40f1c4e77c66dd6666f1e4"
 }

package/src/JSRuntime.js

@@ -195,6 +195,7 @@ export default (new Runtime({
       // replaced with a reference to this asset to implement the selection.
       const conditions = bundleGraph.getConditionsForDependencies(
         conditionalDependencies,
+        bundle,
       );
       for (const cond of conditions) {
         const requireName = bundle.env.shouldScopeHoist
@@ -210,7 +211,10 @@ export default (new Runtime({
         assets.push({
           filePath: path.join(__dirname, `/conditions/${cond.publicId}.js`),
           code: assetCode,
-          dependency: cond.ifTrueDependency,
+          // This dependency is important, as it's the last symbol handled in scope hoisting.
+          // That means that scope hoisting will use the module id for this asset to replace the symbol
+          // (rather than the actual conditional deps)
+          dependency: cond.ifFalseDependency,
           env: {sourceType: 'module'},
         });
       }
@@ -476,26 +480,19 @@ function getLoaderRuntime({
     );
     for (const cond of bundleGraph.getConditionsForDependencies(
       conditionalDependencies,
+      bundle,
     )) {
-      // This bundle has a conditional dependency, we need to load it as it may not be present
-      let ifTrueBundle = nullthrows(
-        bundleGraph.getReferencedBundle(cond.ifTrueDependency, bundle),
-        'ifTrueBundle was null',
-      );
-      let ifFalseBundle = nullthrows(
-        bundleGraph.getReferencedBundle(cond.ifFalseDependency, bundle),
-        'ifFalseBundle was null',
-      );
+      // This bundle has a conditional dependency, we need to load the bundle group
 
       // 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 ${
-          getLoaderForBundle(bundle, ifTrueBundle) ?? `Promise.resolve()`
-        }}, function (){return ${
-          getLoaderForBundle(bundle, ifFalseBundle) ?? `Promise.resolve()`
-        }})`,
+        }')('${cond.key}', function (){return Promise.all([${cond.ifTrueBundles
+          .map((targetBundle) => getLoaderForBundle(bundle, targetBundle))
+          .join(',')}]);}, function (){return Promise.all([${cond.ifFalseBundles
+          .map((targetBundle) => getLoaderForBundle(bundle, targetBundle))
+          .join(',')}]);})`,
       );
     }
   }