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

package/lib/bundlerConfig.js

@@ -112,6 +112,9 @@ const CONFIG_SCHEMA = {
     },
     disableSharedBundles: {
       type: 'boolean'
+    },
+    loadConditionalBundlesInParallel: {
+      type: 'boolean'
     }
   },
   additionalProperties: false
@@ -172,6 +175,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/decorateLegacyGraph.js

@@ -11,6 +11,13 @@ function _graph() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -25,6 +32,7 @@ function _nullthrows() {
   };
   return data;
 }
+var _idealGraph = require("./idealGraph");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function decorateLegacyGraph(idealGraph, bundleGraph) {
   let idealBundleToLegacyBundle = new Map();
@@ -155,6 +163,7 @@ function decorateLegacyGraph(idealGraph, bundleGraph) {
     }
   }
   for (let {
+    type,
     from,
     to
   } of idealBundleGraph.getAllEdges()) {
@@ -170,6 +179,10 @@ function decorateLegacyGraph(idealGraph, bundleGraph) {
     }
     (0, _assert().default)(targetBundle !== 'root');
     let legacyTargetBundle = (0, _nullthrows().default)(idealBundleToLegacyBundle.get(targetBundle));
-    bundleGraph.createBundleReference(legacySourceBundle, legacyTargetBundle);
+    if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && type === _idealGraph.idealBundleGraphEdges.conditional) {
+      bundleGraph.createBundleConditionalReference(legacySourceBundle, legacyTargetBundle);
+    } else {
+      bundleGraph.createBundleReference(legacySourceBundle, legacyTargetBundle);
+    }
   }
 }

package/lib/idealGraph.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createIdealGraph = createIdealGraph;
+exports.idealBundleGraphEdges = void 0;
 function _path() {
   const data = _interopRequireDefault(require("path"));
   _path = function () {
@@ -48,15 +49,21 @@ function _nullthrows() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* BundleRoot - An asset that is the main entry of a Bundle. */
-// IdealGraph is the structure we will pass to decorate,
-// which mutates the assetGraph into the bundleGraph we would
-// expect from default bundler
 const dependencyPriorityEdges = {
   sync: 1,
   parallel: 2,
   lazy: 3,
   conditional: 4
 };
+const idealBundleGraphEdges = exports.idealBundleGraphEdges = Object.freeze({
+  default: 1,
+  conditional: 2
+});
+
+// IdealGraph is the structure we will pass to decorate,
+// which mutates the assetGraph into the bundleGraph we would
+// expect from default bundler
+
 function createIdealGraph(assetGraph, config, entries, logger) {
   // Asset to the bundle and group it's an entry of
   let bundleRoots = new Map();
@@ -264,6 +271,18 @@ function createIdealGraph(assetGraph, config, entries, logger) {
               value: bundle,
               type: 'bundle'
             }), dependencyPriorityEdges[dependency.priority]);
+            if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && dependency.priority === 'conditional') {
+              let [referencingBundleRoot, bundleGroupNodeId] = (0, _nullthrows().default)(stack[stack.length - 1]);
+              let referencingBundleId = (0, _nullthrows().default)(bundleRoots.get(referencingBundleRoot))[0];
+              if (config.loadConditionalBundlesInParallel ?? !bundle.env.shouldScopeHoist) {
+                // When configured (or serving code in development), serve conditional bundles in parallel so we don't get module not found errors
+                bundleRoots.set(childAsset, [bundleId, bundleGroupNodeId]);
+                bundleGraph.addEdge(referencingBundleId, bundleId);
+              }
+
+              // Add conditional edge to track which bundles request each other
+              bundleGraph.addEdge(referencingBundleId, bundleId, idealBundleGraphEdges.conditional);
+            }
           } 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 +438,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.3565+b31bc6b33",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -12,17 +12,17 @@
   "main": "lib/DefaultBundler.js",
   "source": "src/DefaultBundler.js",
   "engines": {
-    "node": ">= 16.0.0",
-    "parcel": "^2.12.1-dev.3502+c2daeab5a"
+    "atlaspack": "^2.12.1-dev.3565+b31bc6b33",
+    "node": ">= 16.0.0"
   },
   "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.3565+b31bc6b33",
+    "@atlaspack/feature-flags": "2.12.1-dev.3565+b31bc6b33",
+    "@atlaspack/graph": "3.2.1-dev.3565+b31bc6b33",
+    "@atlaspack/plugin": "2.12.1-dev.3565+b31bc6b33",
+    "@atlaspack/rust": "2.12.1-dev.3565+b31bc6b33",
+    "@atlaspack/utils": "2.12.1-dev.3565+b31bc6b33",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "c2daeab5a12461903159dec34df5671eaaa9b749"
+  "gitHead": "b31bc6b33de40c158b9f4d8ff177238be0de409d"
 }

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(
@@ -134,6 +136,9 @@ const CONFIG_SCHEMA: SchemaEntity = {
     disableSharedBundles: {
       type: 'boolean',
     },
+    loadConditionalBundlesInParallel: {
+      type: 'boolean',
+    },
   },
   additionalProperties: false,
 };
@@ -226,5 +231,7 @@ export async function loadBundlerConfig(
       modeConfig.disableSharedBundles ?? defaults.disableSharedBundles,
     manualSharedBundles:
       modeConfig.manualSharedBundles ?? defaults.manualSharedBundles,
+    loadConditionalBundlesInParallel:
+      modeConfig.loadConditionalBundlesInParallel,
   };
 }

package/src/decorateLegacyGraph.js

@@ -6,10 +6,12 @@ import type {
   BundleGroup,
   MutableBundleGraph,
 } from '@atlaspack/types';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
 
 import type {Bundle, IdealGraph} from './idealGraph';
+import {idealBundleGraphEdges} from './idealGraph';
 
 export function decorateLegacyGraph(
   idealGraph: IdealGraph,
@@ -193,7 +195,7 @@ export function decorateLegacyGraph(
     }
   }
 
-  for (let {from, to} of idealBundleGraph.getAllEdges()) {
+  for (let {type, from, to} of idealBundleGraph.getAllEdges()) {
     let sourceBundle = nullthrows(idealBundleGraph.getNode(from));
     if (sourceBundle === 'root') {
       continue;
@@ -212,6 +214,16 @@ export function decorateLegacyGraph(
     let legacyTargetBundle = nullthrows(
       idealBundleToLegacyBundle.get(targetBundle),
     );
-    bundleGraph.createBundleReference(legacySourceBundle, legacyTargetBundle);
+    if (
+      getFeatureFlag('conditionalBundlingApi') &&
+      type === idealBundleGraphEdges.conditional
+    ) {
+      bundleGraph.createBundleConditionalReference(
+        legacySourceBundle,
+        legacyTargetBundle,
+      );
+    } else {
+      bundleGraph.createBundleReference(legacySourceBundle, legacyTargetBundle);
+    }
   }
 }

package/src/idealGraph.js

@@ -55,25 +55,35 @@ export type DependencyBundleGraph = ContentGraph<
   number,
 >;
 
+const dependencyPriorityEdges = {
+  sync: 1,
+  parallel: 2,
+  lazy: 3,
+  conditional: 4,
+};
+
+export const idealBundleGraphEdges = Object.freeze({
+  default: 1,
+  conditional: 2,
+});
+
+type IdealBundleGraph = Graph<
+  Bundle | 'root',
+  $Values<typeof idealBundleGraphEdges>,
+>;
+
 // IdealGraph is the structure we will pass to decorate,
 // which mutates the assetGraph into the bundleGraph we would
 // expect from default bundler
 export type IdealGraph = {|
   assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>,
   assets: Array<Asset>,
-  bundleGraph: Graph<Bundle | 'root'>,
+  bundleGraph: IdealBundleGraph,
   bundleGroupBundleIds: Set<NodeId>,
   dependencyBundleGraph: DependencyBundleGraph,
   manualAssetToBundle: Map<Asset, NodeId>,
 |};
 
-const dependencyPriorityEdges = {
-  sync: 1,
-  parallel: 2,
-  lazy: 3,
-  conditional: 4,
-};
-
 export function createIdealGraph(
   assetGraph: MutableBundleGraph,
   config: ResolvedBundlerConfig,
@@ -91,7 +101,7 @@ export function createIdealGraph(
 
   // A Graph of Bundles and a root node (dummy string), which models only Bundles, and connections to their
   // referencing Bundle. There are no actual BundleGroup nodes, just bundles that take on that role.
-  let bundleGraph: Graph<Bundle | 'root'> = new Graph();
+  let bundleGraph: IdealBundleGraph = new Graph();
   let stack: Array<[BundleRoot, NodeId]> = [];
 
   let bundleRootEdgeTypes = {
@@ -362,6 +372,35 @@ export function createIdealGraph(
                 ),
                 dependencyPriorityEdges[dependency.priority],
               );
+
+              if (
+                getFeatureFlag('conditionalBundlingApi') &&
+                dependency.priority === 'conditional'
+              ) {
+                let [referencingBundleRoot, bundleGroupNodeId] = nullthrows(
+                  stack[stack.length - 1],
+                );
+
+                let referencingBundleId = nullthrows(
+                  bundleRoots.get(referencingBundleRoot),
+                )[0];
+
+                if (
+                  config.loadConditionalBundlesInParallel ??
+                  !bundle.env.shouldScopeHoist
+                ) {
+                  // When configured (or serving code in development), serve conditional bundles in parallel so we don't get module not found errors
+                  bundleRoots.set(childAsset, [bundleId, bundleGroupNodeId]);
+                  bundleGraph.addEdge(referencingBundleId, bundleId);
+                }
+
+                // Add conditional edge to track which bundles request each other
+                bundleGraph.addEdge(
+                  referencingBundleId,
+                  bundleId,
+                  idealBundleGraphEdges.conditional,
+                );
+              }
             } else if (
               dependency.priority === 'parallel' ||
               childAsset.bundleBehavior === 'inline'
@@ -582,7 +621,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,
               );
@@ -1286,7 +1328,7 @@ export function createIdealGraph(
   }
 
   function removeBundle(
-    bundleGraph: Graph<Bundle | 'root'>,
+    bundleGraph: IdealBundleGraph,
     bundleId: NodeId,
     assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>,
   ) {