@atlaspack/core 2.25.0 → 2.25.2-dev-af891f2f6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.25.0",
+  "version": "2.25.2-dev-af891f2f6.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -22,23 +22,23 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
+    "@atlaspack/build-cache": "2.13.7-dev-af891f2f6.0",
+    "@atlaspack/cache": "3.2.30-dev-af891f2f6.0",
+    "@atlaspack/diagnostic": "2.14.5-dev-af891f2f6.0",
+    "@atlaspack/events": "2.14.5-dev-af891f2f6.0",
+    "@atlaspack/feature-flags": "2.25.5-dev-af891f2f6.0",
+    "@atlaspack/fs": "2.15.30-dev-af891f2f6.0",
+    "@atlaspack/graph": "3.5.24-dev-af891f2f6.0",
+    "@atlaspack/logger": "2.14.27-dev-af891f2f6.0",
+    "@atlaspack/package-manager": "2.14.35-dev-af891f2f6.0",
+    "@atlaspack/plugin": "2.14.35-dev-af891f2f6.0",
+    "@atlaspack/profiler": "2.14.32-dev-af891f2f6.0",
+    "@atlaspack/rust": "3.8.3-dev-af891f2f6.0",
+    "@atlaspack/source-map": "3.0.1-dev-af891f2f6.0",
+    "@atlaspack/types": "2.15.25-dev-af891f2f6.0",
+    "@atlaspack/utils": "3.0.3-dev-af891f2f6.0",
+    "@atlaspack/workers": "2.14.35-dev-af891f2f6.0",
     "@mischnic/json-sourcemap": "^0.1.0",
-    "@atlaspack/build-cache": "2.13.6",
-    "@atlaspack/cache": "3.2.28",
-    "@atlaspack/diagnostic": "2.14.4",
-    "@atlaspack/events": "2.14.4",
-    "@atlaspack/feature-flags": "2.25.3",
-    "@atlaspack/fs": "2.15.28",
-    "@atlaspack/graph": "3.5.22",
-    "@atlaspack/logger": "2.14.25",
-    "@atlaspack/package-manager": "2.14.33",
-    "@atlaspack/plugin": "2.14.33",
-    "@atlaspack/profiler": "2.14.30",
-    "@atlaspack/rust": "3.8.2",
-    "@atlaspack/types": "2.15.23",
-    "@atlaspack/utils": "3.0.1",
-    "@atlaspack/workers": "2.14.33",
-    "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
     "clone": "^2.1.1",
@@ -50,15 +50,16 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.4",
+    "@atlaspack/babel-register": "2.14.5-dev-af891f2f6.0",
     "@types/node": ">= 18",
-    "rfdc": "1",
-    "jest-diff": "*",
     "graphviz": "^0.0.9",
+    "jest-diff": "*",
+    "rfdc": "1",
     "tempy": "^0.2.1"
   },
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "type": "commonjs"
+  "type": "commonjs",
+  "gitHead": "af891f2f68edf62c81b19d349331cf4a07ac458d"
 }

package/src/Atlaspack.ts

@@ -43,7 +43,7 @@ import createPathRequest from './requests/PathRequest';
 import {createEnvironment} from './Environment';
 import {createDependency} from './Dependency';
 import {Disposable} from '@atlaspack/events';
-import {init as initSourcemaps} from '@parcel/source-map';
+import {init as initSourcemaps} from '@atlaspack/source-map';
 import {LMDBLiteCache} from '@atlaspack/cache';
 import {
   // @ts-expect-error TS2305

package/src/BundleGraph.ts

@@ -391,17 +391,28 @@ export default class BundleGraph {
                       local,
                       loc: reexportAllLoc,
                     });
+
                     if (node.value.sourceAssetId != null) {
-                      let sourceAssetId = nullthrows(
-                        assetGraphNodeIdToBundleGraphNodeId.get(
-                          assetGraph.getNodeIdByContentKey(
-                            node.value.sourceAssetId,
+                      let sourceAssetId: NodeId;
+
+                      if (getFeatureFlag('sourceAssetIdBundleGraphFix')) {
+                        [sourceAssetId] =
+                          assetGraph.getNodeIdsConnectedTo(nodeId);
+                      } else {
+                        sourceAssetId = assetGraph.getNodeIdByContentKey(
+                          node.value.sourceAssetId,
+                        );
+                      }
+
+                      let sourceAsset = nullthrows(
+                        graph.getNode(
+                          nullthrows(
+                            assetGraphNodeIdToBundleGraphNodeId.get(
+                              sourceAssetId,
+                            ),
                           ),
                         ),
                       );
-                      let sourceAsset = nullthrows(
-                        graph.getNode(sourceAssetId),
-                      );
                       invariant(sourceAsset.type === 'asset');
                       let sourceAssetSymbols = sourceAsset.value.symbols;
                       if (sourceAssetSymbols) {

package/src/CommittedAsset.ts

@@ -3,7 +3,7 @@ import {Readable} from 'stream';
 import {deserializeRaw} from '@atlaspack/build-cache';
 import type {AST, Blob} from '@atlaspack/types';
 import {bufferStream, blobToStream, streamFromPromise} from '@atlaspack/utils';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 
 import {generateFromAST} from './assetUtils';
 import type {Asset, Dependency, AtlaspackOptions} from './types';

package/src/PackagerRunner.ts

@@ -7,7 +7,7 @@ import type {
   NamedBundle as NamedBundleType,
   Async,
 } from '@atlaspack/types';
-import type SourceMap from '@parcel/source-map';
+import type SourceMap from '@atlaspack/source-map';
 import type {
   Bundle as InternalBundle,
   Config,

package/src/RequestTracker.ts

@@ -1943,28 +1943,21 @@ async function loadRequestGraph(
         },
       });
 
-      if (getFeatureFlag('verboseRequestInvalidationStats')) {
-        const invalidationStats = await invalidateRequestGraph(
-          requestGraph,
-          options,
-          events,
-        );
+      const invalidationStats = await invalidateRequestGraph(
+        requestGraph,
+        options,
+        events,
+      );
 
-        logger.verbose({
-          origin: '@atlaspack/core',
-          message: 'Request track loaded from cache',
-          meta: {
-            ...commonMeta,
-            trackableEvent: 'request_tracker_cache_key_hit',
-            invalidationStats,
-          },
-        });
-      } else {
-        requestGraph.invalidateUnpredictableNodes();
-        requestGraph.invalidateOnBuildNodes();
-        requestGraph.invalidateEnvNodes(options.env);
-        requestGraph.invalidateOptionNodes(options);
-      }
+      logger.verbose({
+        origin: '@atlaspack/core',
+        message: 'Request track loaded from cache',
+        meta: {
+          ...commonMeta,
+          trackableEvent: 'request_tracker_cache_key_hit',
+          invalidationStats,
+        },
+      });
 
       return requestGraph;
     } catch (e: any) {

package/src/Transformation.ts

@@ -69,6 +69,7 @@ import {
 import {invalidateOnFileCreateToInternal, createInvalidations} from './utils';
 import invariant from 'assert';
 import {tracer, PluginTracer} from '@atlaspack/profiler';
+import SourceMap from '@atlaspack/source-map';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 type GenerateFunc = (input: UncommittedAsset) => Promise<GenerateOutput>;
@@ -460,7 +461,7 @@ export default class Transformation {
           if (asset.isASTDirty && asset.generate) {
             let output = await asset.generate();
             asset.content = output.content;
-            asset.mapBuffer = output.map?.toBuffer();
+            asset.mapBuffer = SourceMap.safeToBuffer(output.map);
           }
 
           asset.clearAST();
@@ -634,7 +635,7 @@ export default class Transformation {
     ) {
       let output = await asset.generate();
       asset.content = output.content;
-      asset.mapBuffer = output.map?.toBuffer();
+      asset.mapBuffer = SourceMap.safeToBuffer(output.map);
     }
 
     // Load config for the transformer.

package/src/UncommittedAsset.ts

@@ -11,7 +11,7 @@ import type {Asset, Dependency, AtlaspackOptions, Invalidations} from './types';
 
 import invariant from 'assert';
 import {Readable} from 'stream';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import {serializeRaw} from '@atlaspack/build-cache';
 import {
   blobToStream,
@@ -249,7 +249,7 @@ export default class UncommittedAsset {
 
     if (map) {
       this.map = map;
-      this.mapBuffer = map.toBuffer();
+      this.mapBuffer = SourceMap.safeToBuffer(map);
       this.setCode(code.replace(SOURCEMAP_RE, ''));
     }
 
@@ -425,7 +425,7 @@ export default class UncommittedAsset {
       content,
       ast: result.ast,
       isASTDirty: result.ast === this.ast ? this.isASTDirty : true,
-      mapBuffer: result.map ? result.map.toBuffer() : null,
+      mapBuffer: SourceMap.safeToBuffer(result.map),
       code: this.code,
       invalidations: this.invalidations,
     });

package/src/assetUtils.ts

@@ -39,6 +39,7 @@ import {PluginTracer} from '@atlaspack/profiler';
 import {identifierRegistry} from './IdentifierRegistry';
 import type {EnvironmentRef} from './EnvironmentManager';
 import {toEnvironmentId} from './EnvironmentManager';
+import SourceMap from '@atlaspack/source-map';
 
 export type AssetOptions = {
   id?: string;
@@ -180,7 +181,7 @@ async function _generateFromAST(asset: CommittedAsset | UncommittedAsset) {
     tracer: new PluginTracer({origin: pluginName, category: 'asset-generate'}),
   });
 
-  let mapBuffer = map?.toBuffer();
+  let mapBuffer = SourceMap.safeToBuffer(map);
   // Store the results in the cache so we can avoid generating again next time
   await Promise.all([
     asset.options.cache.setStream(

package/src/atlaspack-v3/worker/compat/mutable-asset.ts

@@ -1,4 +1,4 @@
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import * as napi from '@atlaspack/rust';
 import {Readable} from 'stream';
 import type {

package/src/public/Asset.ts

@@ -1,4 +1,4 @@
-import type SourceMap from '@parcel/source-map';
+import type SourceMap from '@atlaspack/source-map';
 import type {Readable} from 'stream';
 import type {FileSystem} from '@atlaspack/fs';
 

package/src/worker.ts

@@ -21,7 +21,7 @@ import Validation, {ValidationOpts} from './Validation';
 import {AtlaspackConfig} from './AtlaspackConfig';
 import {registerCoreWithSerializer} from './registerCoreWithSerializer';
 import {clearBuildCaches} from '@atlaspack/build-cache';
-import {init as initSourcemaps} from '@parcel/source-map';
+import {init as initSourcemaps} from '@atlaspack/source-map';
 // @ts-expect-error TS2305
 import {init as initRust} from '@atlaspack/rust';
 import WorkerFarm from '@atlaspack/workers';