@atlaspack/core 2.16.2-canary.48 → 2.16.2-canary.481

package/lib/SymbolPropagation.js

@@ -41,9 +41,8 @@ function _diagnostic() {
 }
 var _types = require("./types");
 var _projectPath = require("./projectPath");
-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 }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function propagateSymbols({
   options,
   assetGraph,
@@ -72,6 +71,11 @@ function propagateSymbols({
 
     // Propagate the requested symbols down from the root to the leaves
     propagateSymbolsDown(assetGraph, changedAssets, assetGroupsWithRemovedParents, (assetNode, incomingDeps, outgoingDeps) => {
+      if (assetNode.value.meta.emptyFileStarReexport && incomingDeps.every(d => d.value.specifierType === _types.SpecifierType.esm)) {
+        var _assetNode$value$symb;
+        (_assetNode$value$symb = assetNode.value.symbols) === null || _assetNode$value$symb === void 0 || _assetNode$value$symb.delete('*');
+      }
+
       // exportSymbol -> identifier
       let assetSymbols = assetNode.value.symbols;
       // identifier -> exportSymbol
@@ -90,8 +94,8 @@ function propagateSymbols({
         }
       }
       let hasNamespaceOutgoingDeps = outgoingDeps.some(d => {
-        var _d$value$symbols;
-        return ((_d$value$symbols = d.value.symbols) === null || _d$value$symbols === void 0 || (_d$value$symbols = _d$value$symbols.get('*')) === null || _d$value$symbols === void 0 ? void 0 : _d$value$symbols.local) === '*';
+        var _d$value$symbols, _d$value$meta;
+        return ((_d$value$symbols = d.value.symbols) === null || _d$value$symbols === void 0 || (_d$value$symbols = _d$value$symbols.get('*')) === null || _d$value$symbols === void 0 ? void 0 : _d$value$symbols.local) === '*' || ((_d$value$meta = d.value.meta) === null || _d$value$meta === void 0 ? void 0 : _d$value$meta.hasExportStar);
       });
 
       // 1) Determine what the incomingDeps requests from the asset
@@ -151,6 +155,7 @@ function propagateSymbols({
       for (let dep of outgoingDeps) {
         let depUsedSymbolsDownOld = dep.usedSymbolsDown;
         let depUsedSymbolsDown = new Set();
+        // @ts-expect-error TS2322
         dep.usedSymbolsDown = depUsedSymbolsDown;
         if (assetNode.value.sideEffects ||
         // Incoming dependency with cleared symbols
@@ -163,10 +168,10 @@ function propagateSymbols({
         //    lib/index.js: `export * from "./foo.js"; export * from "./bar.js";`
         //    lib/foo.js:   `import { data } from "./bar.js"; export const foo = data + " esm2";`
         assetNode.usedSymbols.size > 0 || namespaceReexportedSymbols.size > 0) {
-          var _depSymbols$get;
+          var _depSymbols$get, _dep$value$meta;
           let depSymbols = dep.value.symbols;
           if (!depSymbols) continue;
-          if (((_depSymbols$get = depSymbols.get('*')) === null || _depSymbols$get === void 0 ? void 0 : _depSymbols$get.local) === '*') {
+          if (((_depSymbols$get = depSymbols.get('*')) === null || _depSymbols$get === void 0 ? void 0 : _depSymbols$get.local) === '*' || (_dep$value$meta = dep.value.meta) !== null && _dep$value$meta !== void 0 && _dep$value$meta.hasExportStar) {
             if (addAll) {
               depUsedSymbolsDown.add('*');
             } else {
@@ -253,7 +258,7 @@ function propagateSymbols({
       // analyzable exports
       let reexportedSymbolsSource = new Map();
       for (let outgoingDep of outgoingDeps) {
-        var _outgoingDepSymbols$g;
+        var _outgoingDepSymbols$g, _outgoingDep$value$me;
         let outgoingDepSymbols = outgoingDep.value.symbols;
         if (!outgoingDepSymbols) continue;
         let isExcluded = assetGraph.getNodeIdsConnectedFrom(assetGraph.getNodeIdByContentKey(outgoingDep.id)).length === 0;
@@ -261,7 +266,7 @@ function propagateSymbols({
         if (isExcluded) {
           outgoingDep.usedSymbolsDown.forEach((_, s) => outgoingDep.usedSymbolsUp.set(s, null));
         }
-        if (((_outgoingDepSymbols$g = outgoingDepSymbols.get('*')) === null || _outgoingDepSymbols$g === void 0 ? void 0 : _outgoingDepSymbols$g.local) === '*') {
+        if (((_outgoingDepSymbols$g = outgoingDepSymbols.get('*')) === null || _outgoingDepSymbols$g === void 0 ? void 0 : _outgoingDepSymbols$g.local) === '*' || (_outgoingDep$value$me = outgoingDep.value.meta) !== null && _outgoingDep$value$me !== void 0 && _outgoingDep$value$me.hasExportStar) {
           outgoingDep.usedSymbolsUp.forEach((sResolved, s) => {
             if (s === 'default') {
               return;
@@ -329,12 +334,12 @@ function propagateSymbols({
         current.set(s, value);
       }
       for (let incomingDep of incomingDeps) {
-        var _incomingDepSymbols$g;
+        var _incomingDepSymbols$g, _incomingDep$value$me;
         let incomingDepUsedSymbolsUpOld = incomingDep.usedSymbolsUp;
         incomingDep.usedSymbolsUp = new Map();
         let incomingDepSymbols = incomingDep.value.symbols;
         if (!incomingDepSymbols) continue;
-        let hasNamespaceReexport = ((_incomingDepSymbols$g = incomingDepSymbols.get('*')) === null || _incomingDepSymbols$g === void 0 ? void 0 : _incomingDepSymbols$g.local) === '*';
+        let hasNamespaceReexport = ((_incomingDepSymbols$g = incomingDepSymbols.get('*')) === null || _incomingDepSymbols$g === void 0 ? void 0 : _incomingDepSymbols$g.local) === '*' || ((_incomingDep$value$me = incomingDep.value.meta) === null || _incomingDep$value$me === void 0 ? void 0 : _incomingDep$value$me.hasExportStar);
         for (let s of incomingDep.usedSymbolsDown) {
           if (assetSymbols == null ||
           // Assume everything could be provided if symbols are cleared
@@ -359,7 +364,9 @@ function propagateSymbols({
             let resolution = (0, _nullthrows().default)(assetGraph.getNode(resolutionNodeId));
             (0, _assert().default)(resolution && (resolution.type === 'asset_group' || resolution.type === 'asset'));
             errors.push({
-              message: (0, _diagnostic().md)`${(0, _projectPath.fromProjectPathRelative)(resolution.value.filePath)} does not export '${s}'`,
+              message: (0, _diagnostic().md)`${(0, _projectPath.fromProjectPathRelative)(
+              // @ts-expect-error TS2345
+              resolution.value.filePath)} does not export '${s}'`,
               origin: '@atlaspack/core',
               codeFrames: loc ? [{
                 filePath: (0, _projectPath.fromProjectPath)(options.projectRoot, loc === null || loc === void 0 ? void 0 : loc.filePath) ?? undefined,
@@ -375,15 +382,15 @@ function propagateSymbols({
         }
         incomingDep.excluded = false;
         if (incomingDep.value.symbols != null && incomingDep.usedSymbolsUp.size === 0) {
-          let assetGroups = assetGraph.getNodeIdsConnectedFrom(assetGraph.getNodeIdByContentKey(incomingDep.id));
-          if (assetGroups.length === 1) {
-            let [assetGroupId] = assetGroups;
-            let assetGroup = (0, _nullthrows().default)(assetGraph.getNode(assetGroupId));
-            if (assetGroup.type === 'asset_group' && assetGroup.value.sideEffects === false) {
-              incomingDep.excluded = true;
-            }
-          } else {
-            (0, _assert().default)(assetGroups.length === 0);
+          let connectedNodeIds = assetGraph.getNodeIdsConnectedFrom(assetGraph.getNodeIdByContentKey(incomingDep.id));
+          let sideEffectFree = connectedNodeIds.every(nodeId => {
+            let connectedNode = (0, _nullthrows().default)(assetGraph.getNode(nodeId));
+            // Dependencies should only connect to asset_groups or assets
+            (0, _assert().default)(connectedNode.type === 'asset' || connectedNode.type === 'asset_group');
+            return connectedNode.value.sideEffects === false;
+          });
+          if (sideEffectFree) {
+            incomingDep.excluded = true;
           }
         }
       }
@@ -394,7 +401,9 @@ function propagateSymbols({
     // This ensures a consistent ordering of these symbols when packaging.
     // See https://github.com/parcel-bundler/parcel/pull/8212
     for (let dep of changedDeps) {
-      dep.usedSymbolsUp = new Map([...dep.usedSymbolsUp].sort(([a], [b]) => a.localeCompare(b)));
+      dep.usedSymbolsUp = new Map(
+      // @ts-expect-error TS2345
+      [...dep.usedSymbolsUp].sort(([a], [b]) => a.localeCompare(b)));
     }
     return errors;
   });
@@ -475,6 +484,7 @@ function propagateSymbolsUp(assetGraph, changedAssets, changedDepsUsedSymbolsUpD
 
   let errors = previousErrors ?
   // Some nodes might have been removed since the last build
+  // @ts-expect-error TS2769
   new Map([...previousErrors].filter(([n]) => assetGraph.hasNode(n))) : new Map();
   let changedDepsUsedSymbolsUpDirtyDownAssets = new Set([...[...changedDepsUsedSymbolsUpDirtyDown].reverse().flatMap(id => getDependencyResolution(assetGraph, id)), ...changedAssets]);
 
@@ -484,6 +494,8 @@ function propagateSymbolsUp(assetGraph, changedAssets, changedDepsUsedSymbolsUpD
   // If there are n nodes in the graph, then the asset count is approximately
   // n/6 (for every asset, there are ~4 dependencies and ~1 asset_group).
   assetGraph.nodes.length * (1 / 6) * 0.5 < changedDepsUsedSymbolsUpDirtyDownAssets.size;
+
+  // @ts-expect-error TS7034
   let dirtyDeps;
   if (runFullPass) {
     dirtyDeps = new Set();
@@ -518,13 +530,16 @@ function propagateSymbolsUp(assetGraph, changedAssets, changedDepsUsedSymbolsUpD
       } else {
         if (node.type === 'dependency') {
           if (node.usedSymbolsUpDirtyUp) {
+            // @ts-expect-error TS7005
             dirtyDeps.add(nodeId);
           } else {
+            // @ts-expect-error TS7005
             dirtyDeps.delete(nodeId);
           }
         }
       }
     };
+    // @ts-expect-error TS2345
     assetGraph.postOrderDfsFast(nodeVisitor, rootNodeId);
   }
   let queue = dirtyDeps ?? changedDepsUsedSymbolsUpDirtyDownAssets;
@@ -564,6 +579,7 @@ function propagateSymbolsUp(assetGraph, changedAssets, changedDepsUsedSymbolsUpD
     } else {
       let connectedNodes = assetGraph.getNodeIdsConnectedTo(queuedNodeId);
       if (connectedNodes.length > 0) {
+        // @ts-expect-error TS2556
         queue.add(...connectedNodes);
       }
     }
@@ -573,17 +589,22 @@ function propagateSymbolsUp(assetGraph, changedAssets, changedDepsUsedSymbolsUpD
 function getDependencyResolution(graph, depId) {
   let depNodeId = graph.getNodeIdByContentKey(depId);
   let connected = graph.getNodeIdsConnectedFrom(depNodeId);
-  (0, _assert().default)(connected.length <= 1);
-  let child = connected[0];
-  if (child) {
+  let resolvedNodeIds = [];
+
+  // If any of the resolved nodes is an asset_group, we need to resolve its
+  // assets here.
+  for (let child of connected) {
+    if (!child) {
+      continue;
+    }
     let childNode = (0, _nullthrows().default)(graph.getNode(child));
     if (childNode.type === 'asset_group') {
-      return graph.getNodeIdsConnectedFrom(child);
+      resolvedNodeIds.push(...graph.getNodeIdsConnectedFrom(child));
     } else {
-      return [child];
+      resolvedNodeIds.push(child);
     }
   }
-  return [];
+  return resolvedNodeIds;
 }
 function equalMap(a, b) {
   if (a.size !== b.size) return false;
@@ -609,7 +630,9 @@ function dependencyNodesFromIds(assetGraph, dependencyIds) {
     return depNode;
   });
 }
-function incomingDependencyNodesFromAsset(assetGraph, assetNodeValue) {
+function incomingDependencyNodesFromAsset(assetGraph,
+// @ts-expect-error TS2552
+assetNodeValue) {
   return assetGraph.getIncomingDependencies(assetNodeValue).map(d => {
     let n = assetGraph.getNodeByContentKey(d.id);
     (0, _assert().default)(n && n.type === 'dependency');

package/lib/TargetDescriptor.schema.js

@@ -28,7 +28,7 @@ const PACKAGE_DESCRIPTOR_SCHEMA = exports.PACKAGE_DESCRIPTOR_SCHEMA = {
   properties: {
     context: {
       type: 'string',
-      enum: ['node', 'browser', 'web-worker', 'electron-main', 'electron-renderer', 'service-worker']
+      enum: ['node', 'browser', 'web-worker', 'electron-main', 'electron-renderer', 'service-worker', 'tesseract']
     },
     includeNodeModules: {
       oneOf: [{
@@ -98,6 +98,15 @@ const PACKAGE_DESCRIPTOR_SCHEMA = exports.PACKAGE_DESCRIPTOR_SCHEMA = {
     },
     __unstable_singleFileOutput: {
       type: 'boolean'
+    },
+    env: {
+      type: 'object',
+      additionalProperties: {
+        type: 'string'
+      }
+    },
+    inlineRequires: {
+      type: 'boolean'
     }
   },
   additionalProperties: false

package/lib/Transformation.js

@@ -47,7 +47,6 @@ function _utils() {
   return data;
 }
 var _Dependency = require("./Dependency");
-var _AtlaspackConfig = require("./AtlaspackConfig");
 var _PathRequest = require("./requests/PathRequest");
 var _Asset = require("./public/Asset");
 var _UncommittedAsset = _interopRequireDefault(require("./UncommittedAsset"));
@@ -73,10 +72,34 @@ function _profiler() {
   };
   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 }; }
+function _sourceMap() {
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
+  _sourceMap = function () {
+    return data;
+  };
+  return data;
+}
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // TODO: eventually call path request as sub requests
+
+// Global setup config are not file-specific, so we only need to
+// load them once per build.
+const setupConfig = (0, _buildCache().createBuildCache)();
 class Transformation {
   constructor({
     request,
@@ -127,10 +150,14 @@ class Transformation {
       // If no existing sourcemap was found, initialize asset.sourceContent
       // with the original contents. This will be used when the transformer
       // calls setMap to ensure the source content is in the sourcemap.
-      asset.sourceContent = await asset.getCode();
+      if (!(0, _featureFlags().getFeatureFlag)('omitSourcesContentInMemory')) {
+        asset.sourceContent = await asset.getCode();
+      }
     }
     (0, _DevDepRequest.invalidateDevDeps)(this.request.invalidDevDeps, this.options, this.atlaspackConfig);
-    let pipeline = await this.loadPipeline(this.request.filePath, asset.value.isSource, asset.value.pipeline);
+    let pipeline = await this.loadPipeline(
+    // @ts-expect-error TS2345
+    this.request.filePath, asset.value.isSource, asset.value.pipeline);
     let assets, error;
     try {
       let results = await this.runPipelines(pipeline, asset);
@@ -141,9 +168,8 @@ class Transformation {
     }
     let configRequests = (0, _ConfigRequest.getConfigRequests)([...this.configs.values(), ...this.resolverRunner.configs.values()]);
     let devDepRequests = (0, _DevDepRequest.getWorkerDevDepRequests)([...this.devDepRequests.values(), ...this.resolverRunner.devDepRequests.values()]);
-
-    // $FlowFixMe because of $$raw
     return {
+      // @ts-expect-error TS2353
       $$raw: true,
       assets,
       configRequests,
@@ -168,19 +194,23 @@ class Transformation {
       size,
       isSource: summarizedIsSource
     } = await (0, _summarizeRequest.default)(this.options.inputFS, {
+      // @ts-expect-error TS2322
       filePath: (0, _projectPath.fromProjectPath)(this.options.projectRoot, filePath),
       code
     });
 
     // Prefer `isSource` originating from the AssetRequest.
-
+    let isSource = isSourceOverride ?? summarizedIsSource;
     return new _UncommittedAsset.default({
       value: (0, _assetUtils.createAsset)(this.options.projectRoot, {
         code,
+        // @ts-expect-error TS2322
         filePath,
-        isSource: isSourceOverride ?? summarizedIsSource,
+        isSource,
+        // @ts-expect-error TS2345
         type: _path().default.extname((0, _projectPath.fromProjectPathRelative)(filePath)).slice(1),
         pipeline,
+        // @ts-expect-error TS2322
         env,
         query,
         stats: {
@@ -329,10 +359,9 @@ class Transformation {
     // generate all assets in a large bundle during packaging.
     await Promise.all(resultingAssets.filter(asset => asset.ast != null && !(this.options.mode === 'production' && asset.value.type === 'css' && asset.value.symbols)).map(async asset => {
       if (asset.isASTDirty && asset.generate) {
-        var _output$map;
         let output = await asset.generate();
         asset.content = output.content;
-        asset.mapBuffer = (_output$map = output.map) === null || _output$map === void 0 ? void 0 : _output$map.toBuffer();
+        asset.mapBuffer = _sourceMap().default.safeToBuffer(output.map);
       }
       asset.clearAST();
     }));
@@ -379,13 +408,34 @@ class Transformation {
     return nextPipeline;
   }
   async loadTransformerConfig(transformer, isSource) {
+    // Only load setup config for a transformer once per build.
+    let config = setupConfig.get(transformer.name);
+    if (config == null && transformer.plugin.setup != null) {
+      config = (0, _InternalConfig.createConfig)({
+        plugin: transformer.name,
+        searchPath: (0, _projectPath.toProjectPathUnsafe)('index'),
+        // Consider project setup config as source
+        isSource: true
+      });
+      await (0, _ConfigRequest.loadPluginSetup)(transformer.name, transformer.plugin.setup, config, this.options);
+      setupConfig.set(transformer.name, config);
+    }
+    if (config != null) {
+      for (let devDep of config.devDeps) {
+        await this.addDevDependency(devDep);
+      }
+
+      // `loadConfig` is not called for setup configs
+      return config;
+    }
     let loadConfig = transformer.plugin.loadConfig;
     if (!loadConfig) {
       return;
     }
-    let config = (0, _InternalConfig.createConfig)({
+    config = (0, _InternalConfig.createConfig)({
       plugin: transformer.name,
       isSource,
+      // @ts-expect-error TS2322
       searchPath: this.request.filePath,
       env: this.request.env
     });
@@ -425,6 +475,8 @@ class Transformation {
           diagnostic: result.diagnostics
         });
       }
+
+      // @ts-expect-error TS2322
       return (0, _projectPath.fromProjectPath)(this.options.projectRoot, (0, _nullthrows().default)(result.assetGroup).filePath);
     };
 
@@ -436,10 +488,9 @@ class Transformation {
       logger,
       tracer
     })) && asset.generate) {
-      var _output$map2;
       let output = await asset.generate();
       asset.content = output.content;
-      asset.mapBuffer = (_output$map2 = output.map) === null || _output$map2 === void 0 ? void 0 : _output$map2.toBuffer();
+      asset.mapBuffer = _sourceMap().default.safeToBuffer(output.map);
     }
 
     // Load config for the transformer.
@@ -463,9 +514,8 @@ class Transformation {
     }
 
     // Transform.
-    let transfomerResult =
-    // $FlowFixMe the returned IMutableAsset really is a MutableAsset
-    await transformer.transform({
+    // @ts-expect-error TS2322
+    let transfomerResult = await transformer.transform({
       asset: new _Asset.MutableAsset(asset),
       config,
       options: pipeline.pluginOptions,
@@ -507,7 +557,6 @@ class Transformation {
         )));
       };
     }
-
     return results;
   }
 }

package/lib/UncommittedAsset.js

@@ -19,7 +19,7 @@ function _stream() {
   return data;
 }
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@parcel/source-map"));
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap = function () {
     return data;
   };
@@ -53,14 +53,8 @@ var _assetUtils = require("./assetUtils");
 var _types = require("./types");
 var _utils2 = require("./utils");
 var _projectPath = require("./projectPath");
-function _featureFlags() {
-  const data = require("@atlaspack/feature-flags");
-  _featureFlags = function () {
-    return data;
-  };
-  return data;
-}
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _EnvironmentManager = require("./EnvironmentManager");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class UncommittedAsset {
   constructor({
     value,
@@ -123,7 +117,9 @@ class UncommittedAsset {
     let size = 0;
     if (content instanceof _stream().Readable) {
       let hash = new (_rust().Hash)();
-      await this.options.cache.setStream(contentKey, content.pipe(new (_utils().TapStream)(buf => {
+      await this.options.cache.setStream(contentKey, content.pipe(
+      // @ts-expect-error TS2554
+      new (_utils().TapStream)(buf => {
         hash.writeBuffer(buf);
         size += buf.length;
       })));
@@ -156,6 +152,7 @@ class UncommittedAsset {
     if (typeof content === 'string' || content instanceof Buffer) {
       return content.toString();
     } else if (content != null) {
+      // @ts-expect-error TS2345
       this.content = (0, _utils().bufferStream)(content);
       return (await this.content).toString();
     }
@@ -170,6 +167,8 @@ class UncommittedAsset {
     } else if (typeof content === 'string') {
       return Buffer.from(content);
     }
+
+    // @ts-expect-error TS2345
     this.content = (0, _utils().bufferStream)(content);
     return this.content;
   }
@@ -212,7 +211,7 @@ class UncommittedAsset {
     });
     if (map) {
       this.map = map;
-      this.mapBuffer = map.toBuffer();
+      this.mapBuffer = _sourceMap().default.safeToBuffer(map);
       this.setCode(code.replace(_utils().SOURCEMAP_RE, ''));
     }
     return this.map;
@@ -236,9 +235,7 @@ class UncommittedAsset {
     // a previous source map. Ensure that the map set by the transformer has the original
     // source content available.
     if (map != null && this.sourceContent != null) {
-      map.setSourceContent((0, _projectPath.fromProjectPath)(this.options.projectRoot, this.value.filePath),
-      // $FlowFixMe
-      this.sourceContent);
+      map.setSourceContent((0, _projectPath.fromProjectPath)(this.options.projectRoot, this.value.filePath), this.sourceContent);
       this.sourceContent = null;
     }
     this.map = map;
@@ -261,10 +258,6 @@ class UncommittedAsset {
     this.value.astGenerator = null;
   }
   getCacheKey(key) {
-    if ((0, _featureFlags().getFeatureFlag)('cachePerformanceImprovements')) {
-      const filePath = (0, _projectPath.fromProjectPathRelative)(this.value.filePath);
-      return `Asset/${_constants.ATLASPACK_VERSION}/${filePath}/${this.value.id}/${key}`;
-    }
     return (0, _rust().hashString)(_constants.ATLASPACK_VERSION + key + this.value.id);
   }
   addDependency(opts) {
@@ -276,9 +269,9 @@ class UncommittedAsset {
     } = opts;
     let dep = (0, _Dependency.createDependency)(this.options.projectRoot, {
       ...rest,
-      // $FlowFixMe "convert" the $ReadOnlyMaps to the interal mutable one
+      // @ts-expect-error TS2322
       symbols,
-      env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, this.value.env, env),
+      env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, (0, _EnvironmentManager.fromEnvironmentId)(this.value.env), env),
       sourceAssetId: this.value.id,
       sourcePath: (0, _projectPath.fromProjectPath)(this.options.projectRoot, this.value.filePath)
     });
@@ -318,7 +311,7 @@ class UncommittedAsset {
         bundleBehavior: result.bundleBehavior ?? (this.value.bundleBehavior == null ? null : _types.BundleBehaviorNames[this.value.bundleBehavior]),
         isBundleSplittable: result.isBundleSplittable ?? this.value.isBundleSplittable,
         isSource: this.value.isSource,
-        env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, this.value.env, result.env),
+        env: (0, _Environment.mergeEnvironments)(this.options.projectRoot, (0, _EnvironmentManager.fromEnvironmentId)(this.value.env), result.env),
         dependencies: this.value.type === result.type ? new Map(this.value.dependencies) : new Map(),
         meta: {
           ...this.value.meta,
@@ -329,7 +322,7 @@ class UncommittedAsset {
           time: 0,
           size: this.value.stats.size
         },
-        // $FlowFixMe
+        // @ts-expect-error TS2322
         symbols: result.symbols,
         sideEffects: result.sideEffects ?? this.value.sideEffects,
         uniqueKey: result.uniqueKey,
@@ -345,7 +338,7 @@ class UncommittedAsset {
       content,
       ast: result.ast,
       isASTDirty: result.ast === this.ast ? this.isASTDirty : true,
-      mapBuffer: result.map ? result.map.toBuffer() : null,
+      mapBuffer: _sourceMap().default.safeToBuffer(result.map),
       code: this.code,
       invalidations: this.invalidations
     });
@@ -358,7 +351,7 @@ class UncommittedAsset {
     return asset;
   }
   updateId() {
-    // $FlowFixMe - this is fine
+    // @ts-expect-error TS2345
     this.value.id = (0, _assetUtils.createAssetIdFromOptions)(this.value);
   }
 }

package/lib/Validation.js

@@ -32,7 +32,6 @@ function _diagnostic() {
   };
   return data;
 }
-var _AtlaspackConfig = require("./AtlaspackConfig");
 var _UncommittedAsset = _interopRequireDefault(require("./UncommittedAsset"));
 var _assetUtils = require("./assetUtils");
 var _Asset = require("./public/Asset");
@@ -46,12 +45,14 @@ function _profiler() {
   };
   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 }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class Validation {
   allAssets = {};
   allValidators = {};
+
+  // @ts-expect-error TS2564
+
   constructor({
     config,
     dedicatedThread,
@@ -84,7 +85,9 @@ class Validation {
         let validatorResults = [];
         try {
           // If the plugin supports the single-threading validateAll method, pass all assets to it.
+          // @ts-expect-error TS2339
           if (plugin.validateAll && this.dedicatedThread) {
+            // @ts-expect-error TS2339
             validatorResults = await plugin.validateAll({
               assets: assets.map(asset => new _Asset.Asset(asset)),
               options: pluginOptions,
@@ -95,11 +98,14 @@ class Validation {
           }
 
           // Otherwise, pass the assets one-at-a-time
+          // @ts-expect-error TS2339
           else if (plugin.validate && !this.dedicatedThread) {
             await Promise.all(assets.map(async input => {
               let config = null;
               let publicAsset = new _Asset.Asset(input);
+              // @ts-expect-error TS2339
               if (plugin.getConfig) {
+                // @ts-expect-error TS2339
                 config = await plugin.getConfig({
                   asset: publicAsset,
                   options: pluginOptions,
@@ -108,6 +114,8 @@ class Validation {
                   resolveConfig: configNames => (0, _utils().resolveConfig)(this.options.inputFS, publicAsset.filePath, configNames, this.options.projectRoot)
                 });
               }
+
+              // @ts-expect-error TS2339
               let validatorResult = await plugin.validate({
                 asset: publicAsset,
                 options: pluginOptions,
@@ -134,10 +142,13 @@ class Validation {
     await Promise.all(this.requests.map(async request => {
       this.report({
         type: 'validation',
+        // @ts-expect-error TS2322
         filePath: (0, _projectPath.fromProjectPath)(this.options.projectRoot, request.filePath)
       });
       let asset = await this.loadAsset(request);
-      let validators = await this.atlaspackConfig.getValidators(request.filePath);
+      let validators = await this.atlaspackConfig.getValidators(
+      // @ts-expect-error TS2345
+      request.filePath);
       for (let validator of validators) {
         this.allValidators[validator.name] = validator.plugin;
         if (this.allAssets[validator.name]) {
@@ -179,15 +190,19 @@ class Validation {
       size,
       isSource
     } = await (0, _summarizeRequest.default)(this.options.inputFS, {
+      // @ts-expect-error TS2322
       filePath: (0, _projectPath.fromProjectPath)(this.options.projectRoot, request.filePath)
     });
     return new _UncommittedAsset.default({
       value: (0, _assetUtils.createAsset)(this.options.projectRoot, {
         code,
+        // @ts-expect-error TS2322
         filePath: filePath,
         isSource,
+        // @ts-expect-error TS2345
         type: _path().default.extname((0, _projectPath.fromProjectPathRelative)(filePath)).slice(1),
         query,
+        // @ts-expect-error TS2322
         env: env,
         stats: {
           time: 0,