Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 132 additions & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ serde_json = { version = "1", features = ["raw_value"] }
simd-json = "0.17"
sonic-rs = "0.3"
rayon = "1"
napi = { version = "2", default-features = false, features = ["napi6"] }
napi-derive = "2"
napi = { version = "3", default-features = false, features = ["napi6"] }
napi-derive = "3"
napi-build = "2"
wasm-bindgen = "0.2"
js-sys = "0.3"
Expand Down
9 changes: 7 additions & 2 deletions packages/remapping/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use napi::JsValue;
use napi::bindgen_prelude::JsObjectValue;
use napi_derive::napi;

// ── ConcatBuilder ────────────────────────────────────────────────
Expand Down Expand Up @@ -41,7 +43,10 @@ impl JsConcatBuilder {
///
/// Returns the remapped source map as a JSON string.
#[napi]
pub fn remap(outer_json: String, loader_map: napi::JsObject) -> napi::Result<String> {
pub fn remap(
outer_json: String,
loader_map: napi::bindgen_prelude::Object<'_>,
) -> napi::Result<String> {
let outer = srcmap_sourcemap::SourceMap::from_json(&outer_json)
.map_err(|e| napi::Error::from_reason(e.to_string()))?;

Expand All @@ -51,7 +56,7 @@ pub fn remap(outer_json: String, loader_map: napi::JsObject) -> napi::Result<Str

for source in &outer.sources {
if !upstream_maps.contains_key(source) {
let val: Option<napi::JsUnknown> = loader_map.get_named_property(source).ok();
let val: Option<napi::Unknown<'_>> = loader_map.get_named_property(source).ok();
let upstream = val.and_then(|v| {
let val_type = v.get_type().ok()?;
if val_type == napi::ValueType::Null || val_type == napi::ValueType::Undefined {
Expand Down
Loading