@atlaspack/cli 2.13.3-dev.43 → 2.13.3-dev.50

package/lib/cli.js

@@ -116,15 +116,21 @@ 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: ((specifier, {
-      paths
-    }) => {
-      for (let path of paths) {
+    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');
@@ -132,10 +138,8 @@ command) {
           // Ignore error
         }
       }
-      throw new Error(`Can't resolve "${specifier}" from any of [${paths.join(', ')}]`);
-    })('@atlaspack/config-default', {
-      paths: [fs.cwd(), __dirname]
-    }),
+      throw new Error(`Can't resolve default config`);
+    })(),
     shouldPatchConsole: false,
     ...options
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/cli",
-  "version": "2.13.3-dev.43+e1584ed4e",
+  "version": "2.13.3-dev.50+0914fcd0b",
   "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.1-dev.43+e1584ed4e",
-    "@atlaspack/core": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/diagnostic": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/events": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/feature-flags": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/fs": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/logger": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/package-manager": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/reporter-cli": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/reporter-dev-server": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/reporter-tracer": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/utils": "2.14.1-dev.43+e1584ed4e",
+    "@atlaspack/config-default": "3.1.1-dev.50+0914fcd0b",
+    "@atlaspack/core": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/diagnostic": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/events": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/feature-flags": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/fs": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/logger": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/package-manager": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/reporter-cli": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/reporter-dev-server": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/reporter-tracer": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/utils": "2.14.1-dev.50+0914fcd0b",
     "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": "e1584ed4eba00a5920c981f8622f8c04ee3c73c3"
+  "gitHead": "0914fcd0b475df31a4e105a1cda98df3c679c661"
 }

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,8 +132,24 @@ async function run(
 
   entries = entries.map((entry) => path.resolve(entry));
 
-  const resolve = (specifier, {paths}) => {
-    for (let path of paths) {
+  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');
@@ -141,19 +157,14 @@ async function run(
         // Ignore error
       }
     }
-    throw new Error(
-      `Can't resolve "${specifier}" from any of [${paths.join(', ')}]`,
-    );
+    throw new Error(`Can't resolve default config`);
   };
 
   let Atlaspack = require('@atlaspack/core').default;
-  let fs = new NodeFS();
   let options = await normalizeOptions(command, fs);
   let atlaspack = new Atlaspack({
     entries,
-    defaultConfig: resolve('@atlaspack/config-default', {
-      paths: [fs.cwd(), __dirname],
-    }),
+    defaultConfig: resolveDefaultConfig(),
     shouldPatchConsole: false,
     ...options,
   });