@atlaspack/core 2.16.2-canary.27 → 2.16.2-canary.270

package/lib/public/Config.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+exports.makeConfigProxy = makeConfigProxy;
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -27,14 +28,80 @@ function _utils() {
 }
 var _Environment = _interopRequireDefault(require("./Environment"));
 var _projectPath = require("../projectPath");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const internalConfigToConfig = new (_utils().DefaultWeakMap)(() => new WeakMap());
-class PublicConfig {
-  #config /*: Config */;
-  #pkg /*: ?PackageJSON */;
-  #pkgFilePath /*: ?FilePath */;
-  #options /*: AtlaspackOptions */;
 
+/**
+ * Implements read tracking over an object.
+ *
+ * Calling this function with a non-trivial object like a class instance will fail to work.
+ *
+ * We track reads to fields that resolve to:
+ *
+ * - primitive values
+ * - arrays
+ *
+ * That is, reading a nested field `a.b.c` will make a single call to `onRead` with the path
+ * `['a', 'b', 'c']`.
+ *
+ * In case the value is null or an array, we will track the read as well.
+ *
+ * Iterating over `Object.keys(obj.field)` will register a read for the `['field']` path.
+ * Other reads work normally.
+ *
+ * @example
+ *
+ *     const usedPaths = new Set();
+ *     const onRead = (path) => {
+ *        usedPaths.add(path);
+ *     };
+ *
+ *     const config = makeConfigProxy(onRead, {a: {b: {c: 'd'}}})
+ *     console.log(config.a.b.c);
+ *     console.log(Array.from(usedPaths));
+ *     // We get a single read for the path
+ *     // ['a', 'b', 'c']
+ *
+ */
+function makeConfigProxy(onRead, config) {
+  const reportedPaths = new Set();
+  const reportPath = path => {
+    if (reportedPaths.has(path)) {
+      return;
+    }
+    reportedPaths.add(path);
+    onRead(path);
+  };
+  const makeProxy = (target, path) => {
+    // @ts-expect-error TS2345
+    return new Proxy(target, {
+      ownKeys(target) {
+        reportPath(path);
+        return Object.getOwnPropertyNames(target);
+      },
+      get(target, prop) {
+        // @ts-expect-error TS7053
+        const value = target[prop];
+        if (typeof value === 'object' && value != null && !Array.isArray(value)) {
+          return makeProxy(value, [...path, prop]);
+        }
+        reportPath([...path, prop]);
+        return value;
+      }
+    });
+  };
+
+  // @ts-expect-error TS2322
+  return makeProxy(config, []);
+}
+class PublicConfig {
+  // @ts-expect-error TS2564
+  #config;
+  #pkg;
+  #pkgFilePath;
+  // @ts-expect-error TS2564
+  #options;
   constructor(config, options) {
     let existing = internalConfigToConfig.get(options).get(config);
     if (existing != null) {
@@ -46,7 +113,7 @@ class PublicConfig {
     return this;
   }
   get env() {
-    return new _Environment.default(this.#config.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#config.env), this.#options);
   }
   get searchPath() {
     return (0, _projectPath.fromProjectPath)(this.#options.projectRoot, this.#config.searchPath);
@@ -57,8 +124,6 @@ class PublicConfig {
   get isSource() {
     return this.#config.isSource;
   }
-
-  // $FlowFixMe
   setResult(result) {
     this.#config.result = result;
   }
@@ -86,19 +151,25 @@ class PublicConfig {
     });
   }
   invalidateOnFileCreate(invalidation) {
+    // @ts-expect-error TS2339
     if (invalidation.glob != null) {
-      // $FlowFixMe
       this.#config.invalidateOnFileCreate.push(invalidation);
+      // @ts-expect-error TS2339
     } else if (invalidation.filePath != null) {
       this.#config.invalidateOnFileCreate.push({
-        filePath: (0, _projectPath.toProjectPath)(this.#options.projectRoot, invalidation.filePath)
+        filePath: (0, _projectPath.toProjectPath)(this.#options.projectRoot,
+        // @ts-expect-error TS2339
+        invalidation.filePath)
       });
     } else {
+      // @ts-expect-error TS2339
       (0, _assert().default)(invalidation.aboveFilePath != null);
       this.#config.invalidateOnFileCreate.push({
-        // $FlowFixMe
+        // @ts-expect-error TS2339
         fileName: invalidation.fileName,
-        aboveFilePath: (0, _projectPath.toProjectPath)(this.#options.projectRoot, invalidation.aboveFilePath)
+        aboveFilePath: (0, _projectPath.toProjectPath)(this.#options.projectRoot,
+        // @ts-expect-error TS2339
+        invalidation.aboveFilePath)
       });
     }
   }
@@ -112,20 +183,46 @@ class PublicConfig {
     this.#config.invalidateOnBuild = true;
   }
   async getConfigFrom(searchPath, fileNames, options) {
+    // @ts-expect-error TS2339
     let packageKey = options === null || options === void 0 ? void 0 : options.packageKey;
     if (packageKey != null) {
       let pkg = await this.getConfigFrom(searchPath, ['package.json'], {
         exclude: true
       });
+
+      // @ts-expect-error TS18046
       if (pkg && pkg.contents[packageKey]) {
         // Invalidate only when the package key changes
-        this.invalidateOnConfigKeyChange(pkg.filePath, packageKey);
+        this.invalidateOnConfigKeyChange(pkg.filePath, [packageKey]);
         return {
+          // @ts-expect-error TS18046
           contents: pkg.contents[packageKey],
           filePath: pkg.filePath
         };
       }
     }
+
+    // @ts-expect-error TS2339
+    const readTracking = options === null || options === void 0 ? void 0 : options.readTracking;
+    if (readTracking === true) {
+      for (let fileName of fileNames) {
+        const config = await this.getConfigFrom(searchPath, [fileName], {
+          exclude: true
+        });
+        if (config != null) {
+          // @ts-expect-error TS2322
+          return Promise.resolve({
+            contents: makeConfigProxy(keyPath => {
+              this.invalidateOnConfigKeyChange(config.filePath, keyPath);
+            }, config.contents),
+            filePath: config.filePath
+          });
+        }
+      }
+
+      // fall through so that file above invalidations are registered
+    }
+
     if (fileNames.length === 0) {
       return null;
     }
@@ -137,11 +234,15 @@ class PublicConfig {
         aboveFilePath: searchPath
       });
     }
+
+    // @ts-expect-error TS2339
     let parse = options && options.parse;
     let configFilePath = await (0, _utils().resolveConfig)(this.#options.inputFS, searchPath, fileNames, this.#options.projectRoot);
     if (configFilePath == null) {
       return null;
     }
+
+    // @ts-expect-error TS2339
     if (!options || !options.exclude) {
       this.invalidateOnFileChange(configFilePath);
     }
@@ -161,9 +262,7 @@ class PublicConfig {
       // e.g. uses unknown environment variables, reads from the filesystem, etc.
       this.invalidateOnStartup();
       let config = await this.#options.packageManager.require(specifier, searchPath);
-      if (
-      // $FlowFixMe
-      Object.prototype.toString.call(config) === '[object Module]' && config.default != null) {
+      if (Object.prototype.toString.call(config) === '[object Module]' && config.default != null) {
         // Native ESM config. Try to use a default export, otherwise fall back to the whole namespace.
         config = config.default;
       }
@@ -190,7 +289,9 @@ class PublicConfig {
     if (this.#pkg) {
       return this.#pkg;
     }
-    let pkgConfig = await this.getConfig(['package.json']);
+    let pkgConfig = await this.getConfig(['package.json'], {
+      readTracking: true
+    });
     if (!pkgConfig) {
       return null;
     }

package/lib/public/Dependency.js

@@ -19,6 +19,7 @@ var _Target = _interopRequireDefault(require("./Target"));
 var _Symbols = require("./Symbols");
 var _projectPath = require("../projectPath");
 var _utils = require("../utils");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SpecifierTypeNames = Object.keys(_types.SpecifierType);
 const PriorityNames = Object.keys(_types.Priority);
@@ -36,9 +37,8 @@ function getPublicDependency(dep, options) {
   return new Dependency(dep, options);
 }
 class Dependency {
-  #dep /*: InternalDependency */;
-  #options /*: AtlaspackOptions */;
-
+  #dep;
+  #options;
   constructor(dep, options) {
     this.#dep = dep;
     this.#options = options;
@@ -46,8 +46,6 @@ class Dependency {
     internalDependencyToDependency.set(dep, this);
     return this;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `Dependency(${String(this.sourcePath)} -> ${this.specifier})`;
   }
@@ -58,9 +56,11 @@ class Dependency {
     return this.#dep.specifier;
   }
   get specifierType() {
+    // @ts-expect-error TS2322
     return SpecifierTypeNames[this.#dep.specifierType];
   }
   get priority() {
+    // @ts-expect-error TS2322
     return PriorityNames[this.#dep.priority];
   }
   get needsStableName() {
@@ -80,7 +80,7 @@ class Dependency {
     return (0, _utils.fromInternalSourceLocation)(this.#options.projectRoot, this.#dep.loc);
   }
   get env() {
-    return new _Environment.default(this.#dep.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#dep.env), this.#options);
   }
   get packageConditions() {
     // Merge custom conditions with conditions stored as bitflags.
@@ -90,6 +90,7 @@ class Dependency {
     if (this.#dep.packageConditions) {
       conditions = conditions ? [...conditions] : [];
       for (let key in _types.ExportsCondition) {
+        // @ts-expect-error TS7053
         if (this.#dep.packageConditions & _types.ExportsCondition[key]) {
           conditions.push(key);
         }
@@ -101,6 +102,7 @@ class Dependency {
     return this.#dep.meta;
   }
   get symbols() {
+    // @ts-expect-error TS2322
     return new _Symbols.MutableDependencySymbols(this.#options, this.#dep);
   }
   get target() {

package/lib/public/Environment.js

@@ -29,11 +29,11 @@ function _semver() {
 var _utils = require("../utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
-const BROWSER_ENVS = exports.BROWSER_ENVS = new Set(['browser', 'web-worker', 'service-worker', 'worklet', 'electron-renderer']);
+const BROWSER_ENVS = exports.BROWSER_ENVS = new Set(['browser', 'web-worker', 'service-worker', 'worklet', 'tesseract', 'electron-renderer']);
 const ELECTRON_ENVS = new Set(['electron-main', 'electron-renderer']);
 const NODE_ENVS = new Set(['node', ...ELECTRON_ENVS]);
 const WORKER_ENVS = new Set(['web-worker', 'service-worker']);
-const ISOLATED_ENVS = exports.ISOLATED_ENVS = new Set([...WORKER_ENVS, 'worklet']);
+const ISOLATED_ENVS = exports.ISOLATED_ENVS = new Set([...WORKER_ENVS, 'worklet', 'tesseract']);
 const ALL_BROWSERS = ['chrome', 'and_chr', 'edge', 'firefox', 'and_ff', 'safari', 'ios', 'samsung', 'opera', 'ie', 'op_mini', 'blackberry', 'op_mob', 'ie_mob', 'and_uc', 'and_qq', 'baidu', 'kaios'];
 
 // See require("caniuse-api").getSupport(<feature name>)
@@ -127,9 +127,10 @@ function environmentToInternalEnvironment(environment) {
   return (0, _nullthrows().default)(_environmentToInternalEnvironment.get(environment));
 }
 class Environment {
-  #environment /*: InternalEnvironment */;
-  #options /*: AtlaspackOptions */;
-
+  // @ts-expect-error TS2564
+  #environment;
+  // @ts-expect-error TS2564
+  #options;
   constructor(env, options) {
     let existing = internalEnvironmentToEnvironment.get(env);
     if (existing != null) {
@@ -177,8 +178,9 @@ class Environment {
   get unstableSingleFileOutput() {
     return this.#environment.unstableSingleFileOutput;
   }
-
-  // $FlowFixMe[unsupported-syntax]
+  get customEnv() {
+    return this.#environment.customEnv;
+  }
   [inspect]() {
     return `Env(${this.#environment.context})`;
   }
@@ -200,6 +202,9 @@ class Environment {
   isWorklet() {
     return this.#environment.context === 'worklet';
   }
+  isTesseract() {
+    return this.#environment.context === 'tesseract';
+  }
   matchesEngines(minVersions, defaultValue = false) {
     // Determine if the environment matches some minimum version requirements.
     // For browsers, we run a browserslist query with and without the minimum

package/lib/public/MutableBundleGraph.js

@@ -26,7 +26,7 @@ function _rust() {
   return data;
 }
 var _BundleGraph = _interopRequireDefault(require("./BundleGraph"));
-var _BundleGraph2 = _interopRequireWildcard(require("../BundleGraph"));
+var _BundleGraph2 = require("../BundleGraph");
 var _Bundle = require("./Bundle");
 var _Asset = require("./Asset");
 var _utils = require("../utils");
@@ -38,6 +38,14 @@ var _projectPath = require("../projectPath");
 var _types = require("../types");
 var _BundleGroup = _interopRequireWildcard(require("./BundleGroup"));
 var _IdentifierRegistry = require("../IdentifierRegistry");
+var _EnvironmentManager = require("../EnvironmentManager");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 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 }; }
@@ -53,9 +61,9 @@ function createBundleId(data) {
   return id;
 }
 class MutableBundleGraph extends _BundleGraph.default {
-  #graph /*: InternalBundleGraph */;
-  #options /*: AtlaspackOptions */;
-  #bundlePublicIds /*: Set<string> */ = new Set();
+  #graph;
+  #options;
+  #bundlePublicIds = new Set();
   constructor(graph, options) {
     super(graph, _Bundle.Bundle.get.bind(_Bundle.Bundle), options);
     this.#graph = graph;
@@ -65,10 +73,18 @@ class MutableBundleGraph extends _BundleGraph.default {
     this.#graph.addAssetToBundle((0, _Asset.assetToAssetValue)(asset), (0, _Bundle.bundleToInternalBundle)(bundle));
   }
   addAssetGraphToBundle(asset, bundle, shouldSkipDependency) {
-    this.#graph.addAssetGraphToBundle((0, _Asset.assetToAssetValue)(asset), (0, _Bundle.bundleToInternalBundle)(bundle), shouldSkipDependency ? d => shouldSkipDependency(new _Dependency.default(d, this.#options)) : undefined);
+    this.#graph.addAssetGraphToBundle((0, _Asset.assetToAssetValue)(asset), (0, _Bundle.bundleToInternalBundle)(bundle),
+    // @ts-expect-error TS2345
+    shouldSkipDependency ? d =>
+    // @ts-expect-error TS2345
+    shouldSkipDependency(new _Dependency.default(d, this.#options)) : undefined);
   }
   addEntryToBundle(asset, bundle, shouldSkipDependency) {
-    this.#graph.addEntryToBundle((0, _Asset.assetToAssetValue)(asset), (0, _Bundle.bundleToInternalBundle)(bundle), shouldSkipDependency ? d => shouldSkipDependency(new _Dependency.default(d, this.#options)) : undefined);
+    this.#graph.addEntryToBundle((0, _Asset.assetToAssetValue)(asset), (0, _Bundle.bundleToInternalBundle)(bundle),
+    // @ts-expect-error TS2345
+    shouldSkipDependency ? d =>
+    // @ts-expect-error TS2345
+    shouldSkipDependency(new _Dependency.default(d, this.#options)) : undefined);
   }
   createBundleGroup(dependency, target) {
     let dependencyNode = this.#graph._graph.getNodeByContentKey(dependency.id);
@@ -121,10 +137,14 @@ class MutableBundleGraph extends _BundleGraph.default {
     this.#graph.internalizeAsyncDependency((0, _Bundle.bundleToInternalBundle)(bundle), (0, _Dependency.dependencyToInternalDependency)(dependency));
   }
   createBundle(opts) {
-    let entryAsset = opts.entryAsset ? (0, _Asset.assetToAssetValue)(opts.entryAsset) : null;
+    // @ts-expect-error TS2339
+    let entryAsset = opts.entryAsset ?
+    // @ts-expect-error TS2339
+    (0, _Asset.assetToAssetValue)(opts.entryAsset) : null;
     let target = (0, _Target.targetToInternalTarget)(opts.target);
     let bundleId = createBundleId({
       entryAssetId: (entryAsset === null || entryAsset === void 0 ? void 0 : entryAsset.id) ?? null,
+      // @ts-expect-error TS2339
       uniqueKey: opts.uniqueKey ?? null,
       distDir: target.distDir,
       bundleBehavior: opts.bundleBehavior ?? null
@@ -142,20 +162,42 @@ class MutableBundleGraph extends _BundleGraph.default {
       (0, _assert().default)((entryAssetNode === null || entryAssetNode === void 0 ? void 0 : entryAssetNode.type) === 'asset', 'Entry asset does not exist');
       isPlaceholder = entryAssetNode.requested === false;
     }
+    let entryAssetIds = [];
+    if (entryAsset) {
+      entryAssetIds = [entryAsset.id];
+      if ((0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+        // @ts-expect-error TS2339
+        let bundleRoots = opts.bundleRoots ?? [entryAsset];
+        let bundleRootIds = bundleRoots.map(({
+          id
+        }) => id).filter(assetId => assetId !== entryAsset.id);
+        entryAssetIds.push(...bundleRootIds);
+      }
+    }
     let bundleNode = {
       type: 'bundle',
       id: bundleId,
       value: {
         id: bundleId,
         hashReference: this.#options.shouldContentHash ? _constants.HASH_REF_PREFIX + bundleId : bundleId.slice(-8),
+        // @ts-expect-error TS2339
         type: opts.entryAsset ? opts.entryAsset.type : opts.type,
-        env: opts.env ? (0, _Environment.environmentToInternalEnvironment)(opts.env) : (0, _nullthrows().default)(entryAsset).env,
-        entryAssetIds: entryAsset ? [entryAsset.id] : [],
+        // @ts-expect-error TS2339
+        env: opts.env ?
+        // @ts-expect-error TS2339
+        (0, _EnvironmentManager.toEnvironmentRef)((0, _Environment.environmentToInternalEnvironment)(opts.env)) : (0, _nullthrows().default)(entryAsset).env,
+        entryAssetIds,
         mainEntryId: entryAsset === null || entryAsset === void 0 ? void 0 : entryAsset.id,
+        // @ts-expect-error TS2339
         pipeline: opts.entryAsset ? opts.entryAsset.pipeline : opts.pipeline,
         needsStableName: opts.needsStableName,
         bundleBehavior: opts.bundleBehavior != null ? _types.BundleBehavior[opts.bundleBehavior] : null,
-        isSplittable: opts.entryAsset ? opts.entryAsset.isBundleSplittable : opts.isSplittable,
+        // @ts-expect-error TS2339
+        isSplittable: opts.entryAsset ?
+        // @ts-expect-error TS2339
+        opts.entryAsset.isBundleSplittable :
+        // @ts-expect-error TS2339
+        opts.isSplittable,
         isPlaceholder,
         target,
         name: null,
@@ -165,8 +207,8 @@ class MutableBundleGraph extends _BundleGraph.default {
       }
     };
     let bundleNodeId = this.#graph._graph.addNodeByContentKey(bundleId, bundleNode);
-    if (opts.entryAsset) {
-      this.#graph._graph.addEdge(bundleNodeId, this.#graph._graph.getNodeIdByContentKey(opts.entryAsset.id));
+    for (let assetId of entryAssetIds) {
+      this.#graph._graph.addEdge(bundleNodeId, this.#graph._graph.getNodeIdByContentKey(assetId));
     }
     return _Bundle.Bundle.get(bundleNode.value, this.#graph, this.#options);
   }

package/lib/public/PluginOptions.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 let parcelOptionsToPluginOptions = new WeakMap();
 class PluginOptions {
-  #options /*: AtlaspackOptions */;
-
+  // @ts-expect-error TS2564
+  #options;
   constructor(options) {
     let existing = parcelOptionsToPluginOptions.get(options);
     if (existing != null) {

package/lib/public/Symbols.js

@@ -31,7 +31,9 @@ class AssetSymbols {
   /*::
   @@iterator(): Iterator<[ISymbol, {|local: ISymbol, loc: ?SourceLocation, meta?: ?Meta|}]> { return ({}: any); }
   */
+  // @ts-expect-error TS2564
   #value;
+  // @ts-expect-error TS2564
   #options;
   constructor(options, asset) {
     let existing = valueToSymbols.get(asset);
@@ -67,12 +69,10 @@ class AssetSymbols {
     var _this$value$symbols3;
     return ((_this$value$symbols3 = this.#value.symbols) === null || _this$value$symbols3 === void 0 ? void 0 : _this$value$symbols3.keys()) ?? [];
   }
-  // $FlowFixMe
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#value.symbols ? this.#value.symbols[Symbol.iterator]() : EMPTY_ITERATOR;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `AssetSymbols(${this.#value.symbols ? [...this.#value.symbols].map(([s, {
       local
@@ -85,7 +85,9 @@ class MutableAssetSymbols {
   /*::
   @@iterator(): Iterator<[ISymbol, {|local: ISymbol, loc: ?SourceLocation, meta?: ?Meta|}]> { return ({}: any); }
   */
+  // @ts-expect-error TS2564
   #value;
+  // @ts-expect-error TS2564
   #options;
   constructor(options, asset) {
     let existing = valueToMutableAssetSymbols.get(asset);
@@ -120,15 +122,13 @@ class MutableAssetSymbols {
     return this.#value.symbols == null;
   }
   exportSymbols() {
-    // $FlowFixMe
+    // @ts-expect-error TS2322
     return this.#value.symbols.keys();
   }
-  // $FlowFixMe
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#value.symbols ? this.#value.symbols[Symbol.iterator]() : EMPTY_ITERATOR;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `MutableAssetSymbols(${this.#value.symbols ? [...this.#value.symbols].map(([s, {
       local
@@ -159,7 +159,9 @@ class MutableDependencySymbols {
   /*::
   @@iterator(): Iterator<[ISymbol, {|local: ISymbol, loc: ?SourceLocation, isWeak: boolean, meta?: ?Meta|}]> { return ({}: any); }
   */
+  // @ts-expect-error TS2564
   #value;
+  // @ts-expect-error TS2564
   #options;
   constructor(options, dep) {
     let existing = valueToMutableDependencySymbols.get(dep);
@@ -192,16 +194,14 @@ class MutableDependencySymbols {
     return this.#value.symbols == null;
   }
   exportSymbols() {
-    // $FlowFixMe
+    // @ts-expect-error TS2322
     return this.#value.symbols ? this.#value.symbols.keys() : EMPTY_ITERABLE;
   }
 
-  // $FlowFixMe
+  // @ts-expect-error TS2416
   [Symbol.iterator]() {
     return this.#value.symbols ? this.#value.symbols[Symbol.iterator]() : EMPTY_ITERATOR;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `MutableDependencySymbols(${this.#value.symbols ? [...this.#value.symbols].map(([s, {
       local,

package/lib/public/Target.js

@@ -15,6 +15,7 @@ function _nullthrows() {
 var _Environment = _interopRequireDefault(require("./Environment"));
 var _projectPath = require("../projectPath");
 var _utils = require("../utils");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const internalTargetToTarget = new WeakMap();
@@ -23,9 +24,10 @@ function targetToInternalTarget(target) {
   return (0, _nullthrows().default)(_targetToInternalTarget.get(target));
 }
 class Target {
-  #target /*: TargetValue */;
-  #options /*: AtlaspackOptions */;
-
+  // @ts-expect-error TS2564
+  #target;
+  // @ts-expect-error TS2564
+  #options;
   constructor(target, options) {
     let existing = internalTargetToTarget.get(target);
     if (existing != null) {
@@ -44,7 +46,7 @@ class Target {
     return (0, _projectPath.fromProjectPath)(this.#options.projectRoot, this.#target.distDir);
   }
   get env() {
-    return new _Environment.default(this.#target.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#target.env), this.#options);
   }
   get name() {
     return this.#target.name;
@@ -55,9 +57,8 @@ class Target {
   get loc() {
     return (0, _utils.fromInternalSourceLocation)(this.#options.projectRoot, this.#target.loc);
   }
-
-  // $FlowFixMe[unsupported-syntax]
   [inspect]() {
+    // @ts-expect-error TS7053
     return `Target(${this.name} - ${this.env[inspect]()})`;
   }
 }

package/lib/registerCoreWithSerializer.js

@@ -25,8 +25,13 @@ var _BundleGraph = _interopRequireDefault(require("./BundleGraph"));
 var _Config = _interopRequireDefault(require("./public/Config"));
 var _RequestTracker = require("./RequestTracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// flow-to-ts helpers
+
+// /flow-to-ts helpers
+// @ts-expect-error TS7034
 let coreRegistered;
 function registerCoreWithSerializer() {
+  // @ts-expect-error TS7005
   if (coreRegistered) {
     return;
   }
@@ -34,8 +39,6 @@ function registerCoreWithSerializer() {
   if (typeof packageVersion !== 'string') {
     throw new Error('Expected package version to be a string');
   }
-
-  // $FlowFixMe[incompatible-cast]
   for (let [name, ctor] of Object.entries({
     AssetGraph: _AssetGraph.default,
     Config: _Config.default,
@@ -43,7 +46,6 @@ function registerCoreWithSerializer() {
     Graph: _graph().Graph,
     AtlaspackConfig: _AtlaspackConfig.AtlaspackConfig,
     RequestGraph: _RequestTracker.RequestGraph
-    // $FlowFixMe[unclear-type]
   })) {
     (0, _buildCache().registerSerializableClass)(packageVersion + ':' + name, ctor);
   }