@atlaspack/core 2.17.3 → 2.18.0

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,8 +28,81 @@ function _utils() {
 }
 var _Environment = _interopRequireDefault(require("./Environment"));
 var _projectPath = require("../projectPath");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const internalConfigToConfig = new (_utils().DefaultWeakMap)(() => new WeakMap());
+
+/**
+ * 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) => {
+    return new Proxy(target, {
+      ownKeys(target) {
+        reportPath(path);
+
+        // $FlowFixMe
+        return Object.getOwnPropertyNames(target);
+      },
+      get(target, prop) {
+        // $FlowFixMe
+        const value = target[prop];
+        if (typeof value === 'object' && value != null && !Array.isArray(value)) {
+          return makeProxy(value, [...path, prop]);
+        }
+        reportPath([...path, prop]);
+        return value;
+      }
+    });
+  };
+
+  // $FlowFixMe
+  return makeProxy(config, []);
+}
 class PublicConfig {
   #config /*: Config */;
   #pkg /*: ?PackageJSON */;
@@ -46,7 +120,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);
@@ -119,13 +193,32 @@ class PublicConfig {
       });
       if (pkg && pkg.contents[packageKey]) {
         // Invalidate only when the package key changes
-        this.invalidateOnConfigKeyChange(pkg.filePath, packageKey);
+        this.invalidateOnConfigKeyChange(pkg.filePath, [packageKey]);
         return {
           contents: pkg.contents[packageKey],
           filePath: pkg.filePath
         };
       }
     }
+    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) {
+          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;
     }
@@ -190,7 +283,9 @@ class PublicConfig {
     if (this.#pkg) {
       return this.#pkg;
     }
-    let pkgConfig = await this.getConfig(['package.json']);
+    let pkgConfig = await this.getConfig(['package.json'], {
+      readTracking: (0, _featureFlags().getFeatureFlag)('granularTsConfigInvalidation')
+    });
     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);
@@ -80,7 +81,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.

package/lib/public/MutableBundleGraph.js

@@ -38,6 +38,7 @@ var _projectPath = require("../projectPath");
 var _types = require("../types");
 var _BundleGroup = _interopRequireWildcard(require("./BundleGroup"));
 var _IdentifierRegistry = require("../IdentifierRegistry");
+var _EnvironmentManager = require("../EnvironmentManager");
 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 }; }
@@ -149,7 +150,7 @@ class MutableBundleGraph extends _BundleGraph.default {
         id: bundleId,
         hashReference: this.#options.shouldContentHash ? _constants.HASH_REF_PREFIX + bundleId : bundleId.slice(-8),
         type: opts.entryAsset ? opts.entryAsset.type : opts.type,
-        env: opts.env ? (0, _Environment.environmentToInternalEnvironment)(opts.env) : (0, _nullthrows().default)(entryAsset).env,
+        env: opts.env ? (0, _EnvironmentManager.toEnvironmentRef)((0, _Environment.environmentToInternalEnvironment)(opts.env)) : (0, _nullthrows().default)(entryAsset).env,
         entryAssetIds: entryAsset ? [entryAsset.id] : [],
         mainEntryId: entryAsset === null || entryAsset === void 0 ? void 0 : entryAsset.id,
         pipeline: opts.entryAsset ? opts.entryAsset.pipeline : opts.pipeline,

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();
@@ -44,7 +45,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;

package/lib/requests/AssetGraphRequest.js

@@ -26,6 +26,13 @@ function _nullthrows() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -116,7 +123,12 @@ class AssetGraphBuilder {
     this.shouldBuildLazily = shouldBuildLazily ?? false;
     this.lazyIncludes = lazyIncludes ?? [];
     this.lazyExcludes = lazyExcludes ?? [];
-    this.cacheKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}${name}${JSON.stringify(entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`) + '-AssetGraph';
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      const key = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}${name}${JSON.stringify(entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`);
+      this.cacheKey = `AssetGraph/${_constants.ATLASPACK_VERSION}/${options.mode}/${key}`;
+    } else {
+      this.cacheKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}${name}${JSON.stringify(entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`) + '-AssetGraph';
+    }
     this.isSingleChangeRebuild = api.getInvalidSubRequests().filter(req => req.requestType === 'asset_request').length === 1;
     this.queue = new (_utils().PromiseQueue)();
     assetGraph.onNodeRemoved = nodeId => {

package/lib/requests/AssetRequest.js

@@ -31,6 +31,7 @@ var _ConfigRequest = require("./ConfigRequest");
 var _projectPath = require("../projectPath");
 var _ReporterRunner = require("../ReporterRunner");
 var _RequestTracker = require("../RequestTracker");
+var _EnvironmentManager = require("../EnvironmentManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function createAssetRequest(input) {
   return {
@@ -42,7 +43,7 @@ function createAssetRequest(input) {
 }
 const type = 'asset_request';
 function getId(input) {
-  return (0, _rust().hashString)(type + (0, _projectPath.fromProjectPathRelative)(input.filePath) + input.env.id + String(input.isSource) + String(input.sideEffects) + (input.code ?? '') + ':' + (input.pipeline ?? '') + ':' + (input.query ?? ''));
+  return (0, _rust().hashString)(type + (0, _projectPath.fromProjectPathRelative)(input.filePath) + (0, _EnvironmentManager.toEnvironmentId)(input.env) + String(input.isSource) + String(input.sideEffects) + (input.code ?? '') + ':' + (input.pipeline ?? '') + ':' + (input.query ?? ''));
 }
 async function run({
   input,

package/lib/requests/BundleGraphRequest.js

@@ -32,6 +32,13 @@ function _logger() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _diagnostic() {
   const data = _interopRequireWildcard(require("@atlaspack/diagnostic"));
   _diagnostic = function () {
@@ -225,7 +232,12 @@ class BundlerRunner {
     this.devDepRequests = new Map();
     this.configs = new Map();
     this.pluginOptions = new _PluginOptions.default((0, _utils2.optionsProxy)(this.options, api.invalidateOnOptionChange));
-    this.cacheKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}:BundleGraph:${JSON.stringify(options.entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`) + '-BundleGraph';
+    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      const key = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}:BundleGraph:${JSON.stringify(options.entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`);
+      this.cacheKey = `BundleGraph/${_constants.ATLASPACK_VERSION}/${options.mode}/${key}`;
+    } else {
+      this.cacheKey = (0, _rust().hashString)(`${_constants.ATLASPACK_VERSION}:BundleGraph:${JSON.stringify(options.entries) ?? ''}${options.mode}${options.shouldBuildLazily ? 'lazy' : 'eager'}`) + '-BundleGraph';
+    }
   }
   async loadConfigs() {
     // Load all configs up front so we can use them in the cache key

package/lib/requests/ConfigRequest.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getConfigHash = getConfigHash;
 exports.getConfigKeyContentHash = getConfigKeyContentHash;
 exports.getConfigRequests = getConfigRequests;
+exports.getValueAtPath = getValueAtPath;
 exports.loadPluginConfig = loadPluginConfig;
 exports.runConfigRequest = runConfigRequest;
 function _utils() {
@@ -86,19 +87,41 @@ async function loadPluginConfig(loadedPlugin, config, options) {
     });
   }
 }
+
+/**
+ * Return value at a given key path within an object.
+ *
+ * @example
+ *     const obj = { a: { b: { c: 'd' } } };
+ *     getValueAtPath(obj, ['a', 'b', 'c']);        // 'd'
+ *     getValueAtPath(obj, ['a', 'b', 'd']);        // undefined
+ *     getValueAtPath(obj, ['a', 'b']);             // { c: 'd' }
+ *     getValueAtPath(obj, ['a', 'b', 'c', 'd']);   // undefined
+ */
+function getValueAtPath(obj, key) {
+  let current = obj;
+  for (let part of key) {
+    if (current == null) {
+      return undefined;
+    }
+    current = current[part];
+  }
+  return current;
+}
 const configKeyCache = (0, _buildCache().createBuildCache)();
 async function getConfigKeyContentHash(filePath, configKey, options) {
-  let cacheKey = `${(0, _projectPath.fromProjectPathRelative)(filePath)}:${configKey}`;
+  let cacheKey = `${(0, _projectPath.fromProjectPathRelative)(filePath)}:${JSON.stringify(configKey)}`;
   let cachedValue = configKeyCache.get(cacheKey);
   if (cachedValue) {
     return cachedValue;
   }
-  let conf = await (0, _utils().readConfig)(options.inputFS, (0, _projectPath.fromProjectPath)(options.projectRoot, filePath));
-  if (conf == null || conf.config[configKey] == null) {
+  const conf = await (0, _utils().readConfig)(options.inputFS, (0, _projectPath.fromProjectPath)(options.projectRoot, filePath));
+  const value = getValueAtPath(conf === null || conf === void 0 ? void 0 : conf.config, configKey);
+  if (conf == null || value == null) {
     // This can occur when a config key has been removed entirely during `respondToFSEvents`
     return '';
   }
-  let contentHash = typeof conf.config[configKey] === 'object' ? (0, _utils().hashObject)(conf.config[configKey]) : (0, _rust().hashString)(JSON.stringify(conf.config[configKey]));
+  const contentHash = typeof value === 'object' ? (0, _utils().hashObject)(value) : (0, _rust().hashString)(JSON.stringify(value));
   configKeyCache.set(cacheKey, contentHash);
   return contentHash;
 }

package/lib/requests/TargetRequest.js

@@ -69,6 +69,7 @@ var _Environment2 = require("../public/Environment");
 var _utils2 = require("../utils");
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
+var _EnvironmentManager = require("../EnvironmentManager");
 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; }
@@ -245,7 +246,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`,
@@ -1073,22 +1074,23 @@ 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;
     }
     let highlights = [];
@@ -1124,7 +1126,7 @@ 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])}`);
+        highlight.inferred.push((0, _diagnostic().md)`${key} to be ${JSON.stringify(env[key])}`);
       }
     }
 
@@ -1150,12 +1152,12 @@ 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).map(([k]) => JSON.stringify(k)));
     }
     let format = v => v.message != null ? _diagnostic().md.italic(v.message) : '';
     _logger().default.verbose({
@@ -1164,12 +1166,12 @@ async function debugResolvedTargets(input, targets, targetInfo, options) {
 
                **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

package/lib/requests/WriteBundleRequest.js

@@ -61,6 +61,14 @@ function _profiler() {
   return data;
 }
 var _RequestTracker = require("../RequestTracker");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
+var _EnvironmentManager = require("../EnvironmentManager");
 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 }; }
@@ -114,7 +122,8 @@ async function run({
   let cacheKeys = info.cacheKeys;
   let mapKey = cacheKeys.map;
   let fullPath = (0, _projectPath.fromProjectPath)(options.projectRoot, filePath);
-  if (mapKey && bundle.env.sourceMap && !bundle.env.sourceMap.inline) {
+  const env = (0, _EnvironmentManager.fromEnvironmentId)(bundle.env);
+  if (mapKey && env.sourceMap && !env.sourceMap.inline) {
     api.invalidateOnFileDelete((0, _projectPath.toProjectPath)(options.projectRoot, fullPath + '.map'));
   }
   let dir = _path().default.dirname(fullPath);
@@ -145,11 +154,14 @@ async function run({
   } = await (0, _DevDepRequest.getDevDepRequests)(api);
   (0, _DevDepRequest.invalidateDevDeps)(invalidDevDeps, options, config);
   await writeFiles(contentStream, info, hashRefToNameHash, options, config, outputFS, filePath, writeOptions, devDeps, api);
-  if (mapKey && bundle.env.sourceMap && !bundle.env.sourceMap.inline && (await options.cache.has(mapKey))) {
-    await writeFiles((0, _utils().blobToStream)(await options.cache.getBlob(mapKey)), info, hashRefToNameHash, options, config, outputFS, (0, _projectPath.toProjectPathUnsafe)((0, _projectPath.fromProjectPathRelative)(filePath) + '.map'), writeOptions, devDeps, api);
+  const hasSourceMap = (0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements') ? await options.cache.hasLargeBlob(mapKey) : await options.cache.has(mapKey);
+  if (mapKey && env.sourceMap && !env.sourceMap.inline && hasSourceMap) {
+    const mapEntry = (0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements') ? await options.cache.getLargeBlob(mapKey) : await options.cache.getBlob(mapKey);
+    await writeFiles((0, _utils().blobToStream)(mapEntry), info, hashRefToNameHash, options, config, outputFS, (0, _projectPath.toProjectPathUnsafe)((0, _projectPath.fromProjectPathRelative)(filePath) + '.map'), writeOptions, devDeps, api);
   }
   let res = {
     filePath,
+    bundleId: bundle.id,
     type: info.type,
     stats: {
       size,

package/lib/requests/WriteBundlesRequest.js

@@ -76,6 +76,7 @@ async function run({
       let name = (0, _nullthrows().default)(bundle.name, `Expected ${bundle.type} bundle to have a name`).replace(bundle.hashReference, hash);
       res.set(bundle.id, {
         filePath: (0, _projectPath.joinProjectPath)(bundle.target.distDir, name),
+        bundleId: bundle.id,
         type: bundle.type,
         // FIXME: this is wrong if the packager changes the type...
         stats: {

package/lib/resolveOptions.js

@@ -144,8 +144,10 @@ async function resolveOptions(initialOptions) {
       return initialOptions.cache;
     }
     const needsRustLmdbCache = (0, _featureFlags().getFeatureFlag)('atlaspackV3');
-    if (!needsRustLmdbCache && !(outputFS instanceof _fs().NodeFS)) {
-      return new (_cache().FSCache)(outputFS, cacheDir);
+    if (!(0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
+      if (!needsRustLmdbCache && !(outputFS instanceof _fs().NodeFS)) {
+        return new (_cache().FSCache)(outputFS, cacheDir);
+      }
     }
     return new (_cache().LMDBLiteCache)(cacheDir);
   }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.17.3",
+  "version": "2.18.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -23,20 +23,20 @@
   "dependencies": {
     "@mischnic/json-sourcemap": "^0.1.0",
     "@atlaspack/build-cache": "2.13.3",
-    "@atlaspack/cache": "3.2.3",
+    "@atlaspack/cache": "3.2.5",
     "@atlaspack/diagnostic": "2.14.1",
     "@atlaspack/events": "2.14.1",
-    "@atlaspack/feature-flags": "2.15.1",
-    "@atlaspack/fs": "2.15.3",
-    "@atlaspack/graph": "3.4.6",
-    "@atlaspack/logger": "2.14.8",
-    "@atlaspack/package-manager": "2.14.8",
-    "@atlaspack/plugin": "2.14.8",
-    "@atlaspack/profiler": "2.14.6",
-    "@atlaspack/rust": "3.3.3",
-    "@atlaspack/types": "2.14.8",
-    "@atlaspack/utils": "2.14.8",
-    "@atlaspack/workers": "2.14.8",
+    "@atlaspack/feature-flags": "2.16.0",
+    "@atlaspack/fs": "2.15.5",
+    "@atlaspack/graph": "3.4.7",
+    "@atlaspack/logger": "2.14.10",
+    "@atlaspack/package-manager": "2.14.10",
+    "@atlaspack/plugin": "2.14.10",
+    "@atlaspack/profiler": "2.14.8",
+    "@atlaspack/rust": "3.3.5",
+    "@atlaspack/types": "2.15.0",
+    "@atlaspack/utils": "2.14.10",
+    "@atlaspack/workers": "2.14.10",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",

package/src/AssetGraph.js

@@ -29,6 +29,8 @@ import nullthrows from 'nullthrows';
 import {ContentGraph} from '@atlaspack/graph';
 import {createDependency} from './Dependency';
 import {type ProjectPath, fromProjectPathRelative} from './projectPath';
+import {fromEnvironmentId, toEnvironmentId} from './EnvironmentManager';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 type InitOpts = {|
   entries?: Array<ProjectPath>,
@@ -65,7 +67,7 @@ export function nodeFromAssetGroup(assetGroup: AssetGroup): AssetGroupNode {
   return {
     id: hashString(
       fromProjectPathRelative(assetGroup.filePath) +
-        assetGroup.env.id +
+        toEnvironmentId(assetGroup.env) +
         String(assetGroup.isSource) +
         String(assetGroup.sideEffects) +
         (assetGroup.code ?? '') +
@@ -149,14 +151,18 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
 
   // Deduplicates Environments by making them referentially equal
   normalizeEnvironment(input: Asset | Dependency | AssetGroup) {
-    let {id, context} = input.env;
+    if (getFeatureFlag('environmentDeduplication')) {
+      return;
+    }
+
+    let {id, context} = fromEnvironmentId(input.env);
     let idAndContext = `${id}-${context}`;
 
     let env = this.envCache.get(idAndContext);
     if (env) {
       input.env = env;
     } else {
-      this.envCache.set(idAndContext, input.env);
+      this.envCache.set(idAndContext, fromEnvironmentId(input.env));
     }
   }
 
@@ -235,13 +241,13 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
           env: target.env,
           isEntry: true,
           needsStableName: true,
-          symbols: target.env.isLibrary
+          symbols: fromEnvironmentId(target.env).isLibrary
             ? new Map([['*', {local: '*', isWeak: true, loc: null}]])
             : undefined,
         }),
       );
 
-      if (node.value.env.isLibrary) {
+      if (fromEnvironmentId(node.value.env).isLibrary) {
         // in library mode, all of the entry's symbols are "used"
         node.usedSymbolsDown.add('*');
         node.usedSymbolsUp.set('*', undefined);
@@ -428,7 +434,7 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
 
       let depIsDeferrable =
         d.symbols &&
-        !(d.env.isLibrary && d.isEntry) &&
+        !(fromEnvironmentId(d.env).isLibrary && d.isEntry) &&
         !d.symbols.has('*') &&
         ![...d.symbols.keys()].some((symbol) => {
           let assetSymbol = resolvedAsset.symbols?.get(symbol)?.local;

package/src/Atlaspack.js

@@ -533,10 +533,11 @@ export default class Atlaspack {
           nativeInvalid = await this.rustAtlaspack.respondToFsEvents(events);
         }
 
-        let isInvalid = await this.#requestTracker.respondToFSEvents(
-          events,
-          Number.POSITIVE_INFINITY,
-        );
+        let {didInvalidate: isInvalid} =
+          await this.#requestTracker.respondToFSEvents(
+            events,
+            Number.POSITIVE_INFINITY,
+          );
 
         if (
           (nativeInvalid || isInvalid) &&