@atlaspack/core 2.18.3 → 2.18.5

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @atlaspack/core
 
+## 2.18.5
+
+### Patch Changes
+
+- [#652](https://github.com/atlassian-labs/atlaspack/pull/652) [`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956) Thanks [@yamadapc](https://github.com/yamadapc)! - Fix bugs related to build aborts. Builds and cache writes will no longer be aborted.
+
+- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
+  - @atlaspack/feature-flags@2.18.2
+  - @atlaspack/cache@3.2.9
+  - @atlaspack/fs@2.15.9
+  - @atlaspack/graph@3.5.4
+  - @atlaspack/utils@2.15.2
+  - @atlaspack/package-manager@2.14.14
+  - @atlaspack/profiler@2.14.12
+  - @atlaspack/types@2.15.4
+  - @atlaspack/workers@2.14.14
+  - @atlaspack/plugin@2.14.14
+
+## 2.18.4
+
+### Patch Changes
+
+- [#650](https://github.com/atlassian-labs/atlaspack/pull/650) [`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb) Thanks [@alshdavid](https://github.com/alshdavid)! - Remove package.json#exports
+
+- [#646](https://github.com/atlassian-labs/atlaspack/pull/646) [`6b1f5ff`](https://github.com/atlassian-labs/atlaspack/commit/6b1f5fff68d7131fae075e14f4d2c02606dc6058) Thanks [@alshdavid](https://github.com/alshdavid)! - Export WORKER_PATH from @atlaspack/core
+
+- [#633](https://github.com/atlassian-labs/atlaspack/pull/633) [`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b) Thanks [@sbhuiyan-atlassian](https://github.com/sbhuiyan-atlassian)! - Ported various HMR changes from Parcel
+
+- [#648](https://github.com/atlassian-labs/atlaspack/pull/648) [`c8f7df4`](https://github.com/atlassian-labs/atlaspack/commit/c8f7df4eadfc4718040fceb065dae6e96a4051e7) Thanks [@alshdavid](https://github.com/alshdavid)! - Export ATLASPACK_VERSION and other internals
+
+- [#626](https://github.com/atlassian-labs/atlaspack/pull/626) [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca) Thanks [@yamadapc](https://github.com/yamadapc)! - Clean-up tsconfig invalidation improvements feature-flag
+
+- Updated dependencies [[`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb), [`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b), [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca)]:
+  - @atlaspack/workers@2.14.13
+  - @atlaspack/logger@2.14.11
+  - @atlaspack/feature-flags@2.18.1
+  - @atlaspack/fs@2.15.8
+  - @atlaspack/package-manager@2.14.13
+  - @atlaspack/types@2.15.3
+  - @atlaspack/cache@3.2.8
+  - @atlaspack/utils@2.15.1
+  - @atlaspack/graph@3.5.3
+  - @atlaspack/plugin@2.14.13
+  - @atlaspack/profiler@2.14.11
+
 ## 2.18.3
 
 ### Patch Changes

package/lib/AssetGraph.js

@@ -443,6 +443,15 @@ class AssetGraph extends _graph().ContentGraph {
           ...depNode.value.meta,
           ...existing.value.resolverMeta
         };
+        if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+          depNode.value.resolverMeta = existing.value.resolverMeta;
+        }
+      }
+      if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+        if ((existing === null || existing === void 0 ? void 0 : existing.type) === 'dependency' && existing.value.resolverPriority != null) {
+          depNode.value.priority = existing.value.resolverPriority;
+          depNode.value.resolverPriority = existing.value.resolverPriority;
+        }
       }
       let dependentAsset = dependentAssets.find(a => a.uniqueKey === dep.specifier);
       if (dependentAsset) {

package/lib/RequestTracker.js

@@ -703,8 +703,7 @@ class RequestGraph extends _graph().ContentGraph {
       //
       // Currently create events can invalidate a large number of nodes due to
       // "create above" invalidations.
-      const isConfigKeyChange = (0, _featureFlags().getFeatureFlag)('granularTsConfigInvalidation') || type === 'delete' || type === 'update';
-      if (configKeyNodes && isConfigKeyChange) {
+      if (configKeyNodes) {
         for (let nodeId of configKeyNodes) {
           let isInvalid = type === 'delete';
           if (type !== 'delete') {
@@ -780,6 +779,9 @@ class RequestTracker {
 
   // TODO: refactor (abortcontroller should be created by RequestTracker)
   setSignal(signal) {
+    if ((0, _featureFlags().getFeatureFlag)('fixBuildAbortCorruption')) {
+      return;
+    }
     this.signal = signal;
   }
   startRequest(request) {
@@ -920,7 +922,9 @@ class RequestTracker {
         options: this.options,
         rustAtlaspack: this.rustAtlaspack
       });
-      (0, _utils2.assertSignalNotAborted)(this.signal);
+      if (!(0, _featureFlags().getFeatureFlag)('fixBuildAbortCorruption')) {
+        (0, _utils2.assertSignalNotAborted)(this.signal);
+      }
       this.completeRequest(requestNodeId);
       deferred.resolve(true);
       return result;

package/lib/index.js

@@ -4,13 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  EnvironmentManager: true,
   Atlaspack: true,
   Parcel: true,
   BuildError: true,
   createWorkerFarm: true,
   INTERNAL_RESOLVE: true,
-  INTERNAL_TRANSFORM: true
+  INTERNAL_TRANSFORM: true,
+  WORKER_PATH: true,
+  ATLASPACK_VERSION: true,
+  resolveOptions: true
 };
+Object.defineProperty(exports, "ATLASPACK_VERSION", {
+  enumerable: true,
+  get: function () {
+    return _constants.ATLASPACK_VERSION;
+  }
+});
 Object.defineProperty(exports, "Atlaspack", {
   enumerable: true,
   get: function () {
@@ -23,6 +33,7 @@ Object.defineProperty(exports, "BuildError", {
     return _Atlaspack.BuildError;
   }
 });
+exports.EnvironmentManager = void 0;
 Object.defineProperty(exports, "INTERNAL_RESOLVE", {
   enumerable: true,
   get: function () {
@@ -41,6 +52,12 @@ Object.defineProperty(exports, "Parcel", {
     return _Atlaspack.default;
   }
 });
+Object.defineProperty(exports, "WORKER_PATH", {
+  enumerable: true,
+  get: function () {
+    return _Atlaspack.WORKER_PATH;
+  }
+});
 Object.defineProperty(exports, "createWorkerFarm", {
   enumerable: true,
   get: function () {
@@ -53,7 +70,17 @@ Object.defineProperty(exports, "default", {
     return _Atlaspack.default;
   }
 });
+Object.defineProperty(exports, "resolveOptions", {
+  enumerable: true,
+  get: function () {
+    return _resolveOptions.default;
+  }
+});
+var EnvironmentManager = _interopRequireWildcard(require("./EnvironmentManager"));
+exports.EnvironmentManager = EnvironmentManager;
 var _Atlaspack = _interopRequireWildcard(require("./Atlaspack"));
+var _constants = require("./constants");
+var _resolveOptions = _interopRequireDefault(require("./resolveOptions"));
 var _atlaspackV = require("./atlaspack-v3");
 Object.keys(_atlaspackV).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -66,5 +93,6 @@ Object.keys(_atlaspackV).forEach(function (key) {
     }
   });
 });
+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; }

package/lib/public/Config.js

@@ -28,13 +28,6 @@ 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());
@@ -284,7 +277,7 @@ class PublicConfig {
       return this.#pkg;
     }
     let pkgConfig = await this.getConfig(['package.json'], {
-      readTracking: (0, _featureFlags().getFeatureFlag)('granularTsConfigInvalidation')
+      readTracking: true
     });
     if (!pkgConfig) {
       return null;

package/lib/requests/DevDepRequest.js

@@ -27,6 +27,13 @@ var _assetUtils = require("../assetUtils");
 var _utils = require("../utils");
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // A cache of dev dep requests keyed by invalidations.
 // If the package manager returns the same invalidation object, then
@@ -89,7 +96,20 @@ async function createDevDependency(opts, requestDevDeps, options) {
   return devDepRequest;
 }
 async function getDevDepRequests(api) {
-  let previousDevDepRequests = new Map(await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, (0, _nullthrows().default)(await api.getRequestResult(req.id))])));
+  const previousDevDepRequests = await async function getPreviousDevDepRequests() {
+    if ((0, _featureFlags().getFeatureFlag)('fixBuildAbortCorruption')) {
+      const allDevDepRequests = await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, await api.getRequestResult(req.id)]));
+      const nonNullDevDepRequests = [];
+      for (const [id, result] of allDevDepRequests) {
+        if (result != null) {
+          nonNullDevDepRequests.push([id, result]);
+        }
+      }
+      return new Map(nonNullDevDepRequests);
+    } else {
+      return new Map(await Promise.all(api.getSubRequests().filter(req => req.requestType === _RequestTracker.requestTypes.dev_dep_request).map(async req => [req.id, (0, _nullthrows().default)(await api.getRequestResult(req.id))])));
+    }
+  }();
   return {
     devDeps: new Map([...previousDevDepRequests.entries()].filter(([id]) => api.canSkipSubrequest(id)).map(([, req]) => [`${req.specifier}:${(0, _projectPath.fromProjectPathRelative)(req.resolveFrom)}`, req.hash])),
     invalidDevDeps: await Promise.all([...previousDevDepRequests.entries()].filter(([id]) => !api.canSkipSubrequest(id)).flatMap(([, req]) => {

package/lib/requests/PathRequest.js

@@ -26,6 +26,13 @@ function _logger() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -259,6 +266,9 @@ class ResolverRunner {
           }
           if (result.priority != null) {
             dependency.priority = _types.Priority[result.priority];
+            if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+              dependency.resolverPriority = dependency.priority;
+            }
           }
           if (result.invalidateOnEnvChange) {
             invalidateOnEnvChange.push(...result.invalidateOnEnvChange);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.18.3",
+  "version": "2.18.5",
   "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.7",
+    "@atlaspack/cache": "3.2.9",
     "@atlaspack/diagnostic": "2.14.1",
     "@atlaspack/events": "2.14.1",
-    "@atlaspack/feature-flags": "2.18.0",
-    "@atlaspack/fs": "2.15.7",
-    "@atlaspack/graph": "3.5.2",
-    "@atlaspack/logger": "2.14.10",
-    "@atlaspack/package-manager": "2.14.12",
-    "@atlaspack/plugin": "2.14.12",
-    "@atlaspack/profiler": "2.14.10",
+    "@atlaspack/feature-flags": "2.18.2",
+    "@atlaspack/fs": "2.15.9",
+    "@atlaspack/graph": "3.5.4",
+    "@atlaspack/logger": "2.14.11",
+    "@atlaspack/package-manager": "2.14.14",
+    "@atlaspack/plugin": "2.14.14",
+    "@atlaspack/profiler": "2.14.12",
     "@atlaspack/rust": "3.3.5",
-    "@atlaspack/types": "2.15.2",
-    "@atlaspack/utils": "2.15.0",
-    "@atlaspack/workers": "2.14.12",
+    "@atlaspack/types": "2.15.4",
+    "@atlaspack/utils": "2.15.2",
+    "@atlaspack/workers": "2.14.14",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
@@ -56,17 +56,6 @@
     "graphviz": "^0.0.9",
     "tempy": "^0.2.1"
   },
-  "exports": {
-    "./*": "./*",
-    ".": {
-      "types": "./index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./worker": {
-      "@atlaspack::sources": "./src/worker.js",
-      "default": "./lib/worker.js"
-    }
-  },
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },

package/src/AssetGraph.js

@@ -538,6 +538,19 @@ export default class AssetGraph extends ContentGraph<AssetGraphNode> {
           ...depNode.value.meta,
           ...existing.value.resolverMeta,
         };
+
+        if (getFeatureFlag('hmrImprovements')) {
+          depNode.value.resolverMeta = existing.value.resolverMeta;
+        }
+      }
+      if (getFeatureFlag('hmrImprovements')) {
+        if (
+          existing?.type === 'dependency' &&
+          existing.value.resolverPriority != null
+        ) {
+          depNode.value.priority = existing.value.resolverPriority;
+          depNode.value.resolverPriority = existing.value.resolverPriority;
+        }
       }
       let dependentAsset = dependentAssets.find(
         (a) => a.uniqueKey === dep.specifier,

package/src/RequestTracker.js

@@ -1123,11 +1123,7 @@ export class RequestGraph extends ContentGraph<
       //
       // Currently create events can invalidate a large number of nodes due to
       // "create above" invalidations.
-      const isConfigKeyChange =
-        getFeatureFlag('granularTsConfigInvalidation') ||
-        type === 'delete' ||
-        type === 'update';
-      if (configKeyNodes && isConfigKeyChange) {
+      if (configKeyNodes) {
         for (let nodeId of configKeyNodes) {
           let isInvalid = type === 'delete';
 
@@ -1239,6 +1235,9 @@ export default class RequestTracker {
 
   // TODO: refactor (abortcontroller should be created by RequestTracker)
   setSignal(signal?: AbortSignal) {
+    if (getFeatureFlag('fixBuildAbortCorruption')) {
+      return;
+    }
     this.signal = signal;
   }
 
@@ -1422,7 +1421,10 @@ export default class RequestTracker {
         rustAtlaspack: this.rustAtlaspack,
       });
 
-      assertSignalNotAborted(this.signal);
+      if (!getFeatureFlag('fixBuildAbortCorruption')) {
+        assertSignalNotAborted(this.signal);
+      }
+
       this.completeRequest(requestNodeId);
 
       deferred.resolve(true);

package/src/index.js

@@ -1,4 +1,5 @@
 // @flow
+import * as EnvironmentManager from './EnvironmentManager';
 
 export {
   default,
@@ -8,6 +9,9 @@ export {
   createWorkerFarm,
   INTERNAL_RESOLVE,
   INTERNAL_TRANSFORM,
+  WORKER_PATH,
 } from './Atlaspack';
-
+export {ATLASPACK_VERSION} from './constants';
+export {default as resolveOptions} from './resolveOptions';
 export * from './atlaspack-v3';
+export {EnvironmentManager};

package/src/public/Config.js

@@ -20,7 +20,6 @@ import {
 } from '@atlaspack/utils';
 import Environment from './Environment';
 import {fromProjectPath, toProjectPath} from '../projectPath';
-import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {fromEnvironmentId} from '../EnvironmentManager';
 
 const internalConfigToConfig: DefaultWeakMap<
@@ -362,7 +361,7 @@ export default class PublicConfig implements IConfig {
     }
 
     let pkgConfig = await this.getConfig<PackageJSON>(['package.json'], {
-      readTracking: getFeatureFlag('granularTsConfigInvalidation'),
+      readTracking: true,
     });
     if (!pkgConfig) {
       return null;

package/src/requests/DevDepRequest.js

@@ -1,4 +1,5 @@
-// @flow
+// @flow strict-local
+
 import type {
   DependencySpecifier,
   SemverRange,
@@ -24,6 +25,7 @@ import {
   toProjectPath,
 } from '../projectPath';
 import {requestTypes} from '../RequestTracker';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 // A cache of dev dep requests keyed by invalidations.
 // If the package manager returns the same invalidation object, then
@@ -116,17 +118,47 @@ type DevDepRequests = {|
 export async function getDevDepRequests<TResult: RequestResult>(
   api: RunAPI<TResult>,
 ): Promise<DevDepRequests> {
-  let previousDevDepRequests: Map<string, DevDepRequestResult> = new Map(
-    await Promise.all(
-      api
-        .getSubRequests()
-        .filter((req) => req.requestType === requestTypes.dev_dep_request)
-        .map(async (req) => [
-          req.id,
-          nullthrows(await api.getRequestResult<DevDepRequestResult>(req.id)),
-        ]),
-    ),
-  );
+  async function getPreviousDevDepRequests() {
+    if (getFeatureFlag('fixBuildAbortCorruption')) {
+      const allDevDepRequests = await Promise.all(
+        api
+          .getSubRequests()
+          .filter((req) => req.requestType === requestTypes.dev_dep_request)
+          .map(
+            async (
+              req,
+            ): Promise<[string, DevDepRequestResult | null | void]> => [
+              req.id,
+              await api.getRequestResult<DevDepRequestResult>(req.id),
+            ],
+          ),
+      );
+      const nonNullDevDepRequests = [];
+      for (const [id, result] of allDevDepRequests) {
+        if (result != null) {
+          nonNullDevDepRequests.push([id, result]);
+        }
+      }
+
+      return new Map(nonNullDevDepRequests);
+    } else {
+      return new Map(
+        await Promise.all(
+          api
+            .getSubRequests()
+            .filter((req) => req.requestType === requestTypes.dev_dep_request)
+            .map(async (req) => [
+              req.id,
+              nullthrows(
+                await api.getRequestResult<DevDepRequestResult>(req.id),
+              ),
+            ]),
+        ),
+      );
+    }
+  }
+
+  const previousDevDepRequests = await getPreviousDevDepRequests();
 
   return {
     devDeps: new Map(

package/src/requests/PathRequest.js

@@ -24,6 +24,7 @@ import ThrowableDiagnostic, {
   md,
 } from '@atlaspack/diagnostic';
 import {PluginLogger} from '@atlaspack/logger';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import nullthrows from 'nullthrows';
 import path from 'path';
 import {normalizePath} from '@atlaspack/utils';
@@ -320,6 +321,9 @@ export class ResolverRunner {
 
           if (result.priority != null) {
             dependency.priority = Priority[result.priority];
+            if (getFeatureFlag('hmrImprovements')) {
+              dependency.resolverPriority = dependency.priority;
+            }
           }
 
           if (result.invalidateOnEnvChange) {

package/src/types.js

@@ -145,6 +145,7 @@ export type Dependency = {|
   customPackageConditions?: Array<string>,
   meta: Meta,
   resolverMeta?: ?Meta,
+  resolverPriority?: $Values<typeof Priority>,
   target: ?Target,
   sourceAssetId: ?string,
   sourcePath: ?ProjectPath,