@atlaspack/core 2.16.2-canary.21 → 2.16.2-canary.211

package/lib/requests/DevDepRequest.js

@@ -89,14 +89,32 @@ async function createDevDependency(opts, requestDevDeps, options) {
   return devDepRequest;
 }
 async function getDevDepRequests(api) {
-  let previousDevDepRequests = new Map(await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, (0, _nullthrows().default)(await api.getRequestResult(req.id))])));
+  async function getPreviousDevDepRequests() {
+    const allDevDepRequests = await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, await api.getRequestResult(req.id)]));
+    const nonNullDevDepRequests = [];
+    for (const [id, result] of allDevDepRequests) {
+      if (result != null) {
+        nonNullDevDepRequests.push([id, result]);
+      }
+    }
+
+    // @ts-expect-error TS2769
+    return new Map(nonNullDevDepRequests);
+  }
+  const previousDevDepRequests = await getPreviousDevDepRequests();
   return {
-    devDeps: new Map([...previousDevDepRequests.entries()].filter(([id]) => api.canSkipSubrequest(id)).map(([, req]) => [`${req.specifier}:${(0, _projectPath.fromProjectPathRelative)(req.resolveFrom)}`, req.hash])),
-    invalidDevDeps: await Promise.all([...previousDevDepRequests.entries()].filter(([id]) => !api.canSkipSubrequest(id)).flatMap(([, req]) => {
+    devDeps: new Map([...previousDevDepRequests.entries()]
+    // @ts-expect-error TS2769
+    .filter(([id]) => api.canSkipSubrequest(id)).map(([, req]) => [`${req.specifier}:${(0, _projectPath.fromProjectPathRelative)(req.resolveFrom)}`, req.hash])),
+    invalidDevDeps: await Promise.all([...previousDevDepRequests.entries()]
+    // @ts-expect-error TS2769
+    .filter(([id]) => !api.canSkipSubrequest(id)).flatMap(([, req]) => {
       return [{
         specifier: req.specifier,
         resolveFrom: req.resolveFrom
-      }, ...(req.additionalInvalidations ?? []).map(i => ({
+      },
+      // @ts-expect-error TS7006
+      ...(req.additionalInvalidations ?? []).map(i => ({
         specifier: i.specifier,
         resolveFrom: i.resolveFrom
       }))];
@@ -122,7 +140,9 @@ function invalidateDevDeps(invalidDevDeps, options, config) {
 }
 const devDepRequests = (0, _buildCache().createBuildCache)();
 function resolveDevDepRequestRef(devDepRequestRef) {
-  const devDepRequest = devDepRequestRef.type === 'ref' ? devDepRequests.get(devDepRequestRef.hash) : devDepRequestRef;
+  const devDepRequest =
+  // @ts-expect-error TS2339
+  devDepRequestRef.type === 'ref' ? devDepRequests.get(devDepRequestRef.hash) : devDepRequestRef;
   if (devDepRequest == null) {
     throw new Error(`Worker send back a reference to a missing dev dep request.
 
@@ -132,15 +152,21 @@ ${process.env.NODE_ENV === 'test' ? `If this is a unit test, call atlaspack.clea
 
 This is a bug in Atlaspack.`);
   }
+
+  // @ts-expect-error TS2339
   if (devDepRequestRef.type !== 'ref') {
+    // @ts-expect-error TS2345
     devDepRequests.set(devDepRequest.hash, devDepRequest);
   }
+
+  // @ts-expect-error TS2322
   return devDepRequest;
 }
 async function runDevDepRequest(api, devDepRequestRef) {
   await api.runRequest({
     id: 'dev_dep_request:' + devDepRequestRef.specifier + ':' + devDepRequestRef.hash,
     type: _RequestTracker.requestTypes.dev_dep_request,
+    // @ts-expect-error TS2322
     run: ({
       api
     }) => {

package/lib/requests/EntryRequest.js

@@ -47,6 +47,8 @@ function createEntryRequest(input) {
     input
   };
 }
+
+// @ts-expect-error TS7031
 async function run({
   input,
   api,

package/lib/requests/PackageRequest.js

@@ -24,6 +24,8 @@ function createPackageRequest(input) {
     input
   };
 }
+
+// @ts-expect-error TS7031
 async function run({
   input,
   api,
@@ -43,7 +45,9 @@ async function run({
   } = await (0, _DevDepRequest.getDevDepRequests)(api);
   let {
     cachePath
-  } = (0, _nullthrows().default)(await api.runRequest((0, _AtlaspackConfigRequest.default)()));
+  } = (0, _nullthrows().default)(
+  // @ts-expect-error TS2347
+  await api.runRequest((0, _AtlaspackConfigRequest.default)()));
   let {
     devDepRequests,
     configRequests,
@@ -77,11 +81,12 @@ async function run({
         api.invalidateOnOptionChange(invalidation.key);
         break;
       default:
+        // @ts-expect-error TS2339
         throw new Error(`Unknown invalidation type: ${invalidation.type}`);
     }
   }
 
-  // $FlowFixMe[cannot-write] time is marked read-only, but this is the exception
+  // @ts-expect-error TS2540
   bundleInfo.time = Date.now() - start;
   api.storeResult(bundleInfo);
   return bundleInfo;

package/lib/requests/PathRequest.js

@@ -26,6 +26,13 @@ function _logger() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -50,7 +57,6 @@ function _utils() {
 var _ReporterRunner = require("../ReporterRunner");
 var _Dependency = require("../public/Dependency");
 var _PluginOptions = _interopRequireDefault(require("../public/PluginOptions"));
-var _AtlaspackConfig = require("../AtlaspackConfig");
 var _AtlaspackConfigRequest = _interopRequireWildcard(require("./AtlaspackConfigRequest"));
 var _utils2 = require("../utils");
 var _projectPath = require("../projectPath");
@@ -78,12 +84,16 @@ function createPathRequest(input) {
     input
   };
 }
+
+// @ts-expect-error TS7031
 async function run({
   input,
   api,
   options
 }) {
-  let configResult = (0, _nullthrows().default)(await api.runRequest((0, _AtlaspackConfigRequest.default)()));
+  let configResult = (0, _nullthrows().default)(
+  // @ts-expect-error TS2347
+  await api.runRequest((0, _AtlaspackConfigRequest.default)()));
   let config = (0, _AtlaspackConfigRequest.getCachedAtlaspackConfig)(configResult, options);
   let {
     devDeps,
@@ -127,7 +137,7 @@ async function run({
     let err = new (_diagnostic().default)({
       diagnostic: result.diagnostics
     });
-    // $FlowFixMe[prop-missing]
+    // @ts-expect-error TS2339
     err.code = 'MODULE_NOT_FOUND';
     throw err;
   }
@@ -170,26 +180,34 @@ class ResolverRunner {
           plugin: plugin.name,
           searchPath: (0, _projectPath.toProjectPathUnsafe)('index')
         });
+
+        // @ts-expect-error TS2345
         await (0, _ConfigRequest.loadPluginConfig)(plugin, config, this.options);
         configCache.set(plugin.name, config);
+        // @ts-expect-error TS2345
         this.configs.set(plugin.name, config);
       }
       if (config) {
+        // @ts-expect-error TS2339
         for (let devDep of config.devDeps) {
           let devDepRequest = await (0, _DevDepRequest.createDevDependency)(devDep, this.previousDevDeps, this.options);
           this.runDevDepRequest(devDepRequest);
         }
+
+        // @ts-expect-error TS2345
         this.configs.set(plugin.name, config);
       }
     }
   }
   runDevDepRequest(devDepRequest) {
+    // @ts-expect-error TS2339
     if (devDepRequest.type !== 'ref') {
       let {
         specifier,
         resolveFrom
       } = devDepRequest;
       let key = `${specifier}:${(0, _projectPath.fromProjectPathRelative)(resolveFrom)}`;
+      // @ts-expect-error TS2345
       this.devDepRequests.set(key, devDepRequest);
     }
   }
@@ -259,6 +277,9 @@ class ResolverRunner {
           }
           if (result.priority != null) {
             dependency.priority = _types.Priority[result.priority];
+            if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+              dependency.resolverPriority = dependency.priority;
+            }
           }
           if (result.invalidateOnEnvChange) {
             invalidateOnEnvChange.push(...result.invalidateOnEnvChange);

package/lib/requests/TargetRequest.js

@@ -69,10 +69,17 @@ var _Environment2 = require("../public/Environment");
 var _utils2 = require("../utils");
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
+var _EnvironmentManager = require("../EnvironmentManager");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 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; }
-// $FlowFixMe
 const DEFAULT_DIST_DIRNAME = 'dist';
 const JS_RE = /\.[mc]?js$/;
 const JS_EXTENSIONS = ['.js', '.mjs', '.cjs'];
@@ -122,6 +129,33 @@ async function run({
 }) {
   let targetResolver = new TargetResolver(api, (0, _utils2.optionsProxy)(options, api.invalidateOnOptionChange));
   let targets = await targetResolver.resolve((0, _projectPath.fromProjectPath)(options.projectRoot, input.packagePath), input.target);
+
+  // Filter targets based on allowExplicitTargetEntries feature flag
+  if ((0, _featureFlags().getFeatureFlag)('allowExplicitTargetEntries') && options.targets &&
+  // Only explicit targets are allowed (i.e. an object of targets)
+  !Array.isArray(options.targets)) {
+    // Check if ALL targets have sources - only apply new behavior if they do
+    const allTargetsHaveSources = targets.every(t => t.source);
+    if (allTargetsHaveSources) {
+      // Get the current entry file path relative to project root
+      const currentEntryPath = input.filePath;
+
+      // Filter targets to only include those whose source matches the current entry
+      targets = targets.filter(target => {
+        // Handle both string and array sources
+        const sources = Array.isArray(target.source) ? target.source : [target.source];
+
+        // Check if current entry matches any of the target sources
+        return sources.some(source => {
+          const targetSourcePath = (0, _projectPath.toProjectPath)(options.projectRoot, _path().default.resolve((0, _projectPath.fromProjectPath)(options.projectRoot, input.packagePath), (0, _nullthrows().default)(source, 'Source must be not be undefined when specified')));
+          return targetSourcePath === currentEntryPath;
+        });
+      });
+    } else {
+      // If not all targets have sources, fall back to old behavior (skip targets with sources)
+      targets = targets.filter(target => !target.source);
+    }
+  }
   assertTargetsAreNotEntries(targets, input, options);
   let configResult = (0, _nullthrows().default)(await api.runRequest((0, _AtlaspackConfigRequest.default)()));
   let atlaspackConfig = (0, _AtlaspackConfigRequest.getCachedAtlaspackConfig)(configResult, options);
@@ -170,6 +204,7 @@ class TargetResolver {
 
         // If an array of strings is passed, it's a filter on the resolved package
         // targets. Load them, and find the matching targets.
+        // @ts-expect-error TS2322
         targets = optionTargets.map(target => {
           // null means skipped.
           if (!packageTargets.has(target)) {
@@ -221,7 +256,8 @@ class TargetResolver {
               shouldOptimize: this.options.defaultTargetOptions.shouldOptimize && descriptor.optimize !== false,
               shouldScopeHoist: this.options.defaultTargetOptions.shouldScopeHoist && descriptor.scopeHoist !== false,
               sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
-              unstableSingleFileOutput: descriptor.__unstable_singleFileOutput
+              unstableSingleFileOutput: descriptor.__unstable_singleFileOutput,
+              customEnv: descriptor.env
             })
           };
           if (descriptor.distEntry != null) {
@@ -231,7 +267,17 @@ class TargetResolver {
             target.source = descriptor.source;
           }
           return target;
-        }).filter(target => !skipTarget(target.name, exclusiveTarget, target.source));
+        }).filter(target => (0, _featureFlags().getFeatureFlag)('allowExplicitTargetEntries') && this.options.entries.length !== 0 || !skipTarget(target.name, exclusiveTarget, target.source));
+
+        // Apply allowExplicitTargetEntries filtering logic
+        if ((0, _featureFlags().getFeatureFlag)('allowExplicitTargetEntries')) {
+          // Check if ALL targets have sources - only apply new behavior if they do
+          const allTargetsHaveSources = targets.every(t => t.source);
+          if (!allTargetsHaveSources) {
+            // If not all targets have sources, fall back to old behavior (skip targets with sources)
+            targets = targets.filter(target => !target.source);
+          }
+        }
       }
       let serve = this.options.serveOptions;
       if (serve && targets.length > 0) {
@@ -245,7 +291,7 @@ class TargetResolver {
             }
           });
         }
-        if (!_Environment2.BROWSER_ENVS.has(targets[0].env.context)) {
+        if (!_Environment2.BROWSER_ENVS.has((0, _EnvironmentManager.fromEnvironmentId)(targets[0].env).context)) {
           throw new (_diagnostic().default)({
             diagnostic: {
               message: `Only browser targets are supported in serve mode`,
@@ -268,6 +314,7 @@ class TargetResolver {
           env: (0, _Environment.createEnvironment)({
             context: 'browser',
             engines: {
+              // @ts-expect-error TS2322
               browsers: DEFAULT_ENGINES.browsers
             },
             shouldOptimize: this.options.defaultTargetOptions.shouldOptimize,
@@ -277,6 +324,7 @@ class TargetResolver {
           })
         }];
       } else {
+        // @ts-expect-error TS2322
         targets = Array.from(packageTargets.values()).filter(Boolean).filter(descriptor => {
           return descriptor && !skipTarget(descriptor.name, exclusiveTarget, descriptor.source);
         });
@@ -364,6 +412,7 @@ class TargetResolver {
               browsers: browserslistBrowsers
             };
             browsersLoc = {
+              // @ts-expect-error TS2353
               message: `(defined in ${_path().default.relative(process.cwd(), browserslistConfig)})`
             };
           }
@@ -384,8 +433,10 @@ class TargetResolver {
     if (context === 'browser' && pkgEngines.browsers == null) {
       pkgEngines = {
         ...pkgEngines,
+        // @ts-expect-error TS2322
         browsers: (defaultEngines === null || defaultEngines === void 0 ? void 0 : defaultEngines.browsers) ?? DEFAULT_ENGINES.browsers
       };
+      // @ts-expect-error TS2353
       browsersLoc = {
         message: '(default)'
       };
@@ -394,6 +445,7 @@ class TargetResolver {
         ...pkgEngines,
         node: (defaultEngines === null || defaultEngines === void 0 ? void 0 : defaultEngines.node) ?? DEFAULT_ENGINES.node
       };
+      // @ts-expect-error TS2353
       nodeLoc = {
         message: '(default)'
       };
@@ -480,6 +532,7 @@ class TargetResolver {
         _targetDist = pkg[targetName][pkg.name];
         pointer = `/${targetName}/${(0, _diagnostic().encodeJSONKeyComponent)(pkg.name)}`;
       } else {
+        // @ts-expect-error TS7053
         _targetDist = pkg[targetName];
         pointer = `/${targetName}`;
       }
@@ -510,15 +563,16 @@ class TargetResolver {
           targets.set(targetName, null);
           continue;
         }
-        if (distEntry != null && !COMMON_TARGETS[targetName].match.test(distEntry)) {
-          let contents = typeof pkgContents === 'string' ? pkgContents :
-          // $FlowFixMe
-          JSON.stringify(pkgContents, null, '\t');
-          // $FlowFixMe
+        if (distEntry != null &&
+        // @ts-expect-error TS7053
+        !COMMON_TARGETS[targetName].match.test(distEntry)) {
+          let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
           let listFormat = new Intl.ListFormat('en-US', {
             type: 'disjunction'
           });
-          let extensions = listFormat.format(COMMON_TARGETS[targetName].extensions);
+          let extensions = listFormat.format(
+          // @ts-expect-error TS7053
+          COMMON_TARGETS[targetName].extensions);
           let ext = _path().default.extname(distEntry);
           throw new (_diagnostic().default)({
             diagnostic: {
@@ -540,9 +594,7 @@ class TargetResolver {
           });
         }
         if (descriptor.outputFormat === 'global') {
-          let contents = typeof pkgContents === 'string' ? pkgContents :
-          // $FlowFixMe
-          JSON.stringify(pkgContents, null, '\t');
+          let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
           throw new (_diagnostic().default)({
             diagnostic: {
               message: (0, _diagnostic().md)`The "global" output format is not supported in the "${targetName}" target.`,
@@ -561,13 +613,13 @@ class TargetResolver {
             }
           });
         }
-        let [inferredOutputFormat, inferredOutputFormatField] = this.inferOutputFormat(distEntry, descriptor, targetName, pkg, pkgFilePath, pkgContents);
+        let [inferredOutputFormat, inferredOutputFormatField] = this.inferOutputFormat(distEntry, descriptor, targetName,
+        // @ts-expect-error TS2345
+        pkg, pkgFilePath, pkgContents);
         let outputFormat = descriptor.outputFormat ?? this.options.defaultTargetOptions.outputFormat ?? inferredOutputFormat ?? (targetName === 'module' ? 'esmodule' : 'commonjs');
         let isModule = outputFormat === 'esmodule';
         if (targetName === 'main' && outputFormat === 'esmodule' && inferredOutputFormat !== 'esmodule') {
-          let contents = typeof pkgContents === 'string' ? pkgContents :
-          // $FlowFixMe
-          JSON.stringify(pkgContents, null, '\t');
+          let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
           throw new (_diagnostic().default)({
             diagnostic: {
               // prettier-ignore
@@ -593,9 +645,7 @@ class TargetResolver {
           });
         }
         if (descriptor.scopeHoist === false) {
-          let contents = typeof pkgContents === 'string' ? pkgContents :
-          // $FlowFixMe
-          JSON.stringify(pkgContents, null, '\t');
+          let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
           throw new (_diagnostic().default)({
             diagnostic: {
               message: 'Scope hoisting cannot be disabled for library targets.',
@@ -622,6 +672,7 @@ class TargetResolver {
           publicUrl: descriptor.publicUrl ?? this.options.defaultTargetOptions.publicUrl,
           env: (0, _Environment.createEnvironment)({
             engines: descriptor.engines ?? pkgEngines,
+            // @ts-expect-error TS2322
             context,
             includeNodeModules: descriptor.includeNodeModules ?? false,
             outputFormat,
@@ -675,10 +726,13 @@ class TargetResolver {
         });
       }
     }
-    let customTargets = Object.keys(pkgTargets).filter(targetName => !COMMON_TARGETS[targetName]);
+    let customTargets = Object.keys(pkgTargets).filter(
+    // @ts-expect-error TS7053
+    targetName => !COMMON_TARGETS[targetName]);
 
     // Custom targets
     for (let targetName of customTargets) {
+      // @ts-expect-error TS7053
       let distPath = pkg[targetName];
       let distDir;
       let distEntry;
@@ -697,9 +751,7 @@ class TargetResolver {
         };
       } else {
         if (typeof distPath !== 'string') {
-          let contents = typeof pkgContents === 'string' ? pkgContents :
-          // $FlowFixMe
-          JSON.stringify(pkgContents, null, '\t');
+          let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
           throw new (_diagnostic().default)({
             diagnostic: {
               message: (0, _diagnostic().md)`Invalid distPath for target "${targetName}"`,
@@ -734,11 +786,11 @@ class TargetResolver {
           targets.set(targetName, null);
           continue;
         }
-        let [inferredOutputFormat, inferredOutputFormatField] = this.inferOutputFormat(distEntry, descriptor, targetName, pkg, pkgFilePath, pkgContents);
+        let [inferredOutputFormat, inferredOutputFormatField] = this.inferOutputFormat(distEntry, descriptor, targetName,
+        // @ts-expect-error TS2345
+        pkg, pkgFilePath, pkgContents);
         if (descriptor.scopeHoist === false && descriptor.isLibrary) {
-          let contents = typeof pkgContents === 'string' ? pkgContents :
-          // $FlowFixMe
-          JSON.stringify(pkgContents, null, '\t');
+          let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
           throw new (_diagnostic().default)({
             diagnostic: {
               message: 'Scope hoisting cannot be disabled for library targets.',
@@ -838,6 +890,7 @@ class TargetResolver {
         publicUrl: this.options.defaultTargetOptions.publicUrl,
         env: (0, _Environment.createEnvironment)({
           engines: pkgEngines,
+          // @ts-expect-error TS2322
           context,
           outputFormat: this.options.defaultTargetOptions.outputFormat,
           isLibrary: this.options.defaultTargetOptions.isLibrary,
@@ -874,9 +927,7 @@ class TargetResolver {
         break;
     }
     if (descriptor.outputFormat && inferredOutputFormat && descriptor.outputFormat !== inferredOutputFormat) {
-      let contents = typeof pkgContents === 'string' ? pkgContents :
-      // $FlowFixMe
-      JSON.stringify(pkgContents, null, '\t');
+      let contents = typeof pkgContents === 'string' ? pkgContents : JSON.stringify(pkgContents, null, '\t');
       let expectedExtensions;
       switch (descriptor.outputFormat) {
         case 'esmodule':
@@ -889,7 +940,6 @@ class TargetResolver {
           expectedExtensions = ['.js'];
           break;
       }
-      // $FlowFixMe
       let listFormat = new Intl.ListFormat('en-US', {
         type: 'disjunction'
       });
@@ -916,6 +966,8 @@ class TargetResolver {
         }
       });
     }
+
+    // @ts-expect-error TS2322
     return [inferredOutputFormat, inferredOutputFormatField];
   }
 }
@@ -930,7 +982,7 @@ function parseEngines(engines, pkgPath, pkgContents, prependKey, message) {
       filePath: pkgPath,
       prependKey
     }, '@atlaspack/core', message);
-    // $FlowFixMe we just verified this
+    // @ts-expect-error TS2322
     return engines;
   }
 }
@@ -942,7 +994,7 @@ function parseDescriptor(targetName, descriptor, pkgPath, pkgContents) {
     prependKey: `/targets/${targetName}`
   }, '@atlaspack/core', `Invalid target descriptor for target "${targetName}"`);
 
-  // $FlowFixMe we just verified this
+  // @ts-expect-error TS2322
   return descriptor;
 }
 function parsePackageDescriptor(targetName, descriptor, pkgPath, pkgContents) {
@@ -952,7 +1004,7 @@ function parsePackageDescriptor(targetName, descriptor, pkgPath, pkgContents) {
     filePath: pkgPath,
     prependKey: `/targets/${targetName}`
   }, '@atlaspack/core', `Invalid target descriptor for target "${targetName}"`);
-  // $FlowFixMe we just verified this
+  // @ts-expect-error TS2322
   return descriptor;
 }
 function parseCommonTargetDescriptor(targetName, descriptor, pkgPath, pkgContents) {
@@ -963,7 +1015,7 @@ function parseCommonTargetDescriptor(targetName, descriptor, pkgPath, pkgContent
     prependKey: `/targets/${targetName}`
   }, '@atlaspack/core', `Invalid target descriptor for target "${targetName}"`);
 
-  // $FlowFixMe we just verified this
+  // @ts-expect-error TS2322
   return descriptor;
 }
 function assertNoDuplicateTargets(options, targets, pkgFilePath, pkgContents) {
@@ -1012,7 +1064,9 @@ function assertNoDuplicateTargets(options, targets, pkgFilePath, pkgContents) {
     });
   }
 }
-function normalizeSourceMap(options, sourceMap) {
+function normalizeSourceMap(options,
+// @ts-expect-error TS2304
+sourceMap) {
   if (options.defaultTargetOptions.sourceMaps) {
     if (typeof sourceMap === 'boolean') {
       return sourceMap ? {} : undefined;
@@ -1028,6 +1082,7 @@ function assertTargetsAreNotEntries(targets, input, options) {
     if (target.distEntry != null && (0, _projectPath.joinProjectPath)(target.distDir, target.distEntry) === input.filePath) {
       let loc = target.loc;
       let relativeEntry = _path().default.relative(process.cwd(), (0, _projectPath.fromProjectPath)(options.projectRoot, input.filePath));
+      // @ts-expect-error TS2304
       let codeFrames = [];
       if (loc) {
         codeFrames.push({
@@ -1052,7 +1107,9 @@ function assertTargetsAreNotEntries(targets, input, options) {
           origin: '@atlaspack/core',
           message: `Target "${target.name}" is configured to overwrite entry "${relativeEntry}".`,
           codeFrames,
-          hints: [(COMMON_TARGETS[target.name] ? `The "${target.name}" field is an _output_ file path so that your build can be consumed by other tools. ` : '') + `Change the "${target.name}" field to point to an output file rather than your source code.`],
+          hints: [
+          // @ts-expect-error TS7053
+          (COMMON_TARGETS[target.name] ? `The "${target.name}" field is an _output_ file path so that your build can be consumed by other tools. ` : '') + `Change the "${target.name}" field to point to an output file rather than your source code.`],
           documentationURL: 'https://parceljs.org/features/targets/'
         }
       });
@@ -1073,24 +1130,27 @@ async function debugResolvedTargets(input, targets, targetInfo, options) {
 
     // Resolve relevant engines for context.
     let engines;
-    switch (target.env.context) {
+    const env = (0, _EnvironmentManager.fromEnvironmentId)(target.env);
+    switch (env.context) {
       case 'browser':
       case 'web-worker':
       case 'service-worker':
       case 'worklet':
         {
-          let browsers = target.env.engines.browsers;
+          let browsers = env.engines.browsers;
           engines = Array.isArray(browsers) ? browsers.join(', ') : browsers;
           break;
         }
       case 'node':
-        engines = target.env.engines.node;
+        engines = env.engines.node;
         break;
       case 'electron-main':
       case 'electron-renderer':
-        engines = target.env.engines.electron;
+        engines = env.engines.electron;
         break;
     }
+
+    // @ts-expect-error TS2304
     let highlights = [];
     if (input.loc) {
       highlights.push((0, _diagnostic().convertSourceLocationToHighlight)(input.loc, 'entry defined here'));
@@ -1103,6 +1163,7 @@ async function debugResolvedTargets(input, targets, targetInfo, options) {
     // Builds up map of code highlights for each defined/inferred path in the package.json.
     let jsonHighlights = new Map();
     for (let key in info) {
+      // @ts-expect-error TS7053
       let keyInfo = info[key];
       let path = keyInfo.path || keyInfo.inferred;
       if (!path) {
@@ -1124,11 +1185,10 @@ async function debugResolvedTargets(input, targets, targetInfo, options) {
         highlight.defined = (0, _diagnostic().md)`${key} defined here`;
       }
       if (keyInfo.inferred) {
-        highlight.inferred.push((0, _diagnostic().md)`${key} to be ${JSON.stringify(target.env[key])}`);
+        // @ts-expect-error TS2345
+        highlight.inferred.push((0, _diagnostic().md)`${key} to be ${JSON.stringify(env[key])}`);
       }
     }
-
-    // $FlowFixMe
     let listFormat = new Intl.ListFormat('en-US');
 
     // Generate human friendly messages for each field.
@@ -1150,26 +1210,30 @@ async function debugResolvedTargets(input, targets, targetInfo, options) {
 
     // Format includeNodeModules to be human readable.
     let includeNodeModules;
-    if (typeof target.env.includeNodeModules === 'boolean') {
-      includeNodeModules = String(target.env.includeNodeModules);
-    } else if (Array.isArray(target.env.includeNodeModules)) {
-      includeNodeModules = 'only ' + listFormat.format(target.env.includeNodeModules.map(m => JSON.stringify(m)));
-    } else if (target.env.includeNodeModules && typeof target.env.includeNodeModules === 'object') {
-      includeNodeModules = 'all except ' + listFormat.format(Object.entries(target.env.includeNodeModules).filter(([, v]) => v === false).map(([k]) => JSON.stringify(k)));
+    if (typeof env.includeNodeModules === 'boolean') {
+      includeNodeModules = String(env.includeNodeModules);
+    } else if (Array.isArray(env.includeNodeModules)) {
+      includeNodeModules = 'only ' + listFormat.format(env.includeNodeModules.map(m => JSON.stringify(m)));
+    } else if (env.includeNodeModules && typeof env.includeNodeModules === 'object') {
+      includeNodeModules = 'all except ' + listFormat.format(Object.entries(env.includeNodeModules).filter(([, v]) => v === false)
+      // @ts-expect-error TS2345
+      .map(([k]) => JSON.stringify(k)));
     }
-    let format = v => v.message != null ? _diagnostic().md.italic(v.message) : '';
+    let format = v =>
+    // @ts-expect-error TS2339
+    v.message != null ? _diagnostic().md.italic(v.message) : '';
     _logger().default.verbose({
       origin: '@atlaspack/core',
       message: (0, _diagnostic().md)`**Target** "${target.name}"
 
                **Entry**: ${_path().default.relative(process.cwd(), (0, _projectPath.fromProjectPath)(options.projectRoot, input.filePath))}
               **Output**: ${_path().default.relative(process.cwd(), output)}
-              **Format**: ${target.env.outputFormat} ${format(info.outputFormat)}
-             **Context**: ${target.env.context} ${format(info.context)}
+              **Format**: ${env.outputFormat} ${format(info.outputFormat)}
+             **Context**: ${env.context} ${format(info.context)}
              **Engines**: ${engines || ''} ${format(info.engines)}
-        **Library Mode**: ${String(target.env.isLibrary)} ${format(info.isLibrary)}
+        **Library Mode**: ${String(env.isLibrary)} ${format(info.isLibrary)}
 **Include Node Modules**: ${includeNodeModules} ${format(info.includeNodeModules)}
-            **Optimize**: ${String(target.env.shouldOptimize)} ${format(info.shouldOptimize)}`,
+            **Optimize**: ${String(env.shouldOptimize)} ${format(info.shouldOptimize)}`,
       codeFrames: target.loc ? [{
         filePath: targetFilePath,
         codeHighlights: highlights