@atlaspack/core 2.14.1-dev.50 → 2.14.1-dev.53

package/lib/loadAtlaspackPlugin.js

@@ -43,7 +43,8 @@ const CONFIG = Symbol.for('parcel-plugin-config');
 async function loadPlugin(pluginName, configPath, keyPath, options) {
   if (_internalPlugins.default && _internalPlugins.default[pluginName]) {
     let plugin = _internalPlugins.default[pluginName]();
-    plugin = plugin.default[CONFIG];
+    plugin = plugin.default || plugin;
+    plugin = plugin[CONFIG];
     if (!plugin) {
       throw new Error(`Plugin ${pluginName} is not a valid Atlaspack plugin, should export an instance of a Atlaspack plugin ex. "export default new Reporter({ ... })".`);
     }

package/lib/requests/AtlaspackConfigRequest.js

@@ -66,6 +66,7 @@ var _AtlaspackConfig2 = _interopRequireDefault(require("../AtlaspackConfig.schem
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
 var _utils2 = require("../utils");
+var _isSuperPackage = require("../isSuperPackage");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -135,28 +136,36 @@ async function resolveAtlaspackConfig(options) {
   let resolveFrom = getResolveFrom(options.inputFS, options.projectRoot);
   let configPath = options.config != null ? (await options.packageManager.resolve(options.config, resolveFrom)).resolved : await (0, _utils().resolveConfig)(options.inputFS, resolveFrom, ['.parcelrc'], options.projectRoot);
   let usedDefault = false;
-  if (configPath == null && options.defaultConfig != null) {
+  let config, extendedFiles;
+  if (configPath == null && options.defaultConfig != null && (0, _isSuperPackage.isSuperPackage)() && options.defaultConfig.endsWith('.js')) {
     usedDefault = true;
-    configPath = (await options.packageManager.resolve(options.defaultConfig, resolveFrom)).resolved;
-  }
-  if (configPath == null) {
-    return null;
-  }
-  let contents;
-  try {
-    contents = await options.inputFS.readFile(configPath, 'utf8');
-  } catch (e) {
-    throw new (_diagnostic().default)({
-      diagnostic: {
-        message: (0, _diagnostic().md)`Could not find parcel config at ${_path().default.relative(options.projectRoot, configPath)}`,
-        origin: '@atlaspack/core'
-      }
-    });
+    // Load the super package default config
+    let result = await processConfigChain(_internalPlugins.default['@atlaspack/config-default'](), options.defaultConfig, options);
+    config = result.config;
+    extendedFiles = result.extendedFiles;
+  } else {
+    if (configPath == null && options.defaultConfig != null) {
+      usedDefault = true;
+      configPath = (await options.packageManager.resolve(options.defaultConfig, resolveFrom)).resolved;
+    }
+    if (configPath == null) {
+      return null;
+    }
+    let contents;
+    try {
+      contents = await options.inputFS.readFile(configPath, 'utf8');
+    } catch (e) {
+      throw new (_diagnostic().default)({
+        diagnostic: {
+          message: (0, _diagnostic().md)`Could not find parcel config at ${_path().default.relative(options.projectRoot, configPath)}`,
+          origin: '@atlaspack/core'
+        }
+      });
+    }
+    let result = await parseAndProcessConfig(configPath, contents, options);
+    config = result.config;
+    extendedFiles = result.extendedFiles;
   }
-  let {
-    config,
-    extendedFiles
-  } = await parseAndProcessConfig(configPath, contents, options);
   if (options.additionalReporters.length > 0) {
     config.reporters = [...options.additionalReporters.map(({
       packageName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.14.1-dev.50+0914fcd0b",
+  "version": "2.14.1-dev.53+75290c6cb",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-dev.50+0914fcd0b",
-    "@atlaspack/cache": "2.13.3-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/graph": "3.4.1-dev.50+0914fcd0b",
-    "@atlaspack/logger": "2.14.1-dev.50+0914fcd0b",
-    "@atlaspack/package-manager": "2.14.1-dev.50+0914fcd0b",
-    "@atlaspack/plugin": "2.14.1-dev.50+0914fcd0b",
-    "@atlaspack/profiler": "2.14.1-dev.50+0914fcd0b",
-    "@atlaspack/rust": "3.0.1-dev.50+0914fcd0b",
-    "@atlaspack/types": "2.14.1-dev.50+0914fcd0b",
-    "@atlaspack/utils": "2.14.1-dev.50+0914fcd0b",
-    "@atlaspack/workers": "2.14.1-dev.50+0914fcd0b",
+    "@atlaspack/build-cache": "2.13.3-dev.53+75290c6cb",
+    "@atlaspack/cache": "2.13.3-dev.53+75290c6cb",
+    "@atlaspack/diagnostic": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/events": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/feature-flags": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/fs": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/graph": "3.4.1-dev.53+75290c6cb",
+    "@atlaspack/logger": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/package-manager": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/plugin": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/profiler": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/rust": "3.0.1-dev.53+75290c6cb",
+    "@atlaspack/types": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/utils": "2.14.1-dev.53+75290c6cb",
+    "@atlaspack/workers": "2.14.1-dev.53+75290c6cb",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -67,5 +67,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "0914fcd0b475df31a4e105a1cda98df3c679c661"
+  "gitHead": "75290c6cb03e7253ab1f9bfc6859d518a7d313cc"
 }

package/src/loadAtlaspackPlugin.js

@@ -32,7 +32,8 @@ export default async function loadPlugin<T>(
 |}> {
   if (atlaspackInternalPlugins && atlaspackInternalPlugins[pluginName]) {
     let plugin = atlaspackInternalPlugins[pluginName]();
-    plugin = plugin.default[CONFIG];
+    plugin = plugin.default || plugin;
+    plugin = plugin[CONFIG];
     if (!plugin) {
       throw new Error(
         `Plugin ${pluginName} is not a valid Atlaspack plugin, should export an instance of a Atlaspack plugin ex. "export default new Reporter({ ... })".`,

package/src/requests/AtlaspackConfigRequest.js

@@ -40,6 +40,7 @@ import AtlaspackConfigSchema from '../AtlaspackConfig.schema';
 import {toProjectPath} from '../projectPath';
 import {requestTypes} from '../RequestTracker';
 import {optionsProxy} from '../utils';
+import {isSuperPackage} from '../isSuperPackage';
 
 type ConfigMap<K, V> = {[K]: V, ...};
 
@@ -160,34 +161,59 @@ export async function resolveAtlaspackConfig(
         );
 
   let usedDefault = false;
-  if (configPath == null && options.defaultConfig != null) {
+  let config, extendedFiles;
+
+  if (
+    configPath == null &&
+    options.defaultConfig != null &&
+    isSuperPackage() &&
+    options.defaultConfig.endsWith('.js')
+  ) {
     usedDefault = true;
-    configPath = (
-      await options.packageManager.resolve(options.defaultConfig, resolveFrom)
-    ).resolved;
-  }
+    // Load the super package default config
+    let result: AtlaspackConfigChain = await processConfigChain(
+      atlaspackInternalPlugins['@atlaspack/config-default'](),
+      options.defaultConfig,
+      options,
+    );
+    config = result.config;
+    extendedFiles = result.extendedFiles;
+  } else {
+    if (configPath == null && options.defaultConfig != null) {
+      usedDefault = true;
 
-  if (configPath == null) {
-    return null;
-  }
+      configPath = (
+        await options.packageManager.resolve(options.defaultConfig, resolveFrom)
+      ).resolved;
+    }
 
-  let contents;
-  try {
-    contents = await options.inputFS.readFile(configPath, 'utf8');
-  } catch (e) {
-    throw new ThrowableDiagnostic({
-      diagnostic: {
-        message: md`Could not find parcel config at ${path.relative(
-          options.projectRoot,
-          configPath,
-        )}`,
-        origin: '@atlaspack/core',
-      },
-    });
-  }
+    if (configPath == null) {
+      return null;
+    }
+
+    let contents;
+    try {
+      contents = await options.inputFS.readFile(configPath, 'utf8');
+    } catch (e) {
+      throw new ThrowableDiagnostic({
+        diagnostic: {
+          message: md`Could not find parcel config at ${path.relative(
+            options.projectRoot,
+            configPath,
+          )}`,
+          origin: '@atlaspack/core',
+        },
+      });
+    }
 
-  let {config, extendedFiles}: AtlaspackConfigChain =
-    await parseAndProcessConfig(configPath, contents, options);
+    let result: AtlaspackConfigChain = await parseAndProcessConfig(
+      configPath,
+      contents,
+      options,
+    );
+    config = result.config;
+    extendedFiles = result.extendedFiles;
+  }
 
   if (options.additionalReporters.length > 0) {
     config.reporters = [