@atlaspack/core 2.19.3-typescript-5b4d3ad41.0 → 2.20.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaspack/core
 
+## 2.20.0
+
+### Minor Changes
+
+- [#721](https://github.com/atlassian-labs/atlaspack/pull/721) [`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd) Thanks [@benjervis](https://github.com/benjervis)! - Add support for bundle merging based on `webpackChunkName` comments.
+
+  Adding a `webpackChunkName` comment to an import will allow the bundler to merge multiple imports into a single bundle.
+
+  e.g.:
+
+  ```ts
+  import(/* webpackChunkName: "my-chunk" */ './my-module');
+  import(/* webpackChunkName: "my-chunk" */ './another-module');
+  ```
+
+  This can be enabled with the feature flag `supportWebpackChunkName`.
+
+### Patch Changes
+
+- Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
+  - @atlaspack/feature-flags@2.20.0
+  - @atlaspack/fs@2.15.16
+  - @atlaspack/profiler@2.14.18
+  - @atlaspack/types@2.15.11
+  - @atlaspack/workers@2.14.21
+  - @atlaspack/cache@3.2.16
+  - @atlaspack/graph@3.5.10
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/package-manager@2.14.21
+  - @atlaspack/plugin@2.14.21
+
 ## 2.19.2
 
 ### Patch Changes

package/index.d.ts

@@ -0,0 +1,34 @@
+import type {
+  InitialAtlaspackOptions,
+  BuildEvent,
+  BuildSuccessEvent,
+  AsyncSubscription,
+} from '@atlaspack/types';
+
+import type {FarmOptions} from '@atlaspack/workers';
+
+import type WorkerFarm from '@atlaspack/workers';
+
+export declare const ATLASPACK_VERSION: string;
+
+export class Atlaspack {
+  constructor(options: InitialAtlaspackOptions);
+  run(): Promise<BuildSuccessEvent>;
+  watch(
+    cb?: (err: Error | null | undefined, buildEvent?: BuildEvent) => unknown,
+  ): Promise<AsyncSubscription>;
+}
+
+export class Parcel {
+  constructor(options: InitialAtlaspackOptions);
+  run(): Promise<BuildSuccessEvent>;
+  watch(
+    cb?: (err: Error | null | undefined, buildEvent?: BuildEvent) => unknown,
+  ): Promise<AsyncSubscription>;
+}
+
+export declare function createWorkerFarm(
+  options?: Partial<FarmOptions>,
+): WorkerFarm;
+
+export default Atlaspack;

package/lib/AssetGraph.js

@@ -71,11 +71,7 @@ function nodeFromDep(dep) {
 }
 function nodeFromAssetGroup(assetGroup) {
   return {
-    id: (0, _rust().hashString)(
-    // @ts-expect-error TS2345
-    (0, _projectPath.fromProjectPathRelative)(assetGroup.filePath) +
-    // @ts-expect-error TS2345
-    (0, _EnvironmentManager.toEnvironmentId)(assetGroup.env) + String(assetGroup.isSource) + String(assetGroup.sideEffects) + (assetGroup.code ?? '') + ':' + (assetGroup.pipeline ?? '') + ':' + (assetGroup.query ?? '')),
+    id: (0, _rust().hashString)((0, _projectPath.fromProjectPathRelative)(assetGroup.filePath) + (0, _EnvironmentManager.toEnvironmentId)(assetGroup.env) + String(assetGroup.isSource) + String(assetGroup.sideEffects) + (assetGroup.code ?? '') + ':' + (assetGroup.pipeline ?? '') + ':' + (assetGroup.query ?? '')),
     type: 'asset_group',
     value: assetGroup,
     usedSymbolsDownDirty: true
@@ -105,8 +101,6 @@ function nodeFromEntryFile(entry) {
     value: entry
   };
 }
-
-// @ts-expect-error TS2417
 class AssetGraph extends _graph().ContentGraph {
   /**
    * Incremented when the asset graph is modified such that it requires a bundling pass.
@@ -144,9 +138,13 @@ class AssetGraph extends _graph().ContentGraph {
     this.undeferredDependencies = new Set();
     this.envCache = new Map();
   }
+
+  // $FlowFixMe[prop-missing]
   static deserialize(opts) {
     return new AssetGraph(opts);
   }
+
+  // $FlowFixMe[prop-missing]
   serialize() {
     return {
       ...super.serialize(),
@@ -208,8 +206,6 @@ class AssetGraph extends _graph().ContentGraph {
     if ((0, _featureFlags().getFeatureFlag)('environmentDeduplication')) {
       return;
     }
-
-    // @ts-expect-error TS2345
     let {
       id,
       context
@@ -219,7 +215,6 @@ class AssetGraph extends _graph().ContentGraph {
     if (env) {
       input.env = (0, _EnvironmentManager.toEnvironmentRef)(env);
     } else {
-      // @ts-expect-error TS2345
       this.envCache.set(idAndContext, (0, _EnvironmentManager.fromEnvironmentId)(input.env));
     }
   }
@@ -247,6 +242,8 @@ class AssetGraph extends _graph().ContentGraph {
     let existing = this.getNodeByContentKey(node.id);
     if (existing != null) {
       (0, _assert().default)(existing.type === node.type);
+      // $FlowFixMe[incompatible-type] Checked above
+      // $FlowFixMe[prop-missing]
       existing.value = node.value;
       let existingId = this.getNodeIdByContentKey(node.id);
       this.updateNode(existingId, existing);
@@ -278,7 +275,6 @@ class AssetGraph extends _graph().ContentGraph {
         env: target.env,
         isEntry: true,
         needsStableName: true,
-        // @ts-expect-error TS2322
         symbols: (0, _EnvironmentManager.fromEnvironmentId)(target.env).isLibrary ? new Map([['*', {
           local: '*',
           isWeak: true,
@@ -287,9 +283,7 @@ class AssetGraph extends _graph().ContentGraph {
       }));
       if ((0, _EnvironmentManager.fromEnvironmentId)(node.value.env).isLibrary) {
         // in library mode, all of the entry's symbols are "used"
-        // @ts-expect-error TS2345
         node.usedSymbolsDown.add('*');
-        // @ts-expect-error TS2345
         node.usedSymbolsUp.set('*', undefined);
       }
       return node;
@@ -367,10 +361,7 @@ class AssetGraph extends _graph().ContentGraph {
       if (traversedNode.type === 'asset') {
         let hasDeferred = this.getNodeIdsConnectedFrom(traversedNodeId).some(childNodeId => {
           let childNode = (0, _nullthrows().default)(this.getNode(childNodeId));
-          // @ts-expect-error TS2339
-          return childNode.hasDeferred == null ? false :
-          // @ts-expect-error TS2339
-          childNode.hasDeferred;
+          return childNode.hasDeferred == null ? false : childNode.hasDeferred;
         });
         if (!hasDeferred) {
           delete traversedNode.hasDeferred;
@@ -379,7 +370,6 @@ class AssetGraph extends _graph().ContentGraph {
           hasDeferred
         };
       } else if (traversedNode.type === 'asset_group' && nodeId !== traversedNodeId) {
-        // @ts-expect-error TS2339
         if (!(ctx !== null && ctx !== void 0 && ctx.hasDeferred)) {
           this.safeToIncrementallyBundle = false;
           this.setNeedsBundling();
@@ -410,9 +400,7 @@ class AssetGraph extends _graph().ContentGraph {
     }
     let isDeferrable = [...dependencySymbols].every(([, {
       isWeak
-    }]) => isWeak) && sideEffects === false && canDefer &&
-    // @ts-expect-error TS2345
-    !dependencySymbols.has('*');
+    }]) => isWeak) && sideEffects === false && canDefer && !dependencySymbols.has('*');
     if (!isDeferrable) {
       return false;
     }
@@ -438,9 +426,7 @@ class AssetGraph extends _graph().ContentGraph {
       if (this.undeferredDependencies.has(d)) {
         return false;
       }
-      let depIsDeferrable = d.symbols && !((0, _EnvironmentManager.fromEnvironmentId)(d.env).isLibrary && d.isEntry) &&
-      // @ts-expect-error TS2345
-      !d.symbols.has('*') && ![...d.symbols.keys()].some(symbol => {
+      let depIsDeferrable = d.symbols && !((0, _EnvironmentManager.fromEnvironmentId)(d.env).isLibrary && d.isEntry) && !d.symbols.has('*') && ![...d.symbols.keys()].some(symbol => {
         var _resolvedAsset$symbol;
         let assetSymbol = (_resolvedAsset$symbol = resolvedAsset.symbols) === null || _resolvedAsset$symbol === void 0 || (_resolvedAsset$symbol = _resolvedAsset$symbol.get(symbol)) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local;
         return assetSymbol != null && symbols.has(assetSymbol);
@@ -455,7 +441,6 @@ class AssetGraph extends _graph().ContentGraph {
   resolveAssetGroup(assetGroup, assets, correspondingRequest) {
     this.normalizeEnvironment(assetGroup);
     let assetGroupNode = nodeFromAssetGroup(assetGroup);
-    // @ts-expect-error TS2322
     assetGroupNode = this.getNodeByContentKey(assetGroupNode.id);
     if (!assetGroupNode) {
       return;

package/lib/Atlaspack.js

@@ -123,43 +123,28 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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 }; }
 // eslint-disable-next-line no-unused-vars
-
 (0, _registerCoreWithSerializer.registerCoreWithSerializer)();
 const INTERNAL_TRANSFORM = exports.INTERNAL_TRANSFORM = Symbol('internal_transform');
 const INTERNAL_RESOLVE = exports.INTERNAL_RESOLVE = Symbol('internal_resolve');
-let WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
-if (process.env.ATLASPACK_REGISTER_USE_SRC === 'true') {
-  exports.WORKER_PATH = WORKER_PATH = _path().default.join(__dirname, 'worker.ts');
-}
+const WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
 class Atlaspack {
-  // @ts-expect-error TS2564
   #requestTracker;
-  // @ts-expect-error TS2564
   #config;
-  // @ts-expect-error TS2564
   #farm;
   #initialized = false;
-  // @ts-expect-error TS2564
   #disposable;
   #initialOptions;
-  // @ts-expect-error TS2564
   #reporterRunner;
   #resolvedOptions = null;
-  // @ts-expect-error TS2564
   #optionsRef;
-  // @ts-expect-error TS2564
   #watchAbortController;
   #watchQueue = new (_utils2().PromiseQueue)({
     maxConcurrent: 1
   });
-  // @ts-expect-error TS2564
   #watchEvents;
   #watcherSubscription;
   #watcherCount = 0;
   #requestedAssetIds = new Set();
-
-  // @ts-expect-error TS2564
-
   constructor(options) {
     this.#initialOptions = options;
   }
@@ -209,6 +194,8 @@ class Atlaspack {
         throw new Error('Atlaspack v3 must be run with lmdb lite cache');
       }
       const lmdb = resolvedOptions.cache.getNativeRef();
+
+      // $FlowFixMe
       const version = require('../package.json').version;
       await lmdb.put('current_session_version', Buffer.from(version));
       let threads = undefined;
@@ -219,12 +206,12 @@ class Atlaspack {
       }
       rustAtlaspack = await _atlaspackV.AtlaspackV3.create({
         ...options,
-        // @ts-expect-error TS2353
         corePath: _path().default.join(__dirname, '..'),
         threads,
         entries: Array.isArray(entries) ? entries : entries == null ? undefined : [entries],
         env: resolvedOptions.env,
         fs: inputFS && new _atlaspackV.FileSystemV3(inputFS),
+        // $FlowFixMe ProjectPath is a string
         defaultTargetOptions: resolvedOptions.defaultTargetOptions,
         lmdb
       });
@@ -234,7 +221,6 @@ class Atlaspack {
         });
       }
     }
-    // @ts-expect-error TS2454
     this.rustAtlaspack = rustAtlaspack;
     let {
       config
@@ -280,7 +266,6 @@ class Atlaspack {
     this.#requestTracker = await _RequestTracker.default.init({
       farm: this.#farm,
       options: resolvedOptions,
-      // @ts-expect-error TS2454
       rustAtlaspack
     });
     this.#initialized = true;
@@ -347,8 +332,6 @@ class Atlaspack {
     if (!this.#initialized) {
       await this._init();
     }
-
-    // @ts-expect-error TS7034
     let watchEventsDisposable;
     if (cb) {
       watchEventsDisposable = this.#watchEvents.addListener(({
@@ -368,11 +351,8 @@ class Atlaspack {
       this.#watchQueue.run();
     }
     this.#watcherCount++;
-
-    // @ts-expect-error TS7034
     let unsubscribePromise;
     const unsubscribe = async () => {
-      // @ts-expect-error TS7005
       if (watchEventsDisposable) {
         watchEventsDisposable.dispose();
       }
@@ -390,12 +370,9 @@ class Atlaspack {
     };
     return {
       unsubscribe() {
-        // @ts-expect-error TS7005
         if (unsubscribePromise == null) {
           unsubscribePromise = unsubscribe();
         }
-
-        // @ts-expect-error TS7005
         return unsubscribePromise;
       }
     };
@@ -438,14 +415,13 @@ class Atlaspack {
       });
       this.#requestedAssetIds.clear();
       await (0, _dumpGraphToGraphViz.default)(
-      // @ts-expect-error TS2345
+      // $FlowFixMe
       this.#requestTracker.graph, 'RequestGraph', _RequestTracker.requestGraphEdgeTypes);
       let event = {
         type: 'buildSuccess',
         changedAssets: new Map(Array.from(changedAssets).map(([id, asset]) => [id, (0, _Asset.assetFromValue)(asset, options)])),
         bundleGraph: new _BundleGraph.default(bundleGraph, (bundle, bundleGraph, options) => _Bundle.PackagedBundle.getWithInfo(bundle, bundleGraph, options, bundleInfo.get(bundle.id)), options),
         buildTime: Date.now() - startTime,
-        // @ts-expect-error TS7006
         requestBundle: async bundle => {
           let bundleNode = bundleGraph._graph.getNodeByContentKey(bundle.id);
           (0, _assert().default)((bundleNode === null || bundleNode === void 0 ? void 0 : bundleNode.type) === 'bundle', 'Bundle does not exist');
@@ -471,21 +447,15 @@ class Atlaspack {
           }
           let results = await this.#watchQueue.run();
           let result = results.filter(Boolean).pop();
-          // @ts-expect-error TS18049
           if (result.type === 'buildFailure') {
-            // @ts-expect-error TS18049
             throw new BuildError(result.diagnostics);
           }
           return result;
         },
         unstable_requestStats: this.#requestTracker.flushStats()
       };
-
-      // @ts-expect-error TS2345
       await this.#reporterRunner.report(event);
-      await this.#requestTracker.runRequest(
-      // @ts-expect-error TS2345
-      (0, _ValidationRequest.default)({
+      await this.#requestTracker.runRequest((0, _ValidationRequest.default)({
         optionsRef: this.#optionsRef,
         assetRequests
       }), {
@@ -494,8 +464,6 @@ class Atlaspack {
       if (this.#reporterRunner.errors.length) {
         throw this.#reporterRunner.errors;
       }
-
-      // @ts-expect-error TS2322
       return event;
     } catch (e) {
       if (e instanceof _utils.BuildAbortError) {
@@ -507,10 +475,7 @@ class Atlaspack {
         diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic],
         unstable_requestStats: this.#requestTracker.flushStats()
       };
-
-      // @ts-expect-error TS2345
       await this.#reporterRunner.report(event);
-      // @ts-expect-error TS2322
       return event;
     } finally {
       if (this.isProfiling) {
@@ -623,11 +588,7 @@ class Atlaspack {
       requestedAssetIds: this.#requestedAssetIds
     };
     const start = Date.now();
-    const result = await this.#requestTracker.runRequest(this.rustAtlaspack != null ?
-    // @ts-expect-error TS2345
-    (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) :
-    // @ts-expect-error TS2345
-    (0, _AssetGraphRequest.default)(input), {
+    const result = await this.#requestTracker.runRequest(this.rustAtlaspack != null ? (0, _AssetGraphRequestRust.createAssetGraphRequestRust)(this.rustAtlaspack)(input) : (0, _AssetGraphRequest.default)(input), {
       force: true
     });
     const duration = Date.now() - start;
@@ -714,7 +675,6 @@ class Atlaspack {
       return null;
     }
     return {
-      // @ts-expect-error TS2322
       filePath: (0, _projectPath.fromProjectPath)(projectRoot, res.filePath),
       code: res.code,
       query: res.query,

package/lib/AtlaspackConfig.js

@@ -90,7 +90,6 @@ class AtlaspackConfig {
   }
   async loadPlugin(node) {
     let plugin = await this._loadPlugin(node);
-    // @ts-expect-error TS2322
     return {
       ...plugin,
       name: node.packageName,
@@ -130,9 +129,7 @@ class AtlaspackConfig {
       if (allowEmpty) {
         return [];
       }
-      throw await this.missingPluginError(this.transformers,
-      // @ts-expect-error TS2345
-      (0, _diagnostic().md)`No transformers found for __${(0, _projectPath.fromProjectPathRelative)(filePath)}__` + (pipeline != null ? ` with pipeline: '${pipeline}'` : '') + '.', '/transformers');
+      throw await this.missingPluginError(this.transformers, (0, _diagnostic().md)`No transformers found for __${(0, _projectPath.fromProjectPathRelative)(filePath)}__` + (pipeline != null ? ` with pipeline: '${pipeline}'` : '') + '.', '/transformers');
     }
     return this.loadPlugins(transformers);
   }
@@ -157,9 +154,7 @@ class AtlaspackConfig {
   async getPackager(filePath) {
     let packager = this.matchGlobMap((0, _projectPath.toProjectPathUnsafe)(filePath), this.packagers);
     if (!packager) {
-      throw await this.missingPluginError(this.packagers,
-      // @ts-expect-error TS2345
-      (0, _diagnostic().md)`No packager found for __${filePath}__.`, '/packagers');
+      throw await this.missingPluginError(this.packagers, (0, _diagnostic().md)`No packager found for __${filePath}__.`, '/packagers');
     }
     return this.loadPlugin(packager);
   }
@@ -188,9 +183,7 @@ class AtlaspackConfig {
   async getCompressors(filePath) {
     let compressors = this.matchGlobMapPipelines((0, _projectPath.toProjectPathUnsafe)(filePath), this.compressors) ?? [];
     if (compressors.length === 0) {
-      throw await this.missingPluginError(this.compressors,
-      // @ts-expect-error TS2345
-      (0, _diagnostic().md)`No compressors found for __${filePath}__.`, '/compressors');
+      throw await this.missingPluginError(this.compressors, (0, _diagnostic().md)`No compressors found for __${filePath}__.`, '/compressors');
     }
     return this.loadPlugins(compressors);
   }
@@ -203,7 +196,6 @@ class AtlaspackConfig {
     let [patternPipeline, patternGlob] = pattern.split(':');
     if (!patternGlob) {
       patternGlob = patternPipeline;
-      // @ts-expect-error TS2322
       patternPipeline = null;
     }
     let re = this.regexCache.get(patternGlob);
@@ -243,7 +235,6 @@ class AtlaspackConfig {
     }
     for (let pattern in globMap) {
       if (this.isGlobMatch(filePath, pattern)) {
-        // @ts-expect-error TS2345
         matches.push(globMap[pattern]);
       }
     }
@@ -259,7 +250,7 @@ class AtlaspackConfig {
       return pipeline;
     };
     let res = flatten();
-    // @ts-expect-error TS2322
+    // $FlowFixMe afaik this should work
     return res;
   }
   async missingPluginError(plugins, message, key) {
@@ -267,13 +258,7 @@ class AtlaspackConfig {
     if (Array.isArray(plugins)) {
       configsWithPlugin = new Set(getConfigPaths(this.options, plugins));
     } else {
-      configsWithPlugin = new Set(Object.keys(plugins).flatMap(k =>
-      // @ts-expect-error TS7053
-      Array.isArray(plugins[k]) ?
-      // @ts-expect-error TS7053
-      getConfigPaths(this.options, plugins[k]) :
-      // @ts-expect-error TS7053
-      [getConfigPath(this.options, plugins[k])]));
+      configsWithPlugin = new Set(Object.keys(plugins).flatMap(k => Array.isArray(plugins[k]) ? getConfigPaths(this.options, plugins[k]) : [getConfigPath(this.options, plugins[k])]));
     }
     if (configsWithPlugin.size === 0) {
       configsWithPlugin.add((0, _projectPath.fromProjectPath)(this.options.projectRoot, this.filePath));
@@ -306,11 +291,8 @@ class AtlaspackConfig {
 }
 exports.AtlaspackConfig = AtlaspackConfig;
 function getConfigPaths(options, nodes) {
-  return nodes
-  // @ts-expect-error TS2339
-  .map(node => node !== '...' ? getConfigPath(options, node) : null).filter(Boolean);
+  return nodes.map(node => node !== '...' ? getConfigPath(options, node) : null).filter(Boolean);
 }
 function getConfigPath(options, node) {
-  // @ts-expect-error TS2339
   return (0, _projectPath.fromProjectPath)(options.projectRoot, node.resolveFrom);
 }

package/lib/AtlaspackConfig.schema.js

@@ -6,10 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.validatePackageName = validatePackageName;
 // Parcel validates plugin package names due to:
+//
 // * https://github.com/parcel-bundler/parcel/issues/3397#issuecomment-521353931
+//
 // Ultimately:
+//
 // * We do not care about package names
 // * Validation makes interop between parcel/atlaspack confusing.
+//
 function validatePackageName(
 // eslint-disable-next-line no-unused-vars
 pkg,