In-source @parcel/source-map

In sources the @parcel/source-map Rust and JavaScript code into Atlaspack,
and updates all of the usages.

Introduces a `safeToBuffer` method to ensure that any Parcel sourcemaps
don't cause problems from the outside.

Author: marcins

.changeset/thirty-planets-peel.md

@@ -0,0 +1,28 @@
+---
+'@atlaspack/parcel-to-atlaspack': minor
+'@atlaspack/transformer-typescript-types': minor
+'@atlaspack/transformer-typescript-tsc': minor
+'@atlaspack/eslint-plugin-internal': minor
+'@atlaspack/optimizer-inline-requires': minor
+'@atlaspack/integration-tests': minor
+'@atlaspack/types-internal': minor
+'@atlaspack/feature-flags': minor
+'@atlaspack/optimizer-cssnano': minor
+'@atlaspack/transformer-babel': minor
+'@atlaspack/eslint-config': minor
+'@atlaspack/optimizer-terser': minor
+'@atlaspack/transformer-less': minor
+'@atlaspack/transformer-sass': minor
+'@atlaspack/transformer-css': minor
+'@atlaspack/source-map': minor
+'@atlaspack/transformer-js': minor
+'@atlaspack/optimizer-css': minor
+'@atlaspack/optimizer-swc': minor
+'@atlaspack/packager-css': minor
+'@atlaspack/packager-js': minor
+'@atlaspack/utils': minor
+'@atlaspack/core': minor
+'@atlaspack/rust': minor
+---
+
+Use an in-sourced version of @parcel/source-map, as @atlaspack/source-map

Cargo.lock

@@ -40,6 +40,7 @@ anyhow = "1.0.95"
 assert_fs = "1.1.2"
 async-trait = "0.1.85"
 base64 = "0.22.1"
+base64-simd = "0.7"
 bitflags = "2.6.0"
 browserslist-rs = "0.17.0"
 cfg-if = "1.0.0"
@@ -50,6 +51,7 @@ criterion = "0.5.1"
 crossbeam = "0.8.4"
 crossbeam-channel = "0.5.14"
 data-encoding = "2.6.0"
+data-url = "0.1.1"
 derive_builder = "0.20.2"
 dunce = "1.0.5"
 dyn-hash = "0.2.0"
@@ -137,6 +139,7 @@ tracing-subscriber = "0.3.19"
 tracing-test = "0.2.5"
 url = "2.5.4"
 url-search-params = "12.0.0"
+vlq = "0.5.1"
 which = "7.0.3"
 whoami = "1.5.2"
 xxhash-rust = "0.8.15"
@@ -146,7 +149,7 @@ serde_yaml = "0.9.34+deprecated"
 
 # CANNOT UPDATE
 ## rkyv includes a breaking change in a minor release which breaks parcel_sourcemap
-parcel_sourcemap = "2.1.1"
+parcel_sourcemap_ext = { package = "parcel_sourcemap",  version="2.1.1" }
 rkyv = "0.7.38"
 
 ## Other

Cargo.toml

@@ -14,10 +14,12 @@ async-trait = { workspace = true }
 atlaspack_core = { path = "../atlaspack_core" }
 atlaspack_filesystem = { path = "../atlaspack_filesystem" }
 lightningcss = { workspace = true, features = ["browserslist", "sourcemap"] }
-parcel_sourcemap = { workspace = true}
+parcel_sourcemap_ext = {  workspace = true }
+parcel_sourcemap = { path = "../parcel_sourcemap" }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 
+
 [dev-dependencies]
 pretty_assertions = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

crates/atlaspack_plugin_transformer_css/Cargo.toml

@@ -18,7 +18,8 @@ use lightningcss::dependencies::DependencyOptions;
 use lightningcss::printer::PrinterOptions;
 use lightningcss::stylesheet::{ParserFlags, ParserOptions, StyleSheet};
 use lightningcss::targets::{Browsers, Targets};
-use parcel_sourcemap::SourceMap as ParcelSourceMap;
+// Lightning CSS uses the upstream Parcel SourceMap, but Atlaspack uses the in-sourced version (which will eventually be renamed)
+use parcel_sourcemap_ext::SourceMap as ParcelSourceMapExt;
 use serde::Deserialize;
 
 use crate::css_transformer_config::{CssModulesConfig, CssModulesFullConfig, CssTransformerConfig};
@@ -153,8 +154,8 @@ impl TransformerPlugin for AtlaspackCssTransformerPlugin {
       },
     )?;
 
-    let mut lightning_source_map: Option<ParcelSourceMap> = if asset.env.source_map.is_some() {
-      let mut sm = ParcelSourceMap::new(&self.project_root.to_string_lossy());
+    let mut lightning_source_map: Option<ParcelSourceMapExt> = if asset.env.source_map.is_some() {
+      let mut sm = ParcelSourceMapExt::new(&self.project_root.to_string_lossy());
       sm.add_source(&asset.file_path.to_string_lossy());
       sm.set_source_content(0, asset.code.as_str()?)?;
       Some(sm)
@@ -494,8 +495,12 @@ impl TransformerPlugin for AtlaspackCssTransformerPlugin {
     css_code.push(css.code);
     asset.code = Code::from(css_code.join("\n"));
 
-    if let Some(source_map) = lightning_source_map.clone() {
-      let mut source_map = SourceMap::from(source_map);
+    if let Some(mut source_map) = lightning_source_map {
+      // The Lightning CSS sourcemap is a Parcel SourceMap, but we need an Atlaspack SourceMap - the only safe way to convert
+      // from one to the other is via JSON - as a buffer will use rkyv and requires binary compatibility
+      let lightning_source_map_json =
+        source_map.to_json(Some(&self.project_root.to_string_lossy()))?;
+      let mut source_map = SourceMap::from_json(&self.project_root, &lightning_source_map_json)?;
 
       if let Some(original_map) = asset.map {
         source_map.extends(&mut original_map.clone())?;

crates/atlaspack_plugin_transformer_css/src/css_transformer.rs

@@ -10,7 +10,7 @@ workspace = true
 
 [dependencies]
 atlaspack_filesystem = { path = "../atlaspack_filesystem" }
-parcel_sourcemap = { workspace = true, features = ["json"] }
+parcel_sourcemap = { path = "../parcel_sourcemap", features = ["json"] }
 regex = { workspace = true }
 rkyv = { workspace = true }
 serde = { workspace = true, features = ["derive"] }

crates/atlaspack_sourcemap/Cargo.toml

@@ -23,6 +23,7 @@ atlaspack_napi_helpers = { path = "../atlaspack_napi_helpers" }
 atlaspack_vcs = { path = "../atlaspack_vcs" }
 atlaspack_swc_runner = { path = "../atlaspack_swc_runner" }
 lmdb-js-lite = { path = "../lmdb-js-lite" }
+parcel_sourcemap = { path = "../parcel_sourcemap" }
 
 aho-corasick = { workspace = true }
 anyhow = { workspace = true }
@@ -32,6 +33,7 @@ mockall = { workspace = true }
 napi-derive = { workspace = true }
 num_cpus = { workspace = true }
 parking_lot = { workspace = true }
+rkyv = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 toml = { workspace = true }
@@ -69,5 +71,8 @@ napi = { workspace = true, features = ["serde-json"] }
 [target.'cfg(windows)'.dependencies]
 mimalloc = { workspace = true }
 
+[target.'cfg(target_os = "macos")'.dependencies]
+jemallocator = { workspace = true, features = ["disable_initial_exec_tls"]}
+
 [build-dependencies]
 napi-build = { workspace = true }

crates/node-bindings/Cargo.toml

@@ -23,6 +23,7 @@ mod atlaspack;
 pub mod lmdb;
 mod optimizers;
 mod resolver;
+mod sourcemap;
 mod string_ops;
 mod transformer;
 pub mod vcs;