@atlaspack/core 2.14.1-dev.9 → 2.14.1-dev.91

package/lib/Atlaspack.js

@@ -118,6 +118,7 @@ function _featureFlags() {
 var _atlaspackV = require("./atlaspack-v3");
 var _AssetGraphRequest = _interopRequireDefault(require("./requests/AssetGraphRequest"));
 var _AssetGraphRequestRust = require("./requests/AssetGraphRequestRust");
+var _rustWorkerThreadDylibHack = require("./rustWorkerThreadDylibHack");
 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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -125,7 +126,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 (0, _registerCoreWithSerializer.registerCoreWithSerializer)();
 const INTERNAL_TRANSFORM = exports.INTERNAL_TRANSFORM = Symbol('internal_transform');
 const INTERNAL_RESOLVE = exports.INTERNAL_RESOLVE = Symbol('internal_resolve');
-const WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
+const WORKER_PATH = exports.WORKER_PATH = _path().default.join( /*#__ATLASPACK_IGNORE__*/__dirname, 'worker.js');
 class Atlaspack {
   #requestTracker /*: RequestTracker*/;
   #config /*: AtlaspackConfig*/;
@@ -165,6 +166,9 @@ class Atlaspack {
       ...this.#initialOptions.featureFlags
     };
     (0, _featureFlags().setFeatureFlags)(featureFlags);
+    if ((0, _featureFlags().getFeatureFlag)('enableRustWorkerThreadDylibHack')) {
+      (0, _rustWorkerThreadDylibHack.loadRustWorkerThreadDylibHack)();
+    }
     await _sourceMap().init;
     await (_rust().init === null || _rust().init === void 0 ? void 0 : (0, _rust().init)());
     this.#disposable = new (_events().Disposable)();

package/lib/BundleGraph.js

@@ -832,7 +832,10 @@ class BundleGraph {
       // If this asset is referenced by any async dependency, it's referenced.
       return true;
     }
-    let dependencies = this._graph.getNodeIdsConnectedTo(assetNodeId).map(id => (0, _nullthrows().default)(this._graph.getNode(id))).filter(node => node.type === 'dependency').map(node => {
+    let dependencies = this._graph.getNodeIdsConnectedTo(assetNodeId,
+    // TODO: This seems like bug with library builds when assets are present
+    // in other files. Guarding the fix for now exclusively for super builds
+    process.env.ATLASPACK_SUPER_BUILD === 'true' ? _graph().ALL_EDGE_TYPES : undefined).map(id => (0, _nullthrows().default)(this._graph.getNode(id))).filter(node => node.type === 'dependency').map(node => {
       (0, _assert().default)(node.type === 'dependency');
       return node.value;
     });

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/internal-plugins.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+// This file is overridden in super package builds
+// $FlowFixMe
+var _default = exports.default = {};

package/lib/isSuperPackage.js

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

package/lib/loadAtlaspackPlugin.js

@@ -25,6 +25,8 @@ function _diagnostic() {
   };
   return data;
 }
+var _package = require("../package.json");
+var _internalPlugins = _interopRequireDefault(require("./internal-plugins"));
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -33,13 +35,25 @@ function _utils() {
   return data;
 }
 var _projectPath = require("./projectPath");
-var _package = require("../package.json");
 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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const NODE_MODULES = `${_path().default.sep}node_modules${_path().default.sep}`;
 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 || 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({ ... })".`);
+    }
+    return {
+      plugin,
+      version: _package.version,
+      resolveFrom: (0, _projectPath.toProjectPathUnsafe)(options.projectRoot)
+    };
+  }
   let resolveFrom = configPath;
 
   // Config packages can reference plugins, but cannot contain other plugins within them.
@@ -62,10 +76,9 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
       }
     });
   }
-  let resolved, pkg;
+  let pkg;
   try {
     ({
-      resolved,
       pkg
     } = await options.packageManager.resolve(pluginName, resolveFrom, {
       shouldAutoInstall: options.shouldAutoInstall
@@ -93,9 +106,6 @@ async function loadPlugin(pluginName, configPath, keyPath, options) {
       }
     });
   }
-
-  // Remove plugin version compatiblility validation in canary builds as they don't use semver
-
   let plugin = await options.packageManager.require(pluginName, resolveFrom, {
     shouldAutoInstall: options.shouldAutoInstall
   });

package/lib/public/BundleGraph.js

@@ -262,12 +262,13 @@ class BundleGraph {
         ifFalseBundles.push(...depToBundles(cond.ifFalseDependency));
       }
       for (let bundle of bundles) {
-        const conditions = bundleConditions.get(bundle) ?? new Map();
+        const conditions = bundleConditions.get(bundle.id) ?? new Map();
         conditions.set(cond.key, {
+          bundle,
           ifTrueBundles,
           ifFalseBundles
         });
-        bundleConditions.set(bundle, conditions);
+        bundleConditions.set(bundle.id, conditions);
       }
     }
     return bundleConditions;

package/lib/requests/AtlaspackConfigRequest.js

@@ -40,7 +40,7 @@ function _diagnostic() {
   return data;
 }
 function _json() {
-  const data = require("json5");
+  const data = _interopRequireDefault(require("json5"));
   _json = function () {
     return data;
   };
@@ -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,
@@ -179,7 +189,7 @@ function create(config, options) {
 async function parseAndProcessConfig(configPath, contents, options) {
   let config;
   try {
-    config = (0, _json().parse)(contents);
+    config = _json().default.parse(contents);
   } catch (e) {
     let pos = {
       line: e.lineNumber,
@@ -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/rustWorkerThreadDylibHack.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadRustWorkerThreadDylibHack = loadRustWorkerThreadDylibHack;
+/**
+ * This is a workaround for https://github.com/rust-lang/rust/issues/91979
+ * when running atlaspack with parcel bindings, it is possible that the parcel
+ * dylib will be loaded from a node worker thread, which causes a crash on exit.
+ *
+ * This is a workaround to ensure that the parcel dylib is loaded in the main
+ * thread, which fixes the crash.
+ */
+function loadRustWorkerThreadDylibHack() {
+  try {
+    // $FlowFixMe
+    require('@parcel/rust'); // eslint-disable-line
+  } catch (err) {
+    /* ignore */
+  }
+}

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.9+6d1d32abe",
+  "version": "2.14.1-dev.91+08020e0e1",
   "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.9+6d1d32abe",
-    "@atlaspack/cache": "2.13.3-dev.9+6d1d32abe",
-    "@atlaspack/diagnostic": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/events": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/feature-flags": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/fs": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/graph": "3.4.1-dev.9+6d1d32abe",
-    "@atlaspack/logger": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/package-manager": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/plugin": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/profiler": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/rust": "3.0.1-dev.9+6d1d32abe",
-    "@atlaspack/types": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/utils": "2.14.1-dev.9+6d1d32abe",
-    "@atlaspack/workers": "2.14.1-dev.9+6d1d32abe",
+    "@atlaspack/build-cache": "2.13.3-dev.91+08020e0e1",
+    "@atlaspack/cache": "2.13.3-dev.91+08020e0e1",
+    "@atlaspack/diagnostic": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/events": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/feature-flags": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/fs": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/graph": "3.4.1-dev.91+08020e0e1",
+    "@atlaspack/logger": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/package-manager": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/plugin": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/profiler": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/rust": "3.0.1-dev.91+08020e0e1",
+    "@atlaspack/types": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/utils": "2.14.1-dev.91+08020e0e1",
+    "@atlaspack/workers": "2.14.1-dev.91+08020e0e1",
     "@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": "6d1d32abed2fbfdf4c318f311a0ac3aea9210e4a"
+  "gitHead": "08020e0e18819f3e15e74726f9ffa697892f7bfa"
 }

package/src/Atlaspack.js

@@ -58,17 +58,25 @@ import {
   fromProjectPathRelative,
 } from './projectPath';
 import {tracer} from '@atlaspack/profiler';
-import {setFeatureFlags, DEFAULT_FEATURE_FLAGS} from '@atlaspack/feature-flags';
+import {
+  getFeatureFlag,
+  setFeatureFlags,
+  DEFAULT_FEATURE_FLAGS,
+} from '@atlaspack/feature-flags';
 import {AtlaspackV3, FileSystemV3} from './atlaspack-v3';
 import createAssetGraphRequestJS from './requests/AssetGraphRequest';
 import {createAssetGraphRequestRust} from './requests/AssetGraphRequestRust';
 import type {AssetGraphRequestResult} from './requests/AssetGraphRequest';
+import {loadRustWorkerThreadDylibHack} from './rustWorkerThreadDylibHack';
 
 registerCoreWithSerializer();
 
 export const INTERNAL_TRANSFORM: symbol = Symbol('internal_transform');
 export const INTERNAL_RESOLVE: symbol = Symbol('internal_resolve');
-export const WORKER_PATH: string = path.join(__dirname, 'worker.js');
+export const WORKER_PATH: string = path.join(
+  /*#__ATLASPACK_IGNORE__*/ __dirname,
+  'worker.js',
+);
 
 export default class Atlaspack {
   #requestTracker /*: RequestTracker*/;
@@ -117,6 +125,10 @@ export default class Atlaspack {
     };
     setFeatureFlags(featureFlags);
 
+    if (getFeatureFlag('enableRustWorkerThreadDylibHack')) {
+      loadRustWorkerThreadDylibHack();
+    }
+
     await initSourcemaps;
     await initRust?.();
 

package/src/BundleGraph.js

@@ -1315,7 +1315,14 @@ export default class BundleGraph {
     }
 
     let dependencies = this._graph
-      .getNodeIdsConnectedTo(assetNodeId)
+      .getNodeIdsConnectedTo(
+        assetNodeId,
+        // TODO: This seems like bug with library builds when assets are present
+        // in other files. Guarding the fix for now exclusively for super builds
+        process.env.ATLASPACK_SUPER_BUILD === 'true'
+          ? ALL_EDGE_TYPES
+          : undefined,
+      )
       .map((id) => nullthrows(this._graph.getNode(id)))
       .filter((node) => node.type === 'dependency')
       .map((node) => {

package/src/index.js

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

package/src/internal-plugins.js

@@ -0,0 +1,4 @@
+// @flow
+// This file is overridden in super package builds
+// $FlowFixMe
+export default {};

package/src/isSuperPackage.js

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

package/src/loadAtlaspackPlugin.js

@@ -3,16 +3,19 @@ import type {FilePath, PackageName, Semver} from '@atlaspack/types';
 import type {AtlaspackOptions} from './types';
 
 import path from 'path';
-import semver from 'semver';
-import logger from '@atlaspack/logger';
 import nullthrows from 'nullthrows';
 import ThrowableDiagnostic, {
   generateJSONCodeHighlights,
   md,
 } from '@atlaspack/diagnostic';
-import {findAlternativeNodeModules, resolveConfig} from '@atlaspack/utils';
-import {type ProjectPath, toProjectPath} from './projectPath';
 import {version as ATLASPACK_VERSION} from '../package.json';
+import atlaspackInternalPlugins from './internal-plugins';
+import {findAlternativeNodeModules} from '@atlaspack/utils';
+import {
+  type ProjectPath,
+  toProjectPath,
+  toProjectPathUnsafe,
+} from './projectPath';
 
 const NODE_MODULES = `${path.sep}node_modules${path.sep}`;
 const CONFIG = Symbol.for('parcel-plugin-config');
@@ -27,6 +30,22 @@ export default async function loadPlugin<T>(
   version: Semver,
   resolveFrom: ProjectPath,
 |}> {
+  if (atlaspackInternalPlugins && atlaspackInternalPlugins[pluginName]) {
+    let plugin = atlaspackInternalPlugins[pluginName]();
+    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({ ... })".`,
+      );
+    }
+    return {
+      plugin,
+      version: ATLASPACK_VERSION,
+      resolveFrom: toProjectPathUnsafe(options.projectRoot),
+    };
+  }
+
   let resolveFrom = configPath;
 
   // Config packages can reference plugins, but cannot contain other plugins within them.
@@ -56,13 +75,11 @@ export default async function loadPlugin<T>(
     });
   }
 
-  let resolved, pkg;
+  let pkg;
   try {
-    ({resolved, pkg} = await options.packageManager.resolve(
-      pluginName,
-      resolveFrom,
-      {shouldAutoInstall: options.shouldAutoInstall},
-    ));
+    ({pkg} = await options.packageManager.resolve(pluginName, resolveFrom, {
+      shouldAutoInstall: options.shouldAutoInstall,
+    }));
   } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND') {
       throw err;
@@ -102,61 +119,6 @@ export default async function loadPlugin<T>(
     });
   }
 
-  // Remove plugin version compatiblility validation in canary builds as they don't use semver
-  if (!process.env.SKIP_PLUGIN_COMPATIBILITY_CHECK) {
-    if (!pluginName.startsWith('.')) {
-      // Validate the plugin engines field
-      let key = 'atlaspack';
-      let atlaspackVersionRange;
-      if (pkg?.engines?.atlaspack) {
-        atlaspackVersionRange = pkg.engines.atlaspack;
-      } else if (pkg?.engines?.parcel) {
-        key = 'parcel';
-        atlaspackVersionRange = pkg.engines.parcel;
-      }
-
-      if (!atlaspackVersionRange) {
-        logger.warn({
-          origin: '@atlaspack/core',
-          message: `The plugin "${pluginName}" needs to specify a \`package.json#engines.atlaspack\` field with the supported Atlaspack version range.`,
-        });
-      }
-
-      if (
-        atlaspackVersionRange &&
-        !semver.satisfies(ATLASPACK_VERSION, atlaspackVersionRange)
-      ) {
-        let pkgFile = nullthrows(
-          await resolveConfig(
-            options.inputFS,
-            resolved,
-            ['package.json'],
-            options.projectRoot,
-          ),
-        );
-        let pkgContents = await options.inputFS.readFile(pkgFile, 'utf8');
-        throw new ThrowableDiagnostic({
-          diagnostic: {
-            message: md`The plugin "${pluginName}" is not compatible with the current version of Atlaspack. Requires "${atlaspackVersionRange}" but the current version is "${ATLASPACK_VERSION}".`,
-            origin: '@atlaspack/core',
-            codeFrames: [
-              {
-                filePath: pkgFile,
-                language: 'json5',
-                code: pkgContents,
-                codeHighlights: generateJSONCodeHighlights(pkgContents, [
-                  {
-                    key: `/engines/${key}`,
-                  },
-                ]),
-              },
-            ],
-          },
-        });
-      }
-    }
-  }
-
   let plugin = await options.packageManager.require(pluginName, resolveFrom, {
     shouldAutoInstall: options.shouldAutoInstall,
   });

package/src/public/BundleGraph.js

@@ -444,10 +444,11 @@ export default class BundleGraph<TBundle: IBundle>
   // be used by a webserver to understand which conditions are used by which bundles,
   // and which bundles those conditions require depending on what they evaluate to.
   getConditionalBundleMapping(): Map<
-    TBundle,
+    string,
     Map<
       string,
       {|
+        bundle: TBundle,
         ifTrueBundles: Array<TBundle>,
         ifFalseBundles: Array<TBundle>,
       |},
@@ -486,14 +487,15 @@ export default class BundleGraph<TBundle: IBundle>
       }
 
       for (let bundle of bundles) {
-        const conditions = bundleConditions.get(bundle) ?? new Map();
+        const conditions = bundleConditions.get(bundle.id) ?? new Map();
 
         conditions.set(cond.key, {
+          bundle,
           ifTrueBundles,
           ifFalseBundles,
         });
 
-        bundleConditions.set(bundle, conditions);
+        bundleConditions.set(bundle.id, conditions);
       }
     }
 

package/src/requests/AtlaspackConfigRequest.js

@@ -30,15 +30,17 @@ import ThrowableDiagnostic, {
   md,
   errorToDiagnostic,
 } from '@atlaspack/diagnostic';
-import {parse} from 'json5';
+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 = [
@@ -216,7 +243,7 @@ export async function parseAndProcessConfig(
 ): Promise<AtlaspackConfigChain> {
   let config: RawAtlaspackConfig;
   try {
-    config = parse(contents);
+    config = json5.parse(contents);
   } catch (e) {
     let pos = {
       line: e.lineNumber,
@@ -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/rustWorkerThreadDylibHack.js

@@ -0,0 +1,18 @@
+// @flow strict-local
+
+/**
+ * This is a workaround for https://github.com/rust-lang/rust/issues/91979
+ * when running atlaspack with parcel bindings, it is possible that the parcel
+ * dylib will be loaded from a node worker thread, which causes a crash on exit.
+ *
+ * This is a workaround to ensure that the parcel dylib is loaded in the main
+ * thread, which fixes the crash.
+ */
+export function loadRustWorkerThreadDylibHack() {
+  try {
+    // $FlowFixMe
+    require('@parcel/rust'); // eslint-disable-line
+  } catch (err) {
+    /* ignore */
+  }
+}

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();
 

package/test/AtlaspackConfig.test.js

@@ -3,10 +3,6 @@
 import assert from 'assert';
 import path from 'path';
 
-import logger from '@atlaspack/logger';
-import {inputFS} from '@atlaspack/test-utils';
-import sinon from 'sinon';
-
 import {AtlaspackConfig} from '../src/AtlaspackConfig';
 import {toProjectPath} from '../src/projectPath';
 import {parseAndProcessConfig} from '../src/requests/AtlaspackConfigRequest';
@@ -127,167 +123,6 @@ describe('AtlaspackConfig', () => {
   });
 
   describe('loadPlugin', () => {
-    it('should warn if a plugin needs to specify an engines.atlaspack field in package.json', async () => {
-      let projectRoot = path.join(__dirname, 'fixtures', 'plugins');
-      let configFilePath = toProjectPath(
-        projectRoot,
-        path.join(projectRoot, '.parcelrc'),
-      );
-
-      let config = new AtlaspackConfig(
-        {
-          filePath: configFilePath,
-          bundler: undefined,
-          transformers: {
-            '*.js': [
-              {
-                packageName: 'atlaspack-transformer-no-engines',
-                resolveFrom: configFilePath,
-                keyPath: '/transformers/*.js/0',
-              },
-            ],
-          },
-        },
-        {...DEFAULT_OPTIONS, projectRoot},
-      );
-
-      let warnStub = sinon.stub(logger, 'warn');
-      let {plugin} = await config.loadPlugin({
-        packageName: 'atlaspack-transformer-no-engines',
-        resolveFrom: configFilePath,
-        keyPath: '/transformers/*.js/0',
-      });
-
-      assert.equal(typeof plugin?.transform, 'function');
-      assert(warnStub.calledOnce);
-      assert.deepEqual(warnStub.getCall(0).args[0], {
-        origin: '@atlaspack/core',
-        message:
-          'The plugin "atlaspack-transformer-no-engines" needs to specify a `package.json#engines.atlaspack` field with the supported Atlaspack version range.',
-      });
-      warnStub.restore();
-    });
-
-    it('should error if a plugin specifies an invalid engines.atlaspack field in package.json', async () => {
-      let projectRoot = path.join(__dirname, 'fixtures', 'plugins');
-      let configFilePath = toProjectPath(
-        projectRoot,
-        path.join(projectRoot, '.parcelrc'),
-      );
-
-      let config = new AtlaspackConfig(
-        {
-          filePath: configFilePath,
-          bundler: undefined,
-          transformers: {},
-        },
-        {...DEFAULT_OPTIONS, projectRoot},
-      );
-
-      // $FlowFixMe[untyped-import]
-      let atlaspackVersion = require('../package.json').version;
-      let pkgJSON = path.join(
-        projectRoot,
-        'node_modules',
-        'atlaspack-transformer-bad-engines',
-        'package.json',
-      );
-      let code = inputFS.readFileSync(pkgJSON, 'utf8');
-
-      // $FlowFixMe
-      await assert.rejects(
-        () =>
-          config.loadPlugin({
-            packageName: 'atlaspack-transformer-bad-engines',
-            resolveFrom: configFilePath,
-            keyPath: '/transformers/*.js/0',
-          }),
-        {
-          name: 'Error',
-          diagnostics: [
-            {
-              message: `The plugin "atlaspack-transformer-bad-engines" is not compatible with the current version of Atlaspack. Requires "1.x" but the current version is "${atlaspackVersion}".`,
-              origin: '@atlaspack/core',
-              codeFrames: [
-                {
-                  filePath: pkgJSON,
-                  language: 'json5',
-                  code,
-                  codeHighlights: [
-                    {
-                      start: {line: 5, column: 5},
-                      end: {line: 5, column: 22},
-                      message: undefined,
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      );
-    });
-
-    it('should error if a plugin specifies an invalid engines.parcel field in package.json', async () => {
-      let projectRoot = path.join(__dirname, 'fixtures', 'plugins');
-      let configFilePath = toProjectPath(
-        projectRoot,
-        path.join(projectRoot, '.parcelrc'),
-      );
-
-      let config = new AtlaspackConfig(
-        {
-          filePath: configFilePath,
-          bundler: undefined,
-          transformers: {},
-        },
-        {...DEFAULT_OPTIONS, projectRoot},
-      );
-
-      // $FlowFixMe[untyped-import]
-      let atlaspackVersion = require('../package.json').version;
-      let pkgJSON = path.join(
-        projectRoot,
-        'node_modules',
-        'atlaspack-transformer-bad-parcel-engines',
-        'package.json',
-      );
-      let code = inputFS.readFileSync(pkgJSON, 'utf8');
-
-      // $FlowFixMe
-      await assert.rejects(
-        () =>
-          config.loadPlugin({
-            packageName: 'atlaspack-transformer-bad-parcel-engines',
-            resolveFrom: configFilePath,
-            keyPath: '/transformers/*.js/0',
-          }),
-        {
-          name: 'Error',
-          diagnostics: [
-            {
-              message: `The plugin "atlaspack-transformer-bad-parcel-engines" is not compatible with the current version of Atlaspack. Requires "1.x" but the current version is "${atlaspackVersion}".`,
-              origin: '@atlaspack/core',
-              codeFrames: [
-                {
-                  filePath: pkgJSON,
-                  language: 'json5',
-                  code,
-                  codeHighlights: [
-                    {
-                      start: {line: 5, column: 5},
-                      end: {line: 5, column: 19},
-                      message: undefined,
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        },
-      );
-    });
-
     it('should error with a codeframe if a plugin is not resolved', async () => {
       let configFilePath = path.join(
         __dirname,

package/test/fixtures/plugins/node_modules/atlaspack-transformer-bad-engines/index.js

@@ -1,7 +0,0 @@
-const {Transformer} = require('@atlaspack/plugin');
-
-module.exports = new Transformer({
-  transform(asset) {
-    return [asset];
-  }
-});

package/test/fixtures/plugins/node_modules/atlaspack-transformer-bad-engines/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "atlaspack-transformer-bad-engines",
-  "version": "1.0.0",
-  "engines": {
-    "atlaspack": "1.x"
-  }
-}

package/test/fixtures/plugins/node_modules/atlaspack-transformer-bad-parcel-engines/index.js

@@ -1,7 +0,0 @@
-const {Transformer} = require('@atlaspack/plugin');
-
-module.exports = new Transformer({
-  transform(asset) {
-    return [asset];
-  }
-});

package/test/fixtures/plugins/node_modules/atlaspack-transformer-bad-parcel-engines/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "atlaspack-transformer-bad-parcel-engines",
-  "version": "1.0.0",
-  "engines": {
-    "parcel": "1.x"
-  }
-}

package/test/fixtures/plugins/node_modules/atlaspack-transformer-no-engines/index.js

@@ -1,7 +0,0 @@
-const {Transformer} = require('@atlaspack/plugin');
-
-module.exports = new Transformer({
-  transform(asset) {
-    return [asset];
-  }
-});

package/test/fixtures/plugins/node_modules/atlaspack-transformer-no-engines/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "atlaspack-transformer-no-engines",
-  "version": "1.0.0"
-}