@atlaspack/cli 2.13.7-dev.55 → 2.13.7-dev.72

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @atlaspack/cli
 
+## 2.13.15
+
+### Patch Changes
+
+- Updated dependencies [[`73ea3c4`](https://github.com/atlassian-labs/atlaspack/commit/73ea3c4d85d4401fdd15abcbf988237e890e7ad3), [`b1b3693`](https://github.com/atlassian-labs/atlaspack/commit/b1b369317c66f8a431c170df2ebba4fa5b2e38ef)]:
+  - @atlaspack/feature-flags@2.17.0
+  - @atlaspack/config-default@3.1.13
+  - @atlaspack/core@2.18.2
+  - @atlaspack/fs@2.15.6
+  - @atlaspack/utils@2.14.11
+  - @atlaspack/reporter-cli@2.15.7
+  - @atlaspack/package-manager@2.14.11
+  - @atlaspack/reporter-dev-server@2.14.11
+  - @atlaspack/reporter-tracer@2.14.11
+
+## 2.13.14
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/config-default@3.1.12
+
+## 2.13.13
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/config-default@3.1.11
+  - @atlaspack/core@2.18.1
+
+## 2.13.12
+
+### Patch Changes
+
+- Updated dependencies [[`0999fb7`](https://github.com/atlassian-labs/atlaspack/commit/0999fb78da519a6c7582d212883e515fcf6c1252), [`51aba5f`](https://github.com/atlassian-labs/atlaspack/commit/51aba5fc0e49235ee06bbc3c376f48c3e7da5c4b), [`1e32d4e`](https://github.com/atlassian-labs/atlaspack/commit/1e32d4eae6b3af3968e8a0ef97d35b4347fd4196), [`0b2f6f5`](https://github.com/atlassian-labs/atlaspack/commit/0b2f6f55794d3ff6e2f5a41f963e7e5dd8ad9f8d), [`6dd4ccb`](https://github.com/atlassian-labs/atlaspack/commit/6dd4ccb753541de32322d881f973d571dd57e4ca)]:
+  - @atlaspack/fs@2.15.5
+  - @atlaspack/core@2.18.0
+  - @atlaspack/package-manager@2.14.10
+  - @atlaspack/reporter-cli@2.15.6
+  - @atlaspack/reporter-dev-server@2.14.10
+  - @atlaspack/config-default@3.1.10
+  - @atlaspack/logger@2.14.10
+  - @atlaspack/utils@2.14.10
+  - @atlaspack/reporter-tracer@2.14.10
+
 ## 2.13.11
 
 ### Patch Changes

package/lib/bin.js

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
 'use strict';
 
-if (process.env.ATLASPACK_BUILD_ENV !== 'production' || process.env.ATLASPACK_SELF_BUILD) {
-  require('@atlaspack/babel-register');
-}
 require('./cli');

package/lib/cli.js

@@ -116,14 +116,30 @@ command) {
     entries = ['.'];
   }
   entries = entries.map(entry => _path().default.resolve(entry));
-  let Atlaspack = require('@atlaspack/core').default;
   let fs = new (_fs().NodeFS)();
+  let Atlaspack = require('@atlaspack/core').default;
   let options = await (0, _normalizeOptions.normalizeOptions)(command, fs);
   let atlaspack = new Atlaspack({
     entries,
-    defaultConfig: require.resolve('@atlaspack/config-default', {
-      paths: [fs.cwd(), __dirname]
-    }),
+    defaultConfig: (() => {
+      if ((0, _core().isSuperPackage)()) {
+        // We're in the super package so resolve the inbuilt config
+        let inbuiltDefaultConfig = _path().default.join( /*#__ATLASPACK_IGNORE__*/__dirname, '../../configs/default/index.json.js');
+        if (!fs.existsSync(inbuiltDefaultConfig)) {
+          throw new Error(`Missing inbuilt default config. Expected '${inbuiltDefaultConfig}' to exist`);
+        }
+        return inbuiltDefaultConfig;
+      }
+      for (let path of [fs.cwd(), __dirname]) {
+        let customRequire = require('module').createRequire(path);
+        try {
+          return customRequire.resolve('@atlaspack/config-default');
+        } catch (e) {
+          // Ignore error
+        }
+      }
+      throw new Error(`Can't resolve default config`);
+    })(),
     shouldPatchConsole: false,
     ...options
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/cli",
-  "version": "2.13.7-dev.55+5a11f33c5",
+  "version": "2.13.7-dev.72+9840480de",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
@@ -24,18 +24,18 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/config-default": "3.1.5-dev.55+5a11f33c5",
-    "@atlaspack/core": "2.16.2-dev.55+5a11f33c5",
-    "@atlaspack/diagnostic": "2.14.1-dev.123+5a11f33c5",
-    "@atlaspack/events": "2.14.1-dev.123+5a11f33c5",
-    "@atlaspack/feature-flags": "2.14.1-dev.123+5a11f33c5",
-    "@atlaspack/fs": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/logger": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/package-manager": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/reporter-cli": "2.15.1-dev.55+5a11f33c5",
-    "@atlaspack/reporter-dev-server": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/reporter-tracer": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/utils": "2.14.5-dev.55+5a11f33c5",
+    "@atlaspack/config-default": "3.1.5-dev.72+9840480de",
+    "@atlaspack/core": "2.16.2-dev.72+9840480de",
+    "@atlaspack/diagnostic": "2.14.1-dev.140+9840480de",
+    "@atlaspack/events": "2.14.1-dev.140+9840480de",
+    "@atlaspack/feature-flags": "2.14.1-dev.140+9840480de",
+    "@atlaspack/fs": "2.14.5-dev.72+9840480de",
+    "@atlaspack/logger": "2.14.5-dev.72+9840480de",
+    "@atlaspack/package-manager": "2.14.5-dev.72+9840480de",
+    "@atlaspack/reporter-cli": "2.15.1-dev.72+9840480de",
+    "@atlaspack/reporter-dev-server": "2.14.5-dev.72+9840480de",
+    "@atlaspack/reporter-tracer": "2.14.5-dev.72+9840480de",
+    "@atlaspack/utils": "2.14.5-dev.72+9840480de",
     "chalk": "^4.1.0",
     "commander": "^7.0.0",
     "get-port": "^4.2.0"
@@ -45,5 +45,5 @@
     "@babel/core": "^7.22.11",
     "rimraf": "^5.0.5"
   },
-  "gitHead": "5a11f33c51ff74d1cf8d4b72cfa0fda833aa980a"
+  "gitHead": "9840480de27511f558d8f5b8cf82220de977b4fb"
 }

package/src/cli.js

@@ -1,6 +1,6 @@
 // @flow
 
-import {BuildError} from '@atlaspack/core';
+import {BuildError, isSuperPackage} from '@atlaspack/core';
 import {NodeFS} from '@atlaspack/fs';
 import {openInBrowser} from '@atlaspack/utils';
 import {Disposable} from '@atlaspack/events';
@@ -132,14 +132,39 @@ async function run(
 
   entries = entries.map((entry) => path.resolve(entry));
 
-  let Atlaspack = require('@atlaspack/core').default;
   let fs = new NodeFS();
+
+  const resolveDefaultConfig = () => {
+    if (isSuperPackage()) {
+      // We're in the super package so resolve the inbuilt config
+      let inbuiltDefaultConfig = path.join(
+        /*#__ATLASPACK_IGNORE__*/ __dirname,
+        '../../configs/default/index.json.js',
+      );
+      if (!fs.existsSync(inbuiltDefaultConfig)) {
+        throw new Error(
+          `Missing inbuilt default config. Expected '${inbuiltDefaultConfig}' to exist`,
+        );
+      }
+      return inbuiltDefaultConfig;
+    }
+
+    for (let path of [fs.cwd(), __dirname]) {
+      let customRequire = require('module').createRequire(path);
+      try {
+        return customRequire.resolve('@atlaspack/config-default');
+      } catch (e) {
+        // Ignore error
+      }
+    }
+    throw new Error(`Can't resolve default config`);
+  };
+
+  let Atlaspack = require('@atlaspack/core').default;
   let options = await normalizeOptions(command, fs);
   let atlaspack = new Atlaspack({
     entries,
-    defaultConfig: require.resolve('@atlaspack/config-default', {
-      paths: [fs.cwd(), __dirname],
-    }),
+    defaultConfig: resolveDefaultConfig(),
     shouldPatchConsole: false,
     ...options,
   });