@atlaspack/core 2.14.1-dev.43 → 2.14.1-dev.51

package/lib/index.js

@@ -9,7 +9,8 @@ var _exportNames = {
   BuildError: true,
   createWorkerFarm: true,
   INTERNAL_RESOLVE: true,
-  INTERNAL_TRANSFORM: true
+  INTERNAL_TRANSFORM: true,
+  isSuperPackage: true
 };
 Object.defineProperty(exports, "Atlaspack", {
   enumerable: true,
@@ -53,7 +54,14 @@ Object.defineProperty(exports, "default", {
     return _Atlaspack.default;
   }
 });
+Object.defineProperty(exports, "isSuperPackage", {
+  enumerable: true,
+  get: function () {
+    return _isSuperPackage.isSuperPackage;
+  }
+});
 var _Atlaspack = _interopRequireWildcard(require("./Atlaspack"));
+var _isSuperPackage = require("./isSuperPackage");
 var _atlaspackV = require("./atlaspack-v3");
 Object.keys(_atlaspackV).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/isSuperPackage.js

@@ -0,0 +1,15 @@
+"use strict";
+
+let fs = require('fs');
+let path = require('path');
+let {
+  findAncestorFile
+} = require('@atlaspack/rust');
+let dirname = /*#__ATLASPACK_IGNORE__*/__dirname;
+module.exports.isSuperPackage = () => {
+  if (!dirname) {
+    return false;
+  }
+  let packageJson = JSON.parse(fs.readFileSync(findAncestorFile(['package.json'], dirname, '/')));
+  return packageJson.name === '@atlaspack/super';
+};

package/lib/requests/AtlaspackConfigRequest.js

@@ -60,11 +60,13 @@ function _assert() {
   };
   return data;
 }
+var _internalPlugins = _interopRequireDefault(require("../internal-plugins"));
 var _AtlaspackConfig = require("../AtlaspackConfig");
 var _AtlaspackConfig2 = _interopRequireDefault(require("../AtlaspackConfig.schema"));
 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; }
@@ -134,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,
@@ -304,13 +314,16 @@ async function processConfigChain(configFile, filePath, options) {
       for (let ext of exts) {
         try {
           let key = Array.isArray(configFile.extends) ? `/extends/${i}` : '/extends';
-          let resolved = await resolveExtends(ext, filePath, key, options);
-          extendedFiles.push(resolved);
-          let {
-            extendedFiles: moreExtendedFiles,
-            config: nextConfig
-          } = await processExtendedConfig(filePath, key, ext, resolved, options);
-          extendedFiles = extendedFiles.concat(moreExtendedFiles);
+          let nextConfig;
+          if (_internalPlugins.default[ext]) {
+            nextConfig = (await processConfigChain(_internalPlugins.default[ext](), /*#__ATLASPACK_IGNORE__*/__dirname, options)).config;
+          } else {
+            let resolved = await resolveExtends(ext, filePath, key, options);
+            extendedFiles.push(resolved);
+            let result = await processExtendedConfig(filePath, key, ext, resolved, options);
+            extendedFiles = extendedFiles.concat(result.extendedFiles);
+            nextConfig = result.config;
+          }
           extStartConfig = extStartConfig ? mergeConfigs(extStartConfig, nextConfig) : nextConfig;
         } catch (err) {
           errors.push(err);

package/lib/worker.js

@@ -78,15 +78,15 @@ require("@atlaspack/package-manager");
 require("@atlaspack/fs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // register with serializer
+// Repl builds are currently not enabled
 // $FlowFixMe
-if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
-  /* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
-  require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
-  // $FlowFixMe
-  require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
-  /* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
-}
-
+// if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
+//   /* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
+//   require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
+//   // $FlowFixMe
+//   require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
+//   /* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
+// }
 (0, _registerCoreWithSerializer.registerCoreWithSerializer)();
 
 // Remove the workerApi type from the TransformationOpts and ValidationOpts types:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.14.1-dev.43+e1584ed4e",
+  "version": "2.14.1-dev.51+93ff796f0",
   "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.43+e1584ed4e",
-    "@atlaspack/cache": "2.13.3-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/graph": "3.4.1-dev.43+e1584ed4e",
-    "@atlaspack/logger": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/package-manager": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/plugin": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/profiler": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/rust": "3.0.1-dev.43+e1584ed4e",
-    "@atlaspack/types": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/utils": "2.14.1-dev.43+e1584ed4e",
-    "@atlaspack/workers": "2.14.1-dev.43+e1584ed4e",
+    "@atlaspack/build-cache": "2.13.3-dev.51+93ff796f0",
+    "@atlaspack/cache": "2.13.3-dev.51+93ff796f0",
+    "@atlaspack/diagnostic": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/events": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/feature-flags": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/fs": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/graph": "3.4.1-dev.51+93ff796f0",
+    "@atlaspack/logger": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/package-manager": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/plugin": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/profiler": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/rust": "3.0.1-dev.51+93ff796f0",
+    "@atlaspack/types": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/utils": "2.14.1-dev.51+93ff796f0",
+    "@atlaspack/workers": "2.14.1-dev.51+93ff796f0",
     "@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": "e1584ed4eba00a5920c981f8622f8c04ee3c73c3"
+  "gitHead": "93ff796f0be03616f78c934ab3f6ffb1441b3043"
 }

package/src/index.js

@@ -10,4 +10,6 @@ export {
   INTERNAL_TRANSFORM,
 } from './Atlaspack';
 
+export {isSuperPackage} from './isSuperPackage';
+
 export * from './atlaspack-v3';

package/src/isSuperPackage.js

@@ -0,0 +1,16 @@
+let fs = require('fs');
+let path = require('path');
+let {findAncestorFile} = require('@atlaspack/rust');
+let dirname = /*#__ATLASPACK_IGNORE__*/ __dirname;
+
+module.exports.isSuperPackage = () => {
+  if (!dirname) {
+    return false;
+  }
+
+  let packageJson = JSON.parse(
+    fs.readFileSync(findAncestorFile(['package.json'], dirname, '/')),
+  );
+
+  return packageJson.name === '@atlaspack/super';
+};

package/src/requests/AtlaspackConfigRequest.js

@@ -34,11 +34,13 @@ import json5 from 'json5';
 import path from 'path';
 import invariant from 'assert';
 
+import atlaspackInternalPlugins from '../internal-plugins';
 import {AtlaspackConfig} from '../AtlaspackConfig';
 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, ...};
 
@@ -159,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 {config, extendedFiles}: AtlaspackConfigChain =
-    await parseAndProcessConfig(configPath, contents, options);
+    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 result: AtlaspackConfigChain = await parseAndProcessConfig(
+      configPath,
+      contents,
+      options,
+    );
+    config = result.config;
+    extendedFiles = result.extendedFiles;
+  }
 
   if (options.additionalReporters.length > 0) {
     config.reporters = [
@@ -446,11 +473,29 @@ export async function processConfigChain(
           let key = Array.isArray(configFile.extends)
             ? `/extends/${i}`
             : '/extends';
-          let resolved = await resolveExtends(ext, filePath, key, options);
-          extendedFiles.push(resolved);
-          let {extendedFiles: moreExtendedFiles, config: nextConfig} =
-            await processExtendedConfig(filePath, key, ext, resolved, options);
-          extendedFiles = extendedFiles.concat(moreExtendedFiles);
+
+          let nextConfig;
+          if (atlaspackInternalPlugins[ext]) {
+            nextConfig = (
+              await processConfigChain(
+                atlaspackInternalPlugins[ext](),
+                /*#__ATLASPACK_IGNORE__*/ __dirname,
+                options,
+              )
+            ).config;
+          } else {
+            let resolved = await resolveExtends(ext, filePath, key, options);
+            extendedFiles.push(resolved);
+            let result = await processExtendedConfig(
+              filePath,
+              key,
+              ext,
+              resolved,
+              options,
+            );
+            extendedFiles = extendedFiles.concat(result.extendedFiles);
+            nextConfig = result.config;
+          }
           extStartConfig = extStartConfig
             ? mergeConfigs(extStartConfig, nextConfig)
             : nextConfig;

package/src/worker.js

@@ -32,14 +32,15 @@ import '@atlaspack/cache'; // register with serializer
 import '@atlaspack/package-manager';
 import '@atlaspack/fs';
 
+// Repl builds are currently not enabled
 // $FlowFixMe
-if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
-  /* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
-  require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
-  // $FlowFixMe
-  require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
-  /* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
-}
+// if (process.env.ATLASPACK_BUILD_REPL && process.browser) {
+//   /* eslint-disable import/no-extraneous-dependencies, monorepo/no-internal-import */
+//   require('@atlaspack/repl/src/atlaspack/BrowserPackageManager.js');
+//   // $FlowFixMe
+//   require('@atlaspack/repl/src/atlaspack/ExtendedMemoryFS.js');
+//   /* eslint-enable import/no-extraneous-dependencies, monorepo/no-internal-import */
+// }
 
 registerCoreWithSerializer();