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

package/lib/cli.js

@@ -116,30 +116,14 @@ command) {
     entries = ['.'];
   }
   entries = entries.map(entry => _path().default.resolve(entry));
-  let fs = new (_fs().NodeFS)();
   let Atlaspack = require('@atlaspack/core').default;
+  let fs = new (_fs().NodeFS)();
   let options = await (0, _normalizeOptions.normalizeOptions)(command, fs);
   let atlaspack = new Atlaspack({
     entries,
-    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`);
-    })(),
+    defaultConfig: require.resolve('@atlaspack/config-default', {
+      paths: [fs.cwd(), __dirname]
+    }),
     shouldPatchConsole: false,
     ...options
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/cli",
-  "version": "2.13.7-dev.72+9840480de",
+  "version": "2.13.7-dev.73+84eec3484",
   "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.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",
+    "@atlaspack/config-default": "3.1.5-dev.73+84eec3484",
+    "@atlaspack/core": "2.16.2-dev.73+84eec3484",
+    "@atlaspack/diagnostic": "2.14.1-dev.141+84eec3484",
+    "@atlaspack/events": "2.14.1-dev.141+84eec3484",
+    "@atlaspack/feature-flags": "2.14.1-dev.141+84eec3484",
+    "@atlaspack/fs": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/logger": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/package-manager": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/reporter-cli": "2.15.1-dev.73+84eec3484",
+    "@atlaspack/reporter-dev-server": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/reporter-tracer": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/utils": "2.14.5-dev.73+84eec3484",
     "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": "9840480de27511f558d8f5b8cf82220de977b4fb"
+  "gitHead": "84eec348413c647de4872f902c4bc8ff54c347f3"
 }

package/src/cli.js

@@ -1,6 +1,6 @@
 // @flow
 
-import {BuildError, isSuperPackage} from '@atlaspack/core';
+import {BuildError} from '@atlaspack/core';
 import {NodeFS} from '@atlaspack/fs';
 import {openInBrowser} from '@atlaspack/utils';
 import {Disposable} from '@atlaspack/events';
@@ -132,39 +132,14 @@ async function run(
 
   entries = entries.map((entry) => path.resolve(entry));
 
-  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 fs = new NodeFS();
   let options = await normalizeOptions(command, fs);
   let atlaspack = new Atlaspack({
     entries,
-    defaultConfig: resolveDefaultConfig(),
+    defaultConfig: require.resolve('@atlaspack/config-default', {
+      paths: [fs.cwd(), __dirname],
+    }),
     shouldPatchConsole: false,
     ...options,
   });