@atlaspack/core 2.16.2-dev.95 → 2.16.2-dev.97

package/lib/AssetGraph.js

@@ -148,7 +148,7 @@ class AssetGraph extends _graph().ContentGraph {
     let idAndContext = `${id}-${context}`;
     let env = this.envCache.get(idAndContext);
     if (env) {
-      input.env = env;
+      input.env = (0, _EnvironmentManager.toEnvironmentRef)(env);
     } else {
       this.envCache.set(idAndContext, (0, _EnvironmentManager.fromEnvironmentId)(input.env));
     }

package/lib/Environment.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEnvironment = createEnvironment;
+exports.getEnvironmentHash = getEnvironmentHash;
 exports.mergeEnvironments = mergeEnvironments;
 function _rust() {
   const data = require("@atlaspack/rust");

package/lib/atlaspack-v3/worker/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-if (process.env.ATLASPACK_BUILD_ENV !== 'production' || process.env.ATLASPACK_SELF_BUILD) {
+if (process.env.ATLASPACK_DEV === 'true' || process.env.ATLASPACK_BUILD_ENV === 'test' || process.env.ATLASPACK_SELF_BUILD) {
   require('@atlaspack/babel-register');
 }
 require('./worker');

package/lib/requests/AssetGraphRequestRust.js

@@ -26,9 +26,18 @@ function _logger() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 var _AssetGraph = _interopRequireWildcard(require("../AssetGraph"));
 var _RequestTracker = require("../RequestTracker");
 var _SymbolPropagation = require("../SymbolPropagation");
+var _EnvironmentManager = require("../EnvironmentManager");
+var _Environment = require("../Environment");
 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 }; }
@@ -137,8 +146,11 @@ function getAssetGraph(serializedGraph) {
       let id = asset.id;
       asset.committed = true;
       asset.contentKey = id;
-      asset.env.id = getEnvId(asset.env);
+      asset.env.id = (0, _featureFlags().getFeatureFlag)('environmentDeduplication') ?
+      // TODO: Rust can do this and avoid copying a significant amount of data over
+      (0, _Environment.getEnvironmentHash)(asset.env) : getEnvId(asset.env);
       asset.mapKey = `map:${asset.id}`;
+      asset.env = (0, _EnvironmentManager.toEnvironmentRef)(asset.env);
 
       // This is populated later when we map the edges between assets and dependencies
       asset.dependencies = new Map();
@@ -162,7 +174,10 @@ function getAssetGraph(serializedGraph) {
       let id = node.value.id;
       let dependency = node.value.dependency;
       dependency.id = id;
-      dependency.env.id = getEnvId(dependency.env);
+      dependency.env.id = (0, _featureFlags().getFeatureFlag)('environmentDeduplication') ?
+      // TODO: Rust can do this and avoid copying a significant amount of data over
+      (0, _Environment.getEnvironmentHash)(dependency.env) : getEnvId(dependency.env);
+      dependency.env = (0, _EnvironmentManager.toEnvironmentRef)(dependency.env);
       if (dependency.symbols != null) {
         var _dependency$symbols;
         dependency.symbols = new Map((_dependency$symbols = dependency.symbols) === null || _dependency$symbols === void 0 ? void 0 : _dependency$symbols.map(mapSymbols));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-dev.95+d8e35a83e",
+  "version": "2.16.2-dev.97+70270d69e",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,21 +21,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-dev.163+d8e35a83e",
-    "@atlaspack/cache": "3.1.1-dev.95+d8e35a83e",
-    "@atlaspack/diagnostic": "2.14.1-dev.163+d8e35a83e",
-    "@atlaspack/events": "2.14.1-dev.163+d8e35a83e",
-    "@atlaspack/feature-flags": "2.14.1-dev.163+d8e35a83e",
-    "@atlaspack/fs": "2.14.5-dev.95+d8e35a83e",
-    "@atlaspack/graph": "3.4.1-dev.163+d8e35a83e",
-    "@atlaspack/logger": "2.14.5-dev.95+d8e35a83e",
-    "@atlaspack/package-manager": "2.14.5-dev.95+d8e35a83e",
-    "@atlaspack/plugin": "2.14.5-dev.95+d8e35a83e",
-    "@atlaspack/profiler": "2.14.1-dev.163+d8e35a83e",
-    "@atlaspack/rust": "3.2.1-dev.95+d8e35a83e",
-    "@atlaspack/types": "2.14.5-dev.95+d8e35a83e",
-    "@atlaspack/utils": "2.14.5-dev.95+d8e35a83e",
-    "@atlaspack/workers": "2.14.5-dev.95+d8e35a83e",
+    "@atlaspack/build-cache": "2.13.3-dev.165+70270d69e",
+    "@atlaspack/cache": "3.1.1-dev.97+70270d69e",
+    "@atlaspack/diagnostic": "2.14.1-dev.165+70270d69e",
+    "@atlaspack/events": "2.14.1-dev.165+70270d69e",
+    "@atlaspack/feature-flags": "2.14.1-dev.165+70270d69e",
+    "@atlaspack/fs": "2.14.5-dev.97+70270d69e",
+    "@atlaspack/graph": "3.4.1-dev.165+70270d69e",
+    "@atlaspack/logger": "2.14.5-dev.97+70270d69e",
+    "@atlaspack/package-manager": "2.14.5-dev.97+70270d69e",
+    "@atlaspack/plugin": "2.14.5-dev.97+70270d69e",
+    "@atlaspack/profiler": "2.14.1-dev.165+70270d69e",
+    "@atlaspack/rust": "3.2.1-dev.97+70270d69e",
+    "@atlaspack/types": "2.14.5-dev.97+70270d69e",
+    "@atlaspack/utils": "2.14.5-dev.97+70270d69e",
+    "@atlaspack/workers": "2.14.5-dev.97+70270d69e",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -60,5 +60,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "d8e35a83e480e0811b63a319e88ffe9a2cd509e6"
+  "gitHead": "70270d69e3144a59f39970e1bcaa61c779342b11"
 }

package/src/AssetGraph.js

@@ -29,7 +29,11 @@ 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 {
+  fromEnvironmentId,
+  toEnvironmentId,
+  toEnvironmentRef,
+} from './EnvironmentManager';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 type InitOpts = {|
@@ -160,7 +164,7 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
 
     let env = this.envCache.get(idAndContext);
     if (env) {
-      input.env = env;
+      input.env = toEnvironmentRef(env);
     } else {
       this.envCache.set(idAndContext, fromEnvironmentId(input.env));
     }

package/src/Environment.js

@@ -140,7 +140,7 @@ export function mergeEnvironments(
   });
 }
 
-function getEnvironmentHash(env: Environment): string {
+export function getEnvironmentHash(env: Environment): string {
   const data = {
     context: env.context,
     engines: env.engines,

package/src/EnvironmentManager.js

@@ -21,7 +21,7 @@ export opaque type EnvironmentId = string;
 /**
  * When deduplication is cleaned-up this will always be a string.
  */
-export type EnvironmentRef = EnvironmentId | CoreEnvironment;
+export opaque type EnvironmentRef = EnvironmentId | CoreEnvironment;
 
 /**
  * Convert environment to a ref.

package/src/atlaspack-v3/worker/index.js

@@ -1,5 +1,6 @@
 if (
-  process.env.ATLASPACK_BUILD_ENV !== 'production' ||
+  process.env.ATLASPACK_DEV === 'true' ||
+  process.env.ATLASPACK_BUILD_ENV === 'test' ||
   process.env.ATLASPACK_SELF_BUILD
 ) {
   require('@atlaspack/babel-register');

package/src/public/MutableBundleGraph.js

@@ -11,6 +11,7 @@ import type {
 } from '@atlaspack/types';
 import type {
   AtlaspackOptions,
+  BundleGraphNode,
   BundleGroup as InternalBundleGroup,
   BundleNode,
 } from '../types';
@@ -207,7 +208,8 @@ export default class MutableBundleGraph
       bundleBehavior: opts.bundleBehavior ?? null,
     });
 
-    let existing = this.#graph._graph.getNodeByContentKey(bundleId);
+    let existing: ?BundleGraphNode =
+      this.#graph._graph.getNodeByContentKey(bundleId);
     if (existing != null) {
       invariant(existing.type === 'bundle');
       return Bundle.get(existing.value, this.#graph, this.#options);

package/src/requests/AssetGraphRequestRust.js

@@ -5,6 +5,7 @@ import invariant from 'assert';
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 import type {Async} from '@atlaspack/types';
 import {instrument} from '@atlaspack/logger';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 import AssetGraph, {nodeFromAssetGroup} from '../AssetGraph';
 import type {AtlaspackV3} from '../atlaspack-v3';
@@ -16,6 +17,8 @@ import type {
   AssetGraphRequestInput,
   AssetGraphRequestResult,
 } from './AssetGraphRequest';
+import {toEnvironmentRef} from '../EnvironmentManager';
+import {getEnvironmentHash} from '../Environment';
 
 type RunInput = {|
   input: AssetGraphRequestInput,
@@ -166,9 +169,14 @@ export function getAssetGraph(serializedGraph: any): {
 
       asset.committed = true;
       asset.contentKey = id;
-      asset.env.id = getEnvId(asset.env);
+      asset.env.id = getFeatureFlag('environmentDeduplication')
+        ? // TODO: Rust can do this and avoid copying a significant amount of data over
+          getEnvironmentHash(asset.env)
+        : getEnvId(asset.env);
       asset.mapKey = `map:${asset.id}`;
 
+      asset.env = toEnvironmentRef(asset.env);
+
       // This is populated later when we map the edges between assets and dependencies
       asset.dependencies = new Map();
 
@@ -195,7 +203,11 @@ export function getAssetGraph(serializedGraph: any): {
       let dependency = node.value.dependency;
 
       dependency.id = id;
-      dependency.env.id = getEnvId(dependency.env);
+      dependency.env.id = getFeatureFlag('environmentDeduplication')
+        ? // TODO: Rust can do this and avoid copying a significant amount of data over
+          getEnvironmentHash(dependency.env)
+        : getEnvId(dependency.env);
+      dependency.env = toEnvironmentRef(dependency.env);
 
       if (dependency.symbols != null) {
         dependency.symbols = new Map(dependency.symbols?.map(mapSymbols));