@atlaspack/core 2.16.2-canary.33 → 2.16.2-canary.330

package/lib/loadDotEnv.js

@@ -34,7 +34,9 @@ async function loadEnv(env, fs, filePath, projectRoot) {
   // results for everyone
   NODE_ENV === 'test' ? null : '.env.local', `.env.${NODE_ENV}`, `.env.${NODE_ENV}.local`].filter(Boolean);
   let envs = await Promise.all(dotenvFiles.map(async dotenvFile => {
-    const envPath = await (0, _utils().resolveConfig)(fs, filePath, [dotenvFile], projectRoot);
+    const envPath = await (0, _utils().resolveConfig)(fs, filePath,
+    // @ts-expect-error TS2322
+    [dotenvFile], projectRoot);
     if (envPath == null) {
       return;
     }
@@ -43,6 +45,7 @@ async function loadEnv(env, fs, filePath, projectRoot) {
     // https://github.com/motdotla/dotenv-expand/blob/ddb73d02322fe8522b4e05b73e1c1ad24ea7c14a/lib/main.js#L5
     let output = (0, _dotenvExpand().default)({
       parsed: _dotenv().default.parse(await fs.readFile(envPath)),
+      // @ts-expect-error TS2353
       ignoreProcessEnv: true
     });
     if (output.error != null) {

package/lib/projectPath.js

@@ -33,6 +33,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * A path that's relative to the project root.
  */
+
 /**
  * Converts a file path to a project-relative path.
  *
@@ -67,6 +68,8 @@ function toProjectPath_(projectRoot, p) {
   }
   return relative;
 }
+
+// @ts-expect-error TS2322
 const toProjectPath = exports.toProjectPath = toProjectPath_;
 function fromProjectPath_(projectRoot, p) {
   if (p == null) {
@@ -88,6 +91,8 @@ function fromProjectPath_(projectRoot, p) {
   }
   return projectRoot + projectPath;
 }
+
+// @ts-expect-error TS2322
 const fromProjectPath = exports.fromProjectPath = fromProjectPath_;
 
 /**

package/lib/public/Asset.js

@@ -23,6 +23,7 @@ var _Environment2 = require("../Environment");
 var _projectPath = require("../projectPath");
 var _types = require("../types");
 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 uncommittedAssetValueToAsset = new WeakMap();
@@ -44,14 +45,11 @@ function assetFromValue(value, options) {
 }
 class BaseAsset {
   #asset;
-  #query /*: ?URLSearchParams */;
-
+  #query;
   constructor(asset) {
     this.#asset = asset;
     _assetToAssetValue.set(this, asset.value);
   }
-
-  // $FlowFixMe[unsupported-syntax]
   [inspect]() {
     return `Asset(${this.filePath})`;
   }
@@ -62,7 +60,7 @@ class BaseAsset {
     return this.#asset.value.type;
   }
   get env() {
-    return new _Environment.default(this.#asset.value.env, this.#asset.options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#asset.value.env), this.#asset.options);
   }
   get fs() {
     return this.#asset.options.inputFS;
@@ -93,6 +91,7 @@ class BaseAsset {
     return this.#asset.value.sideEffects;
   }
   get symbols() {
+    // @ts-expect-error TS2322
     return new _Symbols.AssetSymbols(this.#asset.options, this.#asset.value);
   }
   get uniqueKey() {
@@ -127,9 +126,9 @@ class BaseAsset {
   }
 }
 class Asset extends BaseAsset {
-  #asset /*: CommittedAsset | UncommittedAsset */;
-  #env /*: ?Environment */;
-
+  // @ts-expect-error TS2564
+  #asset;
+  #env;
   constructor(asset) {
     let assetValueToAsset = asset.value.committed ? committedAssetValueToAsset : uncommittedAssetValueToAsset;
     let existing = assetValueToAsset.get(asset.value);
@@ -142,7 +141,7 @@ class Asset extends BaseAsset {
     return this;
   }
   get env() {
-    this.#env ??= new _Environment.default(this.#asset.value.env, this.#asset.options);
+    this.#env ??= new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#asset.value.env), this.#asset.options);
     return this.#env;
   }
   get stats() {
@@ -151,8 +150,8 @@ class Asset extends BaseAsset {
 }
 exports.Asset = Asset;
 class MutableAsset extends BaseAsset {
-  #asset /*: UncommittedAsset */;
-
+  // @ts-expect-error TS2564
+  #asset;
   constructor(asset) {
     let existing = assetValueToMutableAsset.get(asset.value);
     if (existing != null) {
@@ -170,6 +169,8 @@ class MutableAsset extends BaseAsset {
   get type() {
     return this.#asset.value.type;
   }
+
+  // @ts-expect-error TS1095
   set type(type) {
     if (type !== this.#asset.value.type) {
       this.#asset.value.type = type;
@@ -180,24 +181,32 @@ class MutableAsset extends BaseAsset {
     let bundleBehavior = this.#asset.value.bundleBehavior;
     return bundleBehavior == null ? null : _types.BundleBehaviorNames[bundleBehavior];
   }
+
+  // @ts-expect-error TS1095
   set bundleBehavior(bundleBehavior) {
     this.#asset.value.bundleBehavior = bundleBehavior ? _types.BundleBehavior[bundleBehavior] : null;
   }
   get isBundleSplittable() {
     return this.#asset.value.isBundleSplittable;
   }
+
+  // @ts-expect-error TS1095
   set isBundleSplittable(isBundleSplittable) {
     this.#asset.value.isBundleSplittable = isBundleSplittable;
   }
   get sideEffects() {
     return this.#asset.value.sideEffects;
   }
+
+  // @ts-expect-error TS1095
   set sideEffects(sideEffects) {
     this.#asset.value.sideEffects = sideEffects;
   }
   get uniqueKey() {
     return this.#asset.value.uniqueKey;
   }
+
+  // @ts-expect-error TS1095
   set uniqueKey(uniqueKey) {
     if (this.#asset.value.uniqueKey != null) {
       throw new Error("Cannot change an asset's uniqueKey after it has been set.");
@@ -205,6 +214,7 @@ class MutableAsset extends BaseAsset {
     this.#asset.value.uniqueKey = uniqueKey;
   }
   get symbols() {
+    // @ts-expect-error TS2322
     return new _Symbols.MutableAssetSymbols(this.#asset.options, this.#asset.value);
   }
   addDependency(dep) {

package/lib/public/Bundle.js

@@ -40,6 +40,7 @@ var _Dependency = require("./Dependency");
 var _Target = _interopRequireDefault(require("./Target"));
 var _types = require("../types");
 var _projectPath = require("../projectPath");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const internalBundleToBundle = new (_utils().DefaultWeakMap)(() => new (_utils().DefaultWeakMap)(() => new WeakMap()));
@@ -61,11 +62,9 @@ function bundleToInternalBundleGraph(bundle) {
 // preventing others from using them. They should use the static `get` method.
 let _private = {};
 class Bundle {
-  #bundle /*: InternalBundle */;
-  #bundleGraph /*: BundleGraph */;
-  #options /*: AtlaspackOptions */;
-
-  // $FlowFixMe
+  #bundle;
+  #bundleGraph;
+  #options;
   [inspect]() {
     return `Bundle(${this.#bundle.id})`;
   }
@@ -99,7 +98,7 @@ class Bundle {
     return this.#bundle.type;
   }
   get env() {
-    return new _Environment.default(this.#bundle.env, this.#options);
+    return new _Environment.default((0, _EnvironmentManager.fromEnvironmentId)(this.#bundle.env), this.#options);
   }
   get needsStableName() {
     return this.#bundle.needsStableName;
@@ -138,7 +137,9 @@ class Bundle {
     }
   }
   traverse(visit) {
-    return this.#bundleGraph.traverseBundle(this.#bundle, (0, _graph().mapVisitor)(node => {
+    return this.#bundleGraph.traverseBundle(this.#bundle,
+    // @ts-expect-error TS2345
+    (0, _graph().mapVisitor)(node => {
       if (node.type === 'asset') {
         return {
           type: 'asset',
@@ -158,10 +159,9 @@ class Bundle {
 }
 exports.Bundle = Bundle;
 class NamedBundle extends Bundle {
-  #bundle /*: InternalBundle */;
-  #bundleGraph /*: BundleGraph */;
-  #options /*: AtlaspackOptions */;
-
+  #bundle;
+  #bundleGraph;
+  #options;
   constructor(sentinel, bundle, bundleGraph, options) {
     super(sentinel, bundle, bundleGraph, options);
     this.#bundle = bundle; // Repeating for flow
@@ -192,11 +192,10 @@ class NamedBundle extends Bundle {
 }
 exports.NamedBundle = NamedBundle;
 class PackagedBundle extends NamedBundle {
-  #bundle /*: InternalBundle */;
-  #bundleGraph /*: BundleGraph */;
-  #options /*: AtlaspackOptions */;
-  #bundleInfo /*: ?PackagedBundleInfo */;
-
+  #bundle;
+  #bundleGraph;
+  #options;
+  #bundleInfo;
   constructor(sentinel, bundle, bundleGraph, options) {
     super(sentinel, bundle, bundleGraph, options);
     this.#bundle = bundle; // Repeating for flow

package/lib/public/BundleGraph.js

@@ -32,13 +32,6 @@ var _Dependency = _interopRequireWildcard(require("./Dependency"));
 var _Target = require("./Target");
 var _utils = require("../utils");
 var _BundleGroup = _interopRequireWildcard(require("./BundleGroup"));
-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 }; }
@@ -56,7 +49,6 @@ class BundleGraph {
     this.#graph = graph;
     this.#options = options;
     this.#createBundle = createBundle;
-    // $FlowFixMe
     _bundleGraphToInternalBundleGraph.set(this, graph);
   }
   getAssetById(id) {
@@ -122,6 +114,19 @@ class BundleGraph {
   isAssetReferenced(bundle, asset) {
     return this.#graph.isAssetReferenced((0, _Bundle.bundleToInternalBundle)(bundle), (0, _Asset.assetToAssetValue)(asset));
   }
+  isAssetReferencedFastCheck(bundle, asset) {
+    return this.#graph.isAssetReferencedFastCheck((0, _Bundle.bundleToInternalBundle)(bundle), (0, _Asset.assetToAssetValue)(asset));
+  }
+  getReferencedAssets(bundle) {
+    let internalReferencedAssets = this.#graph.getReferencedAssets((0, _Bundle.bundleToInternalBundle)(bundle));
+
+    // Convert internal assets to public assets
+    let publicReferencedAssets = new Set();
+    for (let internalAsset of internalReferencedAssets) {
+      publicReferencedAssets.add((0, _Asset.assetFromValue)(internalAsset, this.#options));
+    }
+    return publicReferencedAssets;
+  }
   hasParentBundleOfType(bundle, type) {
     return this.#graph.hasParentBundleOfType((0, _Bundle.bundleToInternalBundle)(bundle), type);
   }
@@ -160,7 +165,9 @@ class BundleGraph {
     }));
   }
   traverse(visit, start, opts) {
-    return this.#graph.traverse((0, _graph().mapVisitor)((node, actions) => {
+    return this.#graph.traverse(
+    // @ts-expect-error TS2345
+    (0, _graph().mapVisitor)((node, actions) => {
       // Skipping unused dependencies here is faster than doing an isDependencySkipped check inside the visitor
       // because the node needs to be re-looked up by id from the hashmap.
       if (opts !== null && opts !== void 0 && opts.skipUnusedDependencies && node.type === 'dependency' && (node.hasDeferred || node.excluded)) {
@@ -234,6 +241,8 @@ class BundleGraph {
         });
       }
     }
+
+    // @ts-expect-error TS2322
     return conditions;
   }
 
@@ -265,25 +274,19 @@ class BundleGraph {
           (0, _assert().default)(resolved.type === 'bundle_group');
           return this.getBundlesInBundleGroup(resolved.value);
         };
+        // @ts-expect-error TS2345
         ifTrueBundles.push(...depToBundles(cond.ifTrueDependency));
+        // @ts-expect-error TS2345
         ifFalseBundles.push(...depToBundles(cond.ifFalseDependency));
       }
       for (let bundle of bundles) {
         const conditions = bundleConditions.get(bundle.id) ?? new Map();
         const currentCondition = conditions.get(cond.key);
-        if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingReporterSameConditionFix')) {
-          conditions.set(cond.key, {
-            bundle,
-            ifTrueBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifTrueBundles) ?? []), ...ifTrueBundles],
-            ifFalseBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifFalseBundles) ?? []), ...ifFalseBundles]
-          });
-        } else {
-          conditions.set(cond.key, {
-            bundle,
-            ifTrueBundles,
-            ifFalseBundles
-          });
-        }
+        conditions.set(cond.key, {
+          bundle,
+          ifTrueBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifTrueBundles) ?? []), ...ifTrueBundles],
+          ifFalseBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifFalseBundles) ?? []), ...ifFalseBundles]
+        });
         bundleConditions.set(bundle.id, conditions);
       }
     }

package/lib/public/BundleGroup.js

@@ -21,9 +21,10 @@ function bundleGroupToInternalBundleGroup(target) {
 }
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 class BundleGroup {
-  #bundleGroup /*: InternalBundleGroup */;
-  #options /*: AtlaspackOptions */;
-
+  // @ts-expect-error TS2564
+  #bundleGroup;
+  // @ts-expect-error TS2564
+  #options;
   constructor(bundleGroup, options) {
     let existing = internalBundleGroupToBundleGroup.get(bundleGroup);
     if (existing != null) {
@@ -41,8 +42,6 @@ class BundleGroup {
   get entryAssetId() {
     return this.#bundleGroup.entryAssetId;
   }
-
-  // $FlowFixMe
   [inspect]() {
     return `BundleGroup(${this.entryAssetId})`;
   }

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