@atlaspack/core 2.16.2-dev.72 → 2.16.2-dev.93

package/src/loadAtlaspackPlugin.js

@@ -8,14 +8,8 @@ import ThrowableDiagnostic, {
   generateJSONCodeHighlights,
   md,
 } from '@atlaspack/diagnostic';
-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';
+import {type ProjectPath, toProjectPath} from './projectPath';
 
 const NODE_MODULES = `${path.sep}node_modules${path.sep}`;
 const CONFIG = Symbol.for('parcel-plugin-config');
@@ -30,22 +24,6 @@ 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.

package/src/public/Config.js

@@ -20,7 +20,6 @@ import {
 } from '@atlaspack/utils';
 import Environment from './Environment';
 import {fromProjectPath, toProjectPath} from '../projectPath';
-import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {fromEnvironmentId} from '../EnvironmentManager';
 
 const internalConfigToConfig: DefaultWeakMap<
@@ -362,7 +361,7 @@ export default class PublicConfig implements IConfig {
     }
 
     let pkgConfig = await this.getConfig<PackageJSON>(['package.json'], {
-      readTracking: getFeatureFlag('granularTsConfigInvalidation'),
+      readTracking: true,
     });
     if (!pkgConfig) {
       return null;

package/src/public/PluginOptions.js

@@ -47,10 +47,6 @@ export default class PluginOptions implements IPluginOptions {
     return this.#options.parcelVersion;
   }
 
-  get isAtlaspackSuper(): boolean {
-    return Boolean(this.#options.isAtlaspackSuper);
-  }
-
   get hmrOptions(): ?HMROptions {
     return this.#options.hmrOptions;
   }

package/src/requests/AtlaspackConfigRequest.js

@@ -30,17 +30,15 @@ import ThrowableDiagnostic, {
   md,
   errorToDiagnostic,
 } from '@atlaspack/diagnostic';
-import json5 from 'json5';
+import {parse} 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, ...};
 
@@ -161,61 +159,35 @@ export async function resolveAtlaspackConfig(
         );
 
   let usedDefault = false;
-  let config, extendedFiles;
-
-  if (
-    configPath == null &&
-    options.defaultConfig != null &&
-    isSuperPackage() &&
-    options.defaultConfig.endsWith('.js')
-  ) {
+  if (configPath == null && options.defaultConfig != null) {
     usedDefault = true;
-    // Load the super package default config
-    let result: AtlaspackConfigChain = await processConfigChain(
-      atlaspackInternalPlugins['@atlaspack/config-default'](),
-      // $FlowFixMe
-      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;
-    }
+    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 result: AtlaspackConfigChain = await parseAndProcessConfig(
-      configPath,
-      contents,
-      options,
-    );
-    config = result.config;
-    extendedFiles = result.extendedFiles;
+  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);
+
   if (options.additionalReporters.length > 0) {
     config.reporters = [
       ...options.additionalReporters.map(({packageName, resolveFrom}) => ({
@@ -244,7 +216,7 @@ export async function parseAndProcessConfig(
 ): Promise<AtlaspackConfigChain> {
   let config: RawAtlaspackConfig;
   try {
-    config = json5.parse(contents);
+    config = parse(contents);
   } catch (e) {
     let pos = {
       line: e.lineNumber,
@@ -474,29 +446,11 @@ export async function processConfigChain(
           let key = Array.isArray(configFile.extends)
             ? `/extends/${i}`
             : '/extends';
-
-          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;
-          }
+          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);
           extStartConfig = extStartConfig
             ? mergeConfigs(extStartConfig, nextConfig)
             : nextConfig;

package/src/requests/DevDepRequest.js

@@ -1,4 +1,5 @@
-// @flow
+// @flow strict-local
+
 import type {
   DependencySpecifier,
   SemverRange,
@@ -24,6 +25,7 @@ import {
   toProjectPath,
 } from '../projectPath';
 import {requestTypes} from '../RequestTracker';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 // A cache of dev dep requests keyed by invalidations.
 // If the package manager returns the same invalidation object, then
@@ -116,17 +118,47 @@ type DevDepRequests = {|
 export async function getDevDepRequests<TResult: RequestResult>(
   api: RunAPI<TResult>,
 ): Promise<DevDepRequests> {
-  let previousDevDepRequests: Map<string, DevDepRequestResult> = new Map(
-    await Promise.all(
-      api
-        .getSubRequests()
-        .filter((req) => req.requestType === requestTypes.dev_dep_request)
-        .map(async (req) => [
-          req.id,
-          nullthrows(await api.getRequestResult<DevDepRequestResult>(req.id)),
-        ]),
-    ),
-  );
+  async function getPreviousDevDepRequests() {
+    if (getFeatureFlag('fixBuildAbortCorruption')) {
+      const allDevDepRequests = await Promise.all(
+        api
+          .getSubRequests()
+          .filter((req) => req.requestType === requestTypes.dev_dep_request)
+          .map(
+            async (
+              req,
+            ): Promise<[string, DevDepRequestResult | null | void]> => [
+              req.id,
+              await api.getRequestResult<DevDepRequestResult>(req.id),
+            ],
+          ),
+      );
+      const nonNullDevDepRequests = [];
+      for (const [id, result] of allDevDepRequests) {
+        if (result != null) {
+          nonNullDevDepRequests.push([id, result]);
+        }
+      }
+
+      return new Map(nonNullDevDepRequests);
+    } else {
+      return new Map(
+        await Promise.all(
+          api
+            .getSubRequests()
+            .filter((req) => req.requestType === requestTypes.dev_dep_request)
+            .map(async (req) => [
+              req.id,
+              nullthrows(
+                await api.getRequestResult<DevDepRequestResult>(req.id),
+              ),
+            ]),
+        ),
+      );
+    }
+  }
+
+  const previousDevDepRequests = await getPreviousDevDepRequests();
 
   return {
     devDeps: new Map(

package/src/requests/PathRequest.js

@@ -24,6 +24,7 @@ import ThrowableDiagnostic, {
   md,
 } from '@atlaspack/diagnostic';
 import {PluginLogger} from '@atlaspack/logger';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import nullthrows from 'nullthrows';
 import path from 'path';
 import {normalizePath} from '@atlaspack/utils';
@@ -320,6 +321,9 @@ export class ResolverRunner {
 
           if (result.priority != null) {
             dependency.priority = Priority[result.priority];
+            if (getFeatureFlag('hmrImprovements')) {
+              dependency.resolverPriority = dependency.priority;
+            }
           }
 
           if (result.invalidateOnEnvChange) {

package/src/resolveOptions.js

@@ -25,7 +25,6 @@ import {
 import loadDotEnv from './loadDotEnv';
 import {toProjectPath} from './projectPath';
 import {getResolveFrom} from './requests/AtlaspackConfigRequest';
-import {isSuperPackage} from './isSuperPackage';
 
 import {DEFAULT_FEATURE_FLAGS} from '@atlaspack/feature-flags';
 import {ATLASPACK_VERSION} from './constants';
@@ -278,7 +277,6 @@ export default async function resolveOptions(
     // feature-flags
     featureFlags: {...DEFAULT_FEATURE_FLAGS, ...initialOptions?.featureFlags},
     parcelVersion: ATLASPACK_VERSION,
-    isAtlaspackSuper: isSuperPackage(),
   };
 }
 

package/src/types.js

@@ -145,6 +145,7 @@ export type Dependency = {|
   customPackageConditions?: Array<string>,
   meta: Meta,
   resolverMeta?: ?Meta,
+  resolverPriority?: $Values<typeof Priority>,
   target: ?Target,
   sourceAssetId: ?string,
   sourcePath: ?ProjectPath,
@@ -285,7 +286,6 @@ export type AtlaspackOptions = {|
   defaultConfig?: DependencySpecifier,
   env: EnvMap,
   parcelVersion: string,
-  isAtlaspackSuper?: boolean,
   targets: ?(Array<string> | {+[string]: TargetDescriptor, ...}),
   shouldDisableCache: boolean,
   cacheDir: FilePath,

package/src/worker.js

@@ -32,15 +32,14 @@ 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/lib/atlaspack-v3/worker/napi-worker.js

@@ -1,3 +0,0 @@
-"use strict";
-
-require('./worker');

package/lib/internal-plugins.js

@@ -1,9 +0,0 @@
-"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

@@ -1,23 +0,0 @@
-"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(
-  // $FlowFixMe
-  fs.readFileSync(findAncestorFile(['package.json'], dirname, '/'), 'utf8'));
-  return packageJson.name === 'atlaspack';
-}
-let result;
-module.exports.isSuperPackage = () => {
-  if (result == null) {
-    result = isSuperPackage();
-  }
-  return result;
-};

package/src/internal-plugins.js

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

package/src/isSuperPackage.js

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