@atlaspack/core 2.16.2-canary.289 → 2.16.2-canary.291

package/dist/Atlaspack.js

@@ -76,7 +76,7 @@ const PathRequest_1 = __importDefault(require("./requests/PathRequest"));
 const Environment_1 = require("./Environment");
 const Dependency_1 = require("./Dependency");
 const events_2 = require("@atlaspack/events");
-const source_map_1 = require("@parcel/source-map");
+const source_map_1 = require("@atlaspack/source-map");
 const cache_1 = require("@atlaspack/cache");
 const rust_1 = require("@atlaspack/rust");
 const projectPath_1 = require("./projectPath");

package/dist/CommittedAsset.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const stream_1 = require("stream");
 const build_cache_1 = require("@atlaspack/build-cache");
 const utils_1 = require("@atlaspack/utils");
-const source_map_1 = __importDefault(require("@parcel/source-map"));
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const assetUtils_1 = require("./assetUtils");
 class CommittedAsset {
     constructor(value, options) {

package/dist/Transformation.js

@@ -58,6 +58,7 @@ const projectPath_1 = require("./projectPath");
 const utils_3 = require("./utils");
 const assert_1 = __importDefault(require("assert"));
 const profiler_1 = require("@atlaspack/profiler");
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const feature_flags_1 = require("@atlaspack/feature-flags");
 class Transformation {
     constructor({ request, options, config, workerApi }) {
@@ -316,7 +317,7 @@ class Transformation {
             if (asset.isASTDirty && asset.generate) {
                 let output = await asset.generate();
                 asset.content = output.content;
-                asset.mapBuffer = output.map?.toBuffer();
+                asset.mapBuffer = source_map_1.default.safeToBuffer(output.map);
             }
             asset.clearAST();
         }));
@@ -415,7 +416,7 @@ class Transformation {
             asset.generate) {
             let output = await asset.generate();
             asset.content = output.content;
-            asset.mapBuffer = output.map?.toBuffer();
+            asset.mapBuffer = source_map_1.default.safeToBuffer(output.map);
         }
         // Load config for the transformer.
         let config = preloadedConfig;

package/dist/UncommittedAsset.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
 const stream_1 = require("stream");
-const source_map_1 = __importDefault(require("@parcel/source-map"));
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const build_cache_1 = require("@atlaspack/build-cache");
 const utils_1 = require("@atlaspack/utils");
 const rust_1 = require("@atlaspack/rust");
@@ -163,7 +163,7 @@ class UncommittedAsset {
         });
         if (map) {
             this.map = map;
-            this.mapBuffer = map.toBuffer();
+            this.mapBuffer = source_map_1.default.safeToBuffer(map);
             this.setCode(code.replace(utils_1.SOURCEMAP_RE, ''));
         }
         return this.map;
@@ -295,7 +295,7 @@ class UncommittedAsset {
             content,
             ast: result.ast,
             isASTDirty: result.ast === this.ast ? this.isASTDirty : true,
-            mapBuffer: result.map ? result.map.toBuffer() : null,
+            mapBuffer: source_map_1.default.safeToBuffer(result.map),
             code: this.code,
             invalidations: this.invalidations,
         });

package/dist/assetUtils.js

@@ -23,6 +23,7 @@ const types_1 = require("./types");
 const profiler_1 = require("@atlaspack/profiler");
 const IdentifierRegistry_1 = require("./IdentifierRegistry");
 const EnvironmentManager_1 = require("./EnvironmentManager");
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 function createAssetIdFromOptions(options) {
     const data = {
         environmentId: (0, EnvironmentManager_1.toEnvironmentId)(options.env),
@@ -102,7 +103,7 @@ async function _generateFromAST(asset) {
         logger: new logger_1.PluginLogger({ origin: pluginName }),
         tracer: new profiler_1.PluginTracer({ origin: pluginName, category: 'asset-generate' }),
     });
-    let mapBuffer = map?.toBuffer();
+    let mapBuffer = source_map_1.default.safeToBuffer(map);
     // Store the results in the cache so we can avoid generating again next time
     await Promise.all([
         asset.options.cache.setStream((0, nullthrows_1.default)(asset.value.contentKey), (0, utils_1.blobToStream)(content)),

package/dist/atlaspack-v3/worker/compat/mutable-asset.js

@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _MutableAsset_astDirty, _MutableAsset_ast, _MutableAsset_contents, _MutableAsset_inner, _MutableAsset_map, _MutableAsset_projectRoot, _MutableAsset_sourceMap;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MutableAsset = void 0;
-const source_map_1 = __importDefault(require("@parcel/source-map"));
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const stream_1 = require("stream");
 const bitflags_1 = require("./bitflags");
 const asset_symbols_1 = require("./asset-symbols");

package/dist/worker.js

@@ -21,7 +21,7 @@ const Validation_1 = __importDefault(require("./Validation"));
 const AtlaspackConfig_1 = require("./AtlaspackConfig");
 const registerCoreWithSerializer_1 = require("./registerCoreWithSerializer");
 const build_cache_1 = require("@atlaspack/build-cache");
-const source_map_1 = require("@parcel/source-map");
+const source_map_1 = require("@atlaspack/source-map");
 // @ts-expect-error TS2305
 const rust_1 = require("@atlaspack/rust");
 const workers_1 = __importDefault(require("@atlaspack/workers"));

package/lib/Atlaspack.js

@@ -80,7 +80,7 @@ var _PathRequest = _interopRequireDefault(require("./requests/PathRequest"));
 var _Environment = require("./Environment");
 var _Dependency = require("./Dependency");
 function _sourceMap() {
-  const data = require("@parcel/source-map");
+  const data = require("@atlaspack/source-map");
   _sourceMap = function () {
     return data;
   };

package/lib/CommittedAsset.js

@@ -26,7 +26,7 @@ function _utils() {
   return data;
 }
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@parcel/source-map"));
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap = function () {
     return data;
   };

package/lib/Transformation.js

@@ -72,6 +72,13 @@ function _profiler() {
   };
   return data;
 }
+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 () {
@@ -343,10 +350,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();
     }));
@@ -453,10 +459,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.

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;
   };
@@ -218,7 +218,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;
@@ -349,7 +349,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
     });

package/lib/assetUtils.js

@@ -65,6 +65,13 @@ function _profiler() {
 }
 var _IdentifierRegistry = require("./IdentifierRegistry");
 var _EnvironmentManager = require("./EnvironmentManager");
+function _sourceMap() {
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
+  _sourceMap = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function createAssetIdFromOptions(options) {
   const data = {
@@ -150,7 +157,7 @@ async function _generateFromAST(asset) {
       category: 'asset-generate'
     })
   });
-  let mapBuffer = map === null || map === void 0 ? void 0 : map.toBuffer();
+  let mapBuffer = _sourceMap().default.safeToBuffer(map);
   // Store the results in the cache so we can avoid generating again next time
   await Promise.all([asset.options.cache.setStream((0, _nullthrows().default)(asset.value.contentKey), (0, _utils().blobToStream)(content)), mapBuffer != null && asset.options.cache.setBlob((0, _nullthrows().default)(asset.value.mapKey), mapBuffer)]);
   return {

package/lib/atlaspack-v3/worker/compat/mutable-asset.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MutableAsset = void 0;
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@parcel/source-map"));
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap = function () {
     return data;
   };

package/lib/types/CommittedAsset.d.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'stream';
 import type { AST, Blob } from '@atlaspack/types';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import type { Asset, Dependency, AtlaspackOptions } from './types';
 export default class CommittedAsset {
     key: string | null | undefined;

package/lib/types/PackagerRunner.d.ts

@@ -1,5 +1,5 @@
 import type { Blob, FilePath, BundleResult, Async } from '@atlaspack/types';
-import type SourceMap from '@parcel/source-map';
+import type SourceMap from '@atlaspack/source-map';
 import type { Bundle as InternalBundle, Config, DevDepRequest, AtlaspackOptions, ReportFn, RequestInvalidation, DevDepRequestRef } from './types';
 import type { AtlaspackConfig, LoadedPlugin } from './AtlaspackConfig';
 import type InternalBundleGraph from './BundleGraph';

package/lib/types/UncommittedAsset.d.ts

@@ -1,7 +1,7 @@
 import type { AST, Blob, DependencyOptions, FileCreateInvalidation, GenerateOutput, PackageName, TransformerResult } from '@atlaspack/types';
 import type { Asset, Dependency, AtlaspackOptions, Invalidations } from './types';
 import { Readable } from 'stream';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import { ProjectPath } from './projectPath';
 type UncommittedAssetOptions = {
     value: Asset;

package/lib/types/atlaspack-v3/worker/compat/mutable-asset.d.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 { MutableAsset as IMutableAsset, Stats, FileSystem, FilePath, Environment, Meta, BundleBehavior, ASTGenerator, AST, Dependency, DependencyOptions, FileCreateInvalidation, EnvironmentOptions } from '@atlaspack/types';

package/lib/types/public/Asset.d.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';
 import type { Asset as IAsset, AST, ASTGenerator, Dependency as IDependency, DependencyOptions, Environment as IEnvironment, EnvironmentOptions, FileCreateInvalidation, FilePath, Meta, MutableAsset as IMutableAsset, Stats, MutableAssetSymbols as IMutableAssetSymbols, AssetSymbols as IAssetSymbols, BundleBehavior } from '@atlaspack/types';

package/lib/worker.js

@@ -46,7 +46,7 @@ function _buildCache() {
   return data;
 }
 function _sourceMap() {
-  const data = require("@parcel/source-map");
+  const data = require("@atlaspack/source-map");
   _sourceMap = function () {
     return data;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.289+71900f350",
+  "version": "2.16.2-canary.291+31c12bc28",
   "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.3-canary.357+71900f350",
-    "@atlaspack/cache": "3.1.1-canary.289+71900f350",
-    "@atlaspack/diagnostic": "2.14.1-canary.357+71900f350",
-    "@atlaspack/events": "2.14.1-canary.357+71900f350",
-    "@atlaspack/feature-flags": "2.14.1-canary.357+71900f350",
-    "@atlaspack/fs": "2.14.5-canary.289+71900f350",
-    "@atlaspack/graph": "3.4.1-canary.357+71900f350",
-    "@atlaspack/logger": "2.14.5-canary.289+71900f350",
-    "@atlaspack/package-manager": "2.14.5-canary.289+71900f350",
-    "@atlaspack/plugin": "2.14.5-canary.289+71900f350",
-    "@atlaspack/profiler": "2.14.1-canary.357+71900f350",
-    "@atlaspack/rust": "3.2.1-canary.289+71900f350",
-    "@atlaspack/types": "2.14.5-canary.289+71900f350",
-    "@atlaspack/utils": "2.14.5-canary.289+71900f350",
-    "@atlaspack/workers": "2.14.5-canary.289+71900f350",
+    "@atlaspack/build-cache": "2.13.3-canary.359+31c12bc28",
+    "@atlaspack/cache": "3.1.1-canary.291+31c12bc28",
+    "@atlaspack/diagnostic": "2.14.1-canary.359+31c12bc28",
+    "@atlaspack/events": "2.14.1-canary.359+31c12bc28",
+    "@atlaspack/feature-flags": "2.14.1-canary.359+31c12bc28",
+    "@atlaspack/fs": "2.14.5-canary.291+31c12bc28",
+    "@atlaspack/graph": "3.4.1-canary.359+31c12bc28",
+    "@atlaspack/logger": "2.14.5-canary.291+31c12bc28",
+    "@atlaspack/package-manager": "2.14.5-canary.291+31c12bc28",
+    "@atlaspack/plugin": "2.14.5-canary.291+31c12bc28",
+    "@atlaspack/profiler": "2.14.1-canary.359+31c12bc28",
+    "@atlaspack/rust": "3.2.1-canary.291+31c12bc28",
+    "@atlaspack/source-map": "3.0.1-canary.4070+31c12bc28",
+    "@atlaspack/types": "2.14.5-canary.291+31c12bc28",
+    "@atlaspack/utils": "2.14.5-canary.291+31c12bc28",
+    "@atlaspack/workers": "2.14.5-canary.291+31c12bc28",
     "@mischnic/json-sourcemap": "^0.1.0",
-    "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
     "clone": "^2.1.1",
@@ -61,5 +61,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "71900f3508d53c3882ca8ea71501ba3069687d4e"
+  "gitHead": "31c12bc28d861d4ce80446afffc18cb0c7b4ebd3"
 }

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/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/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';

package/tsconfig.json

@@ -52,6 +52,9 @@
     },
     {
       "path": "../workers/tsconfig.json"
+    },
+    {
+      "path": "../source-map/tsconfig.json"
     }
   ]
 }