@atlaspack/bundler-default 2.14.5-canary.3 → 2.14.5-canary.300

package/src/{bundlerConfig.js → bundlerConfig.ts}

@@ -1,59 +1,78 @@
-// @flow strict-local
-
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import type {
   Config,
   PluginOptions,
   BuildMode,
   PluginLogger,
-} from '@atlaspack/types';
-import {type SchemaEntity, validateSchema} from '@atlaspack/utils';
+} from '@atlaspack/types-internal';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
+import {SchemaEntity, validateSchema} from '@atlaspack/utils';
 import invariant from 'assert';
 
 type Glob = string;
 
-type ManualSharedBundles = Array<{|
-  name: string,
-  assets: Array<Glob>,
-  types?: Array<string>,
-  root?: string,
-  split?: number,
-|}>;
-
-type BaseBundlerConfig = {|
-  http?: number,
-  minBundles?: number,
-  minBundleSize?: number,
-  maxParallelRequests?: number,
-  disableSharedBundles?: boolean,
-  manualSharedBundles?: ManualSharedBundles,
-  loadConditionalBundlesInParallel?: boolean,
-|};
-
-type BundlerConfig = {|
-  [mode: BuildMode]: BaseBundlerConfig,
-|} & BaseBundlerConfig;
-
-export type ResolvedBundlerConfig = {|
-  minBundles: number,
-  minBundleSize: number,
-  maxParallelRequests: number,
-  projectRoot: string,
-  disableSharedBundles: boolean,
-  manualSharedBundles: ManualSharedBundles,
-  loadConditionalBundlesInParallel?: boolean,
-|};
+type ManualSharedBundles = Array<{
+  name: string;
+  assets: Array<Glob>;
+  types?: Array<string>;
+  root?: string;
+  split?: number;
+}>;
+
+export type SharedBundleMergeCandidates = Array<{
+  overlapThreshold?: number;
+  maxBundleSize?: number;
+  sourceBundles?: Array<string>;
+  minBundlesInGroup?: number;
+}>;
+
+export interface AsyncBundleMerge {
+  /** Consider all async bundles smaller than this for merging */
+  bundleSize: number;
+  /** The max bytes allowed to be potentially overfetched due to a merge  */
+  maxOverfetchSize: number;
+  /** Bundles to ignore from merging */
+  ignore?: Array<Glob>;
+}
+
+type BaseBundlerConfig = {
+  http?: number;
+  minBundles?: number;
+  minBundleSize?: number;
+  maxParallelRequests?: number;
+  disableSharedBundles?: boolean;
+  manualSharedBundles?: ManualSharedBundles;
+  loadConditionalBundlesInParallel?: boolean;
+  sharedBundleMerge?: SharedBundleMergeCandidates;
+  asyncBundleMerge?: AsyncBundleMerge;
+};
+
+type BundlerConfig = Partial<Record<BuildMode, BaseBundlerConfig>> &
+  BaseBundlerConfig;
+
+export type ResolvedBundlerConfig = {
+  minBundles: number;
+  minBundleSize: number;
+  maxParallelRequests: number;
+  projectRoot: string;
+  disableSharedBundles: boolean;
+  manualSharedBundles: ManualSharedBundles;
+  loadConditionalBundlesInParallel?: boolean;
+  sharedBundleMerge?: SharedBundleMergeCandidates;
+  asyncBundleMerge?: AsyncBundleMerge;
+};
 
 function resolveModeConfig(
   config: BundlerConfig,
   mode: BuildMode,
 ): BaseBundlerConfig {
-  let generalConfig = {};
-  let modeConfig = {};
+  let generalConfig: Record<string, any> = {};
+  let modeConfig: Record<string, any> = {};
 
   for (const key of Object.keys(config)) {
     if (key === 'development' || key === 'production') {
       if (key === mode) {
+        // @ts-expect-error TS2322
         modeConfig = config[key];
       }
     } else {
@@ -61,7 +80,6 @@ function resolveModeConfig(
     }
   }
 
-  // $FlowFixMe Not sure how to convince flow here...
   return {
     ...generalConfig,
     ...modeConfig,
@@ -76,6 +94,7 @@ const HTTP_OPTIONS = {
     minBundleSize: 30000,
     maxParallelRequests: 6,
     disableSharedBundles: false,
+    sharedBundleMerge: [],
   },
   '2': {
     minBundles: 1,
@@ -83,8 +102,9 @@ const HTTP_OPTIONS = {
     minBundleSize: 20000,
     maxParallelRequests: 25,
     disableSharedBundles: false,
+    sharedBundleMerge: [],
   },
-};
+} as const;
 
 const CONFIG_SCHEMA: SchemaEntity = {
   type: 'object',
@@ -124,6 +144,50 @@ const CONFIG_SCHEMA: SchemaEntity = {
         additionalProperties: false,
       },
     },
+    sharedBundleMerge: {
+      type: 'array',
+      items: {
+        type: 'object',
+        properties: {
+          overlapThreshold: {
+            type: 'number',
+          },
+          maxBundleSize: {
+            type: 'number',
+          },
+          sourceBundles: {
+            type: 'array',
+            items: {
+              type: 'string',
+            },
+          },
+          minBundlesInGroup: {
+            type: 'number',
+          },
+        },
+        additionalProperties: false,
+      },
+    },
+    asyncBundleMerge: {
+      type: 'object',
+      properties: {
+        bundleSize: {
+          type: 'number',
+          required: true,
+        },
+        maxOverfetchSize: {
+          type: 'number',
+          required: true,
+        },
+        ignore: {
+          type: 'array',
+          items: {
+            type: 'string',
+          },
+        },
+      },
+      additionalProperties: false,
+    },
     minBundles: {
       type: 'number',
     },
@@ -139,6 +203,9 @@ const CONFIG_SCHEMA: SchemaEntity = {
     loadConditionalBundlesInParallel: {
       type: 'boolean',
     },
+    sharedBundleMergeThreshold: {
+      type: 'number',
+    },
   },
   additionalProperties: false,
 };
@@ -148,15 +215,24 @@ export async function loadBundlerConfig(
   options: PluginOptions,
   logger: PluginLogger,
 ): Promise<ResolvedBundlerConfig> {
-  let conf = await config.getConfig<BundlerConfig>([], {
-    packageKey: '@atlaspack/bundler-default',
-  });
+  let conf;
+
+  if (getFeatureFlag('resolveBundlerConfigFromCwd')) {
+    conf = await config.getConfigFrom(`${process.cwd()}/index`, [], {
+      packageKey: '@atlaspack/bundler-default',
+    });
+  } else {
+    conf = await config.getConfig<BundlerConfig>([], {
+      packageKey: '@atlaspack/bundler-default',
+    });
+  }
 
   if (!conf) {
     const modDefault = {
       ...HTTP_OPTIONS['2'],
       projectRoot: options.projectRoot,
-    };
+    } as const;
+    // @ts-expect-error TS2322
     return modDefault;
   }
 
@@ -210,7 +286,7 @@ export async function loadBundlerConfig(
     CONFIG_SCHEMA,
     {
       data: modeConfig,
-      source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+      source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
       filePath: conf.filePath,
       prependKey: `/${encodeJSONKeyComponent('@atlaspack/bundler-default')}`,
     },
@@ -219,11 +295,15 @@ export async function loadBundlerConfig(
   );
 
   let http = modeConfig.http ?? 2;
+  // @ts-expect-error TS7053
   let defaults = HTTP_OPTIONS[http];
 
   return {
     minBundles: modeConfig.minBundles ?? defaults.minBundles,
     minBundleSize: modeConfig.minBundleSize ?? defaults.minBundleSize,
+    sharedBundleMerge:
+      modeConfig.sharedBundleMerge ?? defaults.sharedBundleMerge,
+    asyncBundleMerge: modeConfig.asyncBundleMerge,
     maxParallelRequests:
       modeConfig.maxParallelRequests ?? defaults.maxParallelRequests,
     projectRoot: options.projectRoot,

package/src/{decorateLegacyGraph.js → decorateLegacyGraph.ts}

@@ -1,11 +1,9 @@
-// @flow strict-local
-
-import {ALL_EDGE_TYPES, type NodeId} from '@atlaspack/graph';
+import {ALL_EDGE_TYPES, NodeId} from '@atlaspack/graph';
 import type {
   Bundle as LegacyBundle,
   BundleGroup,
   MutableBundleGraph,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
@@ -25,11 +23,13 @@ export function decorateLegacyGraph(
     bundleGroupBundleIds,
     manualAssetToBundle,
   } = idealGraph;
+  // This line can be deleted once supportWebpackChunkName feature flag is removed.
   let entryBundleToBundleGroup: Map<NodeId, BundleGroup> = new Map();
   // Step Create Bundles: Create bundle groups, bundles, and shared bundles and add assets to them
   for (let [bundleNodeId, idealBundle] of idealBundleGraph.nodes.entries()) {
     if (!idealBundle || idealBundle === 'root') continue;
     let entryAsset = idealBundle.mainEntryAsset;
+    // This line can be deleted once supportWebpackChunkName feature flag is removed.
     let bundleGroup;
     let bundle;
 
@@ -52,18 +52,26 @@ export function decorateLegacyGraph(
         entryAsset != null,
         'Processing a bundleGroup with no entry asset',
       );
+
+      let bundleGroups = new Map();
       for (let dependency of dependencies) {
         bundleGroup = bundleGraph.createBundleGroup(
           dependency,
           idealBundle.target,
         );
+        bundleGroups.set(bundleGroup.entryAssetId, bundleGroup);
+      }
+      if (getFeatureFlag('supportWebpackChunkName')) {
+        invariant(bundleGroups.size > 0, 'No bundle groups created');
+      } else {
+        invariant(bundleGroup);
+        entryBundleToBundleGroup.set(bundleNodeId, bundleGroup);
       }
-      invariant(bundleGroup);
-      entryBundleToBundleGroup.set(bundleNodeId, bundleGroup);
 
       bundle = nullthrows(
         bundleGraph.createBundle({
           entryAsset: nullthrows(entryAsset),
+          bundleRoots: Array.from(idealBundle.bundleRoots),
           needsStableName: idealBundle.needsStableName,
           bundleBehavior: idealBundle.bundleBehavior,
           target: idealBundle.target,
@@ -71,7 +79,14 @@ export function decorateLegacyGraph(
         }),
       );
 
-      bundleGraph.addBundleToBundleGroup(bundle, bundleGroup);
+      if (getFeatureFlag('supportWebpackChunkName')) {
+        for (let bundleGroup of bundleGroups.values()) {
+          bundleGraph.addBundleToBundleGroup(bundle, bundleGroup);
+        }
+      } else {
+        invariant(bundleGroup);
+        bundleGraph.addBundleToBundleGroup(bundle, bundleGroup);
+      }
     } else if (
       idealBundle.sourceBundles.size > 0 &&
       !idealBundle.mainEntryAsset
@@ -109,6 +124,7 @@ export function decorateLegacyGraph(
       bundle = nullthrows(
         bundleGraph.createBundle({
           entryAsset,
+          bundleRoots: Array.from(idealBundle.bundleRoots),
           needsStableName: idealBundle.needsStableName,
           bundleBehavior: idealBundle.bundleBehavior,
           target: idealBundle.target,
@@ -195,11 +211,13 @@ export function decorateLegacyGraph(
     }
   }
 
+  // @ts-expect-error TS2488
   for (let {type, from, to} of idealBundleGraph.getAllEdges()) {
     let sourceBundle = nullthrows(idealBundleGraph.getNode(from));
     if (sourceBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     invariant(sourceBundle !== 'root');
 
     let legacySourceBundle = nullthrows(
@@ -210,6 +228,7 @@ export function decorateLegacyGraph(
     if (targetBundle === 'root') {
       continue;
     }
+    // @ts-expect-error TS2367
     invariant(targetBundle !== 'root');
     let legacyTargetBundle = nullthrows(
       idealBundleToLegacyBundle.get(targetBundle),