@atlaspack/bundler-default 2.14.5-canary.9 → 2.14.5-dev.55

package/CHANGELOG.md

@@ -1,5 +1,84 @@
 # @atlaspack/bundler-default
 
+## 2.16.2
+
+### Patch Changes
+
+- Updated dependencies [[`124b7ff`](https://github.com/atlassian-labs/atlaspack/commit/124b7fff44f71aac9fbad289a9a9509b3dfc9aaa), [`e052521`](https://github.com/atlassian-labs/atlaspack/commit/e0525210850ed1606146eb86991049cf567c5dec), [`15c6d70`](https://github.com/atlassian-labs/atlaspack/commit/15c6d7000bd89da876bc590aa75b17a619a41896), [`e4d966c`](https://github.com/atlassian-labs/atlaspack/commit/e4d966c3c9c4292c5013372ae65b10d19d4bacc6), [`209692f`](https://github.com/atlassian-labs/atlaspack/commit/209692ffb11eae103a0d65c5e1118a5aa1625818), [`42a775d`](https://github.com/atlassian-labs/atlaspack/commit/42a775de8eec638ad188f3271964170d8c04d84b), [`29c2f10`](https://github.com/atlassian-labs/atlaspack/commit/29c2f106de9679adfb5afa04e1910471dc65a427), [`f4da1e1`](https://github.com/atlassian-labs/atlaspack/commit/f4da1e120e73eeb5e8b8927f05e88f04d6148c7b), [`1ef91fc`](https://github.com/atlassian-labs/atlaspack/commit/1ef91fcc863fdd2831511937083dbbc1263b3d9d)]:
+  - @atlaspack/rust@3.3.4
+  - @atlaspack/feature-flags@2.16.0
+  - @atlaspack/utils@2.14.9
+  - @atlaspack/graph@3.4.7
+  - @atlaspack/plugin@2.14.9
+
+## 2.16.1
+
+### Patch Changes
+
+- Updated dependencies [[`30f6017`](https://github.com/atlassian-labs/atlaspack/commit/30f60175ba4d272c5fc193973c63bc298584775b), [`1ab0a27`](https://github.com/atlassian-labs/atlaspack/commit/1ab0a275aeca40350415e2b03e7440d1dddc6228), [`b8a4ae8`](https://github.com/atlassian-labs/atlaspack/commit/b8a4ae8f83dc0a83d8b145c5f729936ce52080a3)]:
+  - @atlaspack/feature-flags@2.15.1
+  - @atlaspack/rust@3.3.3
+  - @atlaspack/graph@3.4.6
+  - @atlaspack/utils@2.14.8
+  - @atlaspack/plugin@2.14.8
+
+## 2.16.0
+
+### Minor Changes
+
+- [#547](https://github.com/atlassian-labs/atlaspack/pull/547) [`a1773d2`](https://github.com/atlassian-labs/atlaspack/commit/a1773d2a62d0ef7805ac7524621dcabcc1afe929) Thanks [@benjervis](https://github.com/benjervis)! - Add a feature flag for resolving the configuration for `@atlaspack/bundler-default` from CWD, rather than exclusively from the project root.
+
+### Patch Changes
+
+- Updated dependencies [[`a1773d2`](https://github.com/atlassian-labs/atlaspack/commit/a1773d2a62d0ef7805ac7524621dcabcc1afe929), [`556d6ab`](https://github.com/atlassian-labs/atlaspack/commit/556d6ab8ede759fa7f37fcd3f4da336ef1c55e8f)]:
+  - @atlaspack/feature-flags@2.15.0
+  - @atlaspack/rust@3.3.2
+  - @atlaspack/graph@3.4.5
+  - @atlaspack/utils@2.14.7
+  - @atlaspack/plugin@2.14.7
+
+## 2.15.1
+
+### Patch Changes
+
+- Updated dependencies [[`e0f5337`](https://github.com/atlassian-labs/atlaspack/commit/e0f533757bd1019dbd108a04952c87da15286e09)]:
+  - @atlaspack/feature-flags@2.14.4
+  - @atlaspack/rust@3.3.1
+  - @atlaspack/graph@3.4.4
+  - @atlaspack/utils@2.14.6
+  - @atlaspack/plugin@2.14.6
+
+## 2.15.0
+
+### Minor Changes
+
+- [#535](https://github.com/atlassian-labs/atlaspack/pull/535) [`a4bc259`](https://github.com/atlassian-labs/atlaspack/commit/a4bc2590196b6c1e743e4edcb0337e8c4c240ab4) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Add `sharedBundleMergeThreshold` config option
+
+  In apps with lots of dynamic imports, many shared bundles are often removed
+  from the output to prevent an overload in network requests according to the
+  `maxParallelRequests` config. In these cases, setting `sharedBundleMergeThreshold` can
+  merge shared bundles with a high overlap in their source bundles (bundles that share the bundle).
+  This config trades-off potential overfetching to reduce asset duplication.
+
+  The following config would merge shared bundles that have a 75% or higher overlap in source bundles.
+
+  ```json
+  {
+    "@atlaspack/bundler-default": {
+      "sharedBundleMergeThreshold": 0.75
+    }
+  }
+  ```
+
+### Patch Changes
+
+- Updated dependencies [[`11d6f16`](https://github.com/atlassian-labs/atlaspack/commit/11d6f16b6397dee2f217167e5c98b39edb63f7a7), [`e2ba0f6`](https://github.com/atlassian-labs/atlaspack/commit/e2ba0f69702656f3d1ce95ab1454e35062b13b39), [`d2c50c2`](https://github.com/atlassian-labs/atlaspack/commit/d2c50c2c020888b33bb25b8690d9320c2b69e2a6), [`46a90dc`](https://github.com/atlassian-labs/atlaspack/commit/46a90dccd019a26b222c878a92d23acc75dc67c5)]:
+  - @atlaspack/feature-flags@2.14.3
+  - @atlaspack/rust@3.3.0
+  - @atlaspack/graph@3.4.3
+  - @atlaspack/utils@2.14.5
+  - @atlaspack/plugin@2.14.5
+
 ## 2.14.4
 
 ### Patch Changes

package/lib/bundlerConfig.js

@@ -11,6 +11,13 @@ function _diagnostic() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -125,9 +132,17 @@ const CONFIG_SCHEMA = {
   additionalProperties: false
 };
 async function loadBundlerConfig(config, options, logger) {
-  let conf = await config.getConfig([], {
-    packageKey: '@atlaspack/bundler-default'
-  });
+  var _conf;
+  let conf;
+  if ((0, _featureFlags().getFeatureFlag)('resolveBundlerConfigFromCwd')) {
+    conf = await config.getConfigFrom(`${process.cwd()}/index`, [], {
+      packageKey: '@atlaspack/bundler-default'
+    });
+  } else {
+    conf = await config.getConfig([], {
+      packageKey: '@atlaspack/bundler-default'
+    });
+  }
   if (!conf) {
     const modDefault = {
       ...HTTP_OPTIONS['2'],
@@ -135,7 +150,7 @@ async function loadBundlerConfig(config, options, logger) {
     };
     return modDefault;
   }
-  (0, _assert().default)((conf === null || conf === void 0 ? void 0 : conf.contents) != null);
+  (0, _assert().default)(((_conf = conf) === null || _conf === void 0 ? void 0 : _conf.contents) != null);
   let modeConfig = resolveModeConfig(conf.contents, options.mode);
 
   // minBundles will be ignored if shared bundles are disabled

package/lib/idealGraph.js

@@ -108,15 +108,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   }
   let assets = [];
   let assetToIndex = new Map();
-  //Manual is a map of the user-given name to the bundle node Id that corresponds to ALL the assets that match any glob in that user-specified array
-  let manualSharedMap = new Map();
-  // May need a map to be able to look up NON- bundle root assets which need special case instructions
-  // Use this when placing assets into bundles, to avoid duplication
-  let manualAssetToBundle = new Map();
-  let {
-    manualAssetToConfig,
-    constantModuleToMSB
-  } = function makeManualAssetToConfigLookup() {
+  function makeManualAssetToConfigLookup() {
     let manualAssetToConfig = new Map();
     let constantModuleToMSB = new (_utils().DefaultMap)(() => []);
     if (config.manualSharedBundles.length === 0) {
@@ -182,7 +174,17 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       manualAssetToConfig,
       constantModuleToMSB
     };
-  }();
+  }
+
+  //Manual is a map of the user-given name to the bundle node Id that corresponds to ALL the assets that match any glob in that user-specified array
+  let manualSharedMap = new Map();
+  // May need a map to be able to look up NON- bundle root assets which need special case instructions
+  // Use this when placing assets into bundles, to avoid duplication
+  let manualAssetToBundle = new Map();
+  let {
+    manualAssetToConfig,
+    constantModuleToMSB
+  } = makeManualAssetToConfigLookup();
   let manualBundleToInternalizedAsset = new (_utils().DefaultMap)(() => []);
 
   /**
@@ -952,8 +954,8 @@ function createIdealGraph(assetGraph, config, entries, logger) {
     }
   }
   function mergeBundles(bundleGraph, bundleToKeepId, bundleToRemoveId, assetReference) {
-    let bundleToKeep = (0, _nullthrows().default)(bundleGraph.getNode(bundleToKeepId), '18');
-    let bundleToRemove = (0, _nullthrows().default)(bundleGraph.getNode(bundleToRemoveId), '19');
+    let bundleToKeep = (0, _nullthrows().default)(bundleGraph.getNode(bundleToKeepId));
+    let bundleToRemove = (0, _nullthrows().default)(bundleGraph.getNode(bundleToRemoveId));
     (0, _assert().default)(bundleToKeep !== 'root' && bundleToRemove !== 'root');
     for (let asset of bundleToRemove.assets) {
       bundleToKeep.assets.add(asset);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.14.5-canary.9+4c1714103",
+  "version": "2.14.5-dev.55+5a11f33c5",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -16,13 +16,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.77+4c1714103",
-    "@atlaspack/feature-flags": "2.14.1-canary.77+4c1714103",
-    "@atlaspack/graph": "3.4.1-canary.77+4c1714103",
-    "@atlaspack/plugin": "2.14.5-canary.9+4c1714103",
-    "@atlaspack/rust": "3.2.1-canary.9+4c1714103",
-    "@atlaspack/utils": "2.14.5-canary.9+4c1714103",
+    "@atlaspack/diagnostic": "2.14.1-dev.123+5a11f33c5",
+    "@atlaspack/feature-flags": "2.14.1-dev.123+5a11f33c5",
+    "@atlaspack/graph": "3.4.1-dev.123+5a11f33c5",
+    "@atlaspack/plugin": "2.14.5-dev.55+5a11f33c5",
+    "@atlaspack/rust": "3.2.1-dev.55+5a11f33c5",
+    "@atlaspack/utils": "2.14.5-dev.55+5a11f33c5",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "4c1714103dab2aa9039c488f381551d2b65d1d01"
+  "gitHead": "5a11f33c51ff74d1cf8d4b72cfa0fda833aa980a"
 }

package/src/bundlerConfig.js

@@ -7,6 +7,7 @@ import type {
   BuildMode,
   PluginLogger,
 } from '@atlaspack/types';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {type SchemaEntity, validateSchema} from '@atlaspack/utils';
 import invariant from 'assert';
 
@@ -155,9 +156,17 @@ 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 = {

package/src/idealGraph.js

@@ -1262,11 +1262,8 @@ export function createIdealGraph(
     bundleToRemoveId: NodeId,
     assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>,
   ) {
-    let bundleToKeep = nullthrows(bundleGraph.getNode(bundleToKeepId), '18');
-    let bundleToRemove = nullthrows(
-      bundleGraph.getNode(bundleToRemoveId),
-      '19',
-    );
+    let bundleToKeep = nullthrows(bundleGraph.getNode(bundleToKeepId));
+    let bundleToRemove = nullthrows(bundleGraph.getNode(bundleToRemoveId));
     invariant(bundleToKeep !== 'root' && bundleToRemove !== 'root');
     for (let asset of bundleToRemove.assets) {
       bundleToKeep.assets.add(asset);