@atlaspack/bundler-default 2.12.1-dev.3502 → 2.12.1-dev.3520

package/lib/bundlerConfig.js

@@ -172,6 +172,7 @@ async function loadBundlerConfig(config, options, logger) {
     maxParallelRequests: modeConfig.maxParallelRequests ?? defaults.maxParallelRequests,
     projectRoot: options.projectRoot,
     disableSharedBundles: modeConfig.disableSharedBundles ?? defaults.disableSharedBundles,
-    manualSharedBundles: modeConfig.manualSharedBundles ?? defaults.manualSharedBundles
+    manualSharedBundles: modeConfig.manualSharedBundles ?? defaults.manualSharedBundles,
+    loadConditionalBundlesInParallel: modeConfig.loadConditionalBundlesInParallel
   };
 }

package/lib/idealGraph.js

@@ -264,6 +264,13 @@ function createIdealGraph(assetGraph, config, entries, logger) {
               value: bundle,
               type: 'bundle'
             }), dependencyPriorityEdges[dependency.priority]);
+            if ((config.loadConditionalBundlesInParallel ?? !bundle.env.shouldScopeHoist) && dependency.priority === 'conditional') {
+              // When configured (or serving code in development), serve conditional bundles in parallel so we don't get module not found errors
+              let [referencingBundleRoot, bundleGroupNodeId] = (0, _nullthrows().default)(stack[stack.length - 1]);
+              let referencingBundleId = (0, _nullthrows().default)(bundleRoots.get(referencingBundleRoot))[0];
+              bundleRoots.set(childAsset, [bundleId, bundleGroupNodeId]);
+              bundleGraph.addEdge(referencingBundleId, bundleId);
+            }
           } else if (dependency.priority === 'parallel' || childAsset.bundleBehavior === 'inline') {
             // The referencing bundleRoot is the root of a Bundle that first brings in another bundle (essentially the FIRST parent of a bundle, this may or may not be a bundleGroup)
             let [referencingBundleRoot, bundleGroupNodeId] = (0, _nullthrows().default)(stack[stack.length - 1]);
@@ -419,7 +426,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           let bundleRoot = assets[0];
           let bundle = (0, _nullthrows().default)(bundleGraph.getNode((0, _nullthrows().default)(bundles.get(bundleRoot.id))));
           if (bundle !== 'root' && bundle.bundleBehavior == null && !bundle.env.isIsolated() && bundle.env.context === root.env.context) {
-            bundleRootGraph.addEdge(bundleRootId, (0, _nullthrows().default)(assetToBundleRootNodeId.get(bundleRoot)), dependency.priority === 'parallel' ? bundleRootEdgeTypes.parallel : bundleRootEdgeTypes.lazy);
+            bundleRootGraph.addEdge(bundleRootId, (0, _nullthrows().default)(assetToBundleRootNodeId.get(bundleRoot)), dependency.priority === 'parallel' || (config.loadConditionalBundlesInParallel ?? !bundle.env.shouldScopeHoist) && dependency.priority === 'conditional' ? bundleRootEdgeTypes.parallel : bundleRootEdgeTypes.lazy);
           }
         }
         if (dependency.priority !== 'sync') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.12.1-dev.3502+c2daeab5a",
+  "version": "2.12.1-dev.3520+8a5346e28",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -13,16 +13,16 @@
   "source": "src/DefaultBundler.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.12.1-dev.3502+c2daeab5a"
+    "parcel": "^2.12.1-dev.3520+8a5346e28"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.12.1-dev.3502+c2daeab5a",
-    "@atlaspack/feature-flags": "2.12.1-dev.3502+c2daeab5a",
-    "@atlaspack/graph": "3.2.1-dev.3502+c2daeab5a",
-    "@atlaspack/plugin": "2.12.1-dev.3502+c2daeab5a",
-    "@atlaspack/rust": "2.12.1-dev.3502+c2daeab5a",
-    "@atlaspack/utils": "2.12.1-dev.3502+c2daeab5a",
+    "@atlaspack/diagnostic": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/feature-flags": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/graph": "3.2.1-dev.3520+8a5346e28",
+    "@atlaspack/plugin": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/rust": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/utils": "2.12.1-dev.3520+8a5346e28",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "c2daeab5a12461903159dec34df5671eaaa9b749"
+  "gitHead": "8a5346e28c1bb3b9cd40f1c4e77c66dd6666f1e4"
 }

package/src/bundlerConfig.js

@@ -27,6 +27,7 @@ type BaseBundlerConfig = {|
   maxParallelRequests?: number,
   disableSharedBundles?: boolean,
   manualSharedBundles?: ManualSharedBundles,
+  loadConditionalBundlesInParallel?: boolean,
 |};
 
 type BundlerConfig = {|
@@ -40,6 +41,7 @@ export type ResolvedBundlerConfig = {|
   projectRoot: string,
   disableSharedBundles: boolean,
   manualSharedBundles: ManualSharedBundles,
+  loadConditionalBundlesInParallel?: boolean,
 |};
 
 function resolveModeConfig(
@@ -226,5 +228,7 @@ export async function loadBundlerConfig(
       modeConfig.disableSharedBundles ?? defaults.disableSharedBundles,
     manualSharedBundles:
       modeConfig.manualSharedBundles ?? defaults.manualSharedBundles,
+    loadConditionalBundlesInParallel:
+      modeConfig.loadConditionalBundlesInParallel,
   };
 }

package/src/idealGraph.js

@@ -362,6 +362,24 @@ export function createIdealGraph(
                 ),
                 dependencyPriorityEdges[dependency.priority],
               );
+
+              if (
+                (config.loadConditionalBundlesInParallel ??
+                  !bundle.env.shouldScopeHoist) &&
+                dependency.priority === 'conditional'
+              ) {
+                // When configured (or serving code in development), serve conditional bundles in parallel so we don't get module not found errors
+                let [referencingBundleRoot, bundleGroupNodeId] = nullthrows(
+                  stack[stack.length - 1],
+                );
+
+                let referencingBundleId = nullthrows(
+                  bundleRoots.get(referencingBundleRoot),
+                )[0];
+
+                bundleRoots.set(childAsset, [bundleId, bundleGroupNodeId]);
+                bundleGraph.addEdge(referencingBundleId, bundleId);
+              }
             } else if (
               dependency.priority === 'parallel' ||
               childAsset.bundleBehavior === 'inline'
@@ -582,7 +600,10 @@ export function createIdealGraph(
               bundleRootGraph.addEdge(
                 bundleRootId,
                 nullthrows(assetToBundleRootNodeId.get(bundleRoot)),
-                dependency.priority === 'parallel'
+                dependency.priority === 'parallel' ||
+                  ((config.loadConditionalBundlesInParallel ??
+                    !bundle.env.shouldScopeHoist) &&
+                    dependency.priority === 'conditional')
                   ? bundleRootEdgeTypes.parallel
                   : bundleRootEdgeTypes.lazy,
               );