@atlaspack/bundler-default 2.15.1 → 2.16.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaspack/bundler-default
 
+## 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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.15.1",
+  "version": "2.16.1",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.1",
-    "@atlaspack/feature-flags": "2.14.4",
-    "@atlaspack/graph": "3.4.4",
-    "@atlaspack/plugin": "2.14.6",
-    "@atlaspack/rust": "3.3.1",
-    "@atlaspack/utils": "2.14.6",
+    "@atlaspack/feature-flags": "2.15.1",
+    "@atlaspack/graph": "3.4.6",
+    "@atlaspack/plugin": "2.14.8",
+    "@atlaspack/rust": "3.3.3",
+    "@atlaspack/utils": "2.14.8",
     "nullthrows": "^1.1.1"
   }
 }

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 = {