From 67bbcd075cac3b905f80d360385d00b0889938f7 Mon Sep 17 00:00:00 2001 From: Boshen Date: Wed, 19 Feb 2025 15:06:06 +0800 Subject: [PATCH 01/19] refactor: remove papaya `.collector(seize::Collector::new())` call (#393) --- Cargo.lock | 1 - Cargo.toml | 1 - src/fs_cache.rs | 2 -- 3 files changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0c6ab15..19dda94b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -680,7 +680,6 @@ dependencies = [ "pnp", "rayon", "rustc-hash", - "seize", "serde", "serde_json", "simdutf8", diff --git a/Cargo.toml b/Cargo.toml index 1b22cb1b..f514e2a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,6 @@ json-strip-comments = "1" once_cell = "1" # Use `std::sync::OnceLock::get_or_try_init` when it is stable. papaya = "0.2.0" rustc-hash = { version = "2" } -seize = { version = "0.5" } serde = { version = "1", features = ["derive"], optional = true } # derive for Deserialize from package.json serde_json = { version = "1", features = ["preserve_order"], optional = true } # preserve_order: package_json.exports requires order such as `["require", "import", "default"]` simdutf8 = { version = "0.1" } diff --git a/src/fs_cache.rs b/src/fs_cache.rs index e73b9ca1..21e5f20c 100644 --- a/src/fs_cache.rs +++ b/src/fs_cache.rs @@ -193,12 +193,10 @@ impl FsCache { paths: HashSet::builder() .hasher(BuildHasherDefault::default()) .resize_mode(papaya::ResizeMode::Blocking) - .collector(seize::Collector::new()) .build(), tsconfigs: HashMap::builder() .hasher(BuildHasherDefault::default()) .resize_mode(papaya::ResizeMode::Blocking) - .collector(seize::Collector::new()) .build(), } } From f2d468b3a516417e5ec5aab419630c693780b22f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 20:03:43 +0000 Subject: [PATCH 02/19] chore(deps): update crate-ci/typos action to v1.29.9 (#397) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [crate-ci/typos](https://redirect.github.com/crate-ci/typos) | action | patch | `v1.29.7` -> `v1.29.9` | --- ### Release Notes
crate-ci/typos (crate-ci/typos) ### [`v1.29.9`](https://redirect.github.com/crate-ci/typos/compare/v1.29.8...v1.29.9) [Compare Source](https://redirect.github.com/crate-ci/typos/compare/v1.29.8...v1.29.9) ### [`v1.29.8`](https://redirect.github.com/crate-ci/typos/releases/tag/v1.29.8) [Compare Source](https://redirect.github.com/crate-ci/typos/compare/v1.29.7...v1.29.8) #### \[1.29.8] - 2025-02-19 ##### Features - Attempt to build Linux aarch64 binaries
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - "before 10pm on monday" in timezone Asia/Shanghai. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxc-project/oxc-resolver). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c45b4126..7ac6e416 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ jobs: steps: - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: crate-ci/typos@51f257b946f503b768e522781f56e9b7b5570d48 # v1.29.7 + - uses: crate-ci/typos@212923e4ff05b7fc2294a204405eec047b807138 # v1.29.9 with: files: . From f4a3c439743857890e27fe02b764a1cbe652788f Mon Sep 17 00:00:00 2001 From: Boshen Date: Sun, 23 Feb 2025 14:48:23 +0800 Subject: [PATCH 03/19] ci: combine lint jobs (save some job runners for the org) --- .github/workflows/ci.yml | 44 +++++++++++++--------------------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ac6e416..329cd25c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,20 @@ jobs: - run: pnpm run build:debug && pnpm run test if: ${{ matrix.os != 'windows-latest' }} + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 + - uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0 + with: + components: clippy rust-docs + - run: cargo clippy --all-features --all-targets -- -D warnings + - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --all-features + - uses: crate-ci/typos@212923e4ff05b7fc2294a204405eec047b807138 # v1.29.9 + with: + files: . + wasm: name: Check Wasm runs-on: ubuntu-latest @@ -87,33 +101,3 @@ jobs: run: pnpm run test env: WASI_TEST: 1 - - typos: - name: Spell Check - runs-on: ubuntu-latest - steps: - - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - - uses: crate-ci/typos@212923e4ff05b7fc2294a204405eec047b807138 # v1.29.9 - with: - files: . - - lint: - name: Clippy - runs-on: ubuntu-latest - steps: - - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0 - with: - components: clippy - - run: cargo clippy --all-features --all-targets -- -D warnings - - doc: - name: Doc - runs-on: ubuntu-latest - steps: - - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0 - with: - components: rust-docs - - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --all-features From eae2fefec4aa737101c283c701f3116253da2774 Mon Sep 17 00:00:00 2001 From: Boshen Date: Sun, 23 Feb 2025 22:13:11 +0800 Subject: [PATCH 04/19] ci: remove `renovate/**` from push trigger --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 329cd25c..7de3d1ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,6 @@ on: push: branches: - main - - "renovate/**" paths-ignore: - "**/*.md" - "!.github/workflows/ci.yml" From dccb1cb0c222dc9f936679d3581c79a3fa25ed44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 07:08:11 +0800 Subject: [PATCH 05/19] chore(deps): update github-actions (#399) --- .github/workflows/benchmark.yml | 2 +- .github/workflows/codecov.yml | 2 +- .github/workflows/release-napi.yml | 4 ++-- .github/workflows/release-plz.yml | 2 +- .github/workflows/zizmor.yml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index f63150f2..814b6512 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -39,7 +39,7 @@ jobs: env: RUSTFLAGS: "-C debuginfo=1 -C strip=none" - - uses: CodSpeedHQ/action@1015f4f828ff74b7a950909897fe581d6ba868cc # v3.3.1 + - uses: CodSpeedHQ/action@63ae6025a0ffee97d7736a37c9192dbd6ed4e75f # v3.4.0 timeout-minutes: 30 with: run: cargo codspeed run diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 220f1ef5..960732a1 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -40,7 +40,7 @@ jobs: - run: cargo llvm-cov --lcov --output-path lcov.info - name: Upload Artifact - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 with: name: codecov path: lcov.info diff --git a/.github/workflows/release-napi.yml b/.github/workflows/release-napi.yml index 812c4bae..0324f0c1 100644 --- a/.github/workflows/release-napi.yml +++ b/.github/workflows/release-napi.yml @@ -156,7 +156,7 @@ jobs: pnpm test - name: Upload artifacts - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 with: name: bindings-${{ matrix.target }} path: | @@ -203,7 +203,7 @@ jobs: rm -rf node_modules rm -rf target - name: Upload artifact - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 with: name: bindings-freebsd path: napi/*.node diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml index 3cb04ee3..31783575 100644 --- a/.github/workflows/release-plz.yml +++ b/.github/workflows/release-plz.yml @@ -24,7 +24,7 @@ jobs: - name: Run release-plz id: release-plz - uses: MarcoIeni/release-plz-action@36d2dcf6a250ff9c4dfd2984e988d79ea67a4c6a # v0.5 + uses: MarcoIeni/release-plz-action@49d211662734649022d06ac385e317aa025c64e7 # v0.5 env: GITHUB_TOKEN: ${{ secrets.OXC_BOT_PAT }} CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index a514355c..f1d061f8 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: taiki-e/install-action@54b836426b3fa9aef432e760885ea0419ab50dab # v2.48.15 + - uses: taiki-e/install-action@e03236526ace47fa2e04bebcfc6da471ebd4690c # v2.49.0 with: tool: zizmor @@ -34,7 +34,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload SARIF file - uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9 + uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10 with: sarif_file: results.sarif category: zizmor From 5a3eac7f0388a574527b432412e3fac8e6fd4ec7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 12:13:44 +0800 Subject: [PATCH 06/19] chore(deps): update dependency rust to v1.85.0 (#398) --- .github/workflows/ci.yml | 20 ++++++++++++++------ Cargo.toml | 1 + rust-toolchain.toml | 2 +- src/file_system.rs | 6 +++--- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de3d1ab..dc6ae3d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,17 +84,25 @@ jobs: steps: - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0 + # Downgrade Rust 1.85.0 https://github.com/toyobayashi/emnapi/issues/136 + - name: Change to Rust 1.84.1 + run: | + sed -i ${{ (runner.os == 'macOS' && '""') || '' }} -e 's/channel = ".*"/channel = "1.84.1"/g' rust-toolchain.toml + sed -i ${{ (runner.os == 'macOS' && '""') || '' }} -e 's/profile = "default"/profile = "minimal"/g' rust-toolchain.toml + cat rust-toolchain.toml + rustup show + rustup target add wasm32-wasip1-threads + + - name: Rust Cache + uses: Swatinem/rust-cache@v2 with: - cache-key: wasi - save-cache: ${{ github.ref_name == 'main' }} + shared-key: wasi + save-if: ${{ github.ref_name == 'main' }} - uses: ./.github/actions/pnpm - name: Build - run: | - rustup target add wasm32-wasip1-threads - pnpm build --target wasm32-wasip1-threads + run: pnpm build --target wasm32-wasip1-threads - name: Test run: pnpm run test diff --git a/Cargo.toml b/Cargo.toml index f514e2a2..ef4bf35f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,7 @@ undocumented_unsafe_blocks = "warn" # I want to write the best Rust code so both pedantic and nursery is enabled. # We should only disable rules globally if they are either false positives, chaotic, or does not make sense. nursery = { level = "warn", priority = -1 } +literal_string_with_formatting_args = "allow" pedantic = { level = "warn", priority = -1 } # Allowed rules # pedantic diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5a09b9bb..aaba1588 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.84.1" +channel = "1.85.0" profile = "default" diff --git a/src/file_system.rs b/src/file_system.rs index 6ddd4bea..006c4d8b 100644 --- a/src/file_system.rs +++ b/src/file_system.rs @@ -208,9 +208,9 @@ impl FileSystem for FileSystemOs { .file_type(info.physical_base_path(), info.zip_path) .map(FileMetadata::from), VPath::Virtual(info) => { - Self::metadata(&info.physical_base_path()).map(FileMetadata::from) + Self::metadata(&info.physical_base_path()) } - VPath::Native(path) => Self::metadata(&path).map(FileMetadata::from), + VPath::Native(path) => Self::metadata(&path), } } else { Self::metadata(path).map(FileMetadata::from) @@ -219,7 +219,7 @@ impl FileSystem for FileSystemOs { } fn symlink_metadata(&self, path: &Path) -> io::Result { - Self::symlink_metadata(path).map(FileMetadata::from) + Self::symlink_metadata(path) } fn read_link(&self, path: &Path) -> io::Result { From d53043e1a6ab12b6ce15a95bbb7f43861b2a0956 Mon Sep 17 00:00:00 2001 From: Boshen Date: Mon, 24 Feb 2025 23:00:54 +0800 Subject: [PATCH 07/19] chore: bump napi for fix in Rust v1.85.0 (#403) --- .github/workflows/ci.yml | 20 +++++---------- Cargo.lock | 53 ++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc6ae3d8..7de3d1ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,25 +84,17 @@ jobs: steps: - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - # Downgrade Rust 1.85.0 https://github.com/toyobayashi/emnapi/issues/136 - - name: Change to Rust 1.84.1 - run: | - sed -i ${{ (runner.os == 'macOS' && '""') || '' }} -e 's/channel = ".*"/channel = "1.84.1"/g' rust-toolchain.toml - sed -i ${{ (runner.os == 'macOS' && '""') || '' }} -e 's/profile = "default"/profile = "minimal"/g' rust-toolchain.toml - cat rust-toolchain.toml - rustup show - rustup target add wasm32-wasip1-threads - - - name: Rust Cache - uses: Swatinem/rust-cache@v2 + - uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0 with: - shared-key: wasi - save-if: ${{ github.ref_name == 'main' }} + cache-key: wasi + save-cache: ${{ github.ref_name == 'main' }} - uses: ./.github/actions/pnpm - name: Build - run: pnpm build --target wasm32-wasip1-threads + run: | + rustup target add wasm32-wasip1-threads + pnpm build --target wasm32-wasip1-threads - name: Test run: pnpm run test diff --git a/Cargo.lock b/Cargo.lock index 19dda94b..4d41913f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.14" +version = "1.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9" +checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" dependencies = [ "shlex", ] @@ -335,9 +335,9 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" [[package]] name = "endian-type" @@ -504,9 +504,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.170" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" [[package]] name = "libloading" @@ -537,9 +537,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "log" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" [[package]] name = "memchr" @@ -558,9 +558,9 @@ dependencies = [ [[package]] name = "napi" -version = "3.0.0-alpha.28" +version = "3.0.0-alpha.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd957e2cc4bd62b730b10ff1f35775f8a81dac84a3bfac273b0ec4336f53ab8" +checksum = "8fde2ea4fb7f75eb001002f33cf502df0aff268665d3717ed2e45dc69021d6e8" dependencies = [ "bitflags", "ctor", @@ -578,9 +578,9 @@ checksum = "db836caddef23662b94e16bf1f26c40eceb09d6aee5d5b06a7ac199320b69b19" [[package]] name = "napi-derive" -version = "3.0.0-alpha.26" +version = "3.0.0-alpha.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f0b6f3f77925d8fd2030855af659ce428a7bb6e10e94852e226f509186ba7c" +checksum = "c8097918a9af1976700eac6944b120b65ad17bf6d38906703d2b68e17ee89256" dependencies = [ "convert_case", "napi-derive-backend", @@ -591,9 +591,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "2.0.0-alpha.26" +version = "2.0.0-alpha.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c694bb49a2fa84dd9542d51eece39a57519f9cf1fc2deefa9d119ab8181e374d" +checksum = "8e5adc92fcdec3aa09f591bd2b139d7c669399f34b8211fe653641b52d40d3b3" dependencies = [ "convert_case", "proc-macro2", @@ -718,14 +718,15 @@ checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pnp" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46770cee76a618023fea15411d0449dd066dc232cc17e4562f154da215f27af7" +checksum = "96cda59e692c332a953b19dcfe863b45344ce8bfc9027e229f3a732e3d61c50a" dependencies = [ "arca", "byteorder", "concurrent_lru", "fancy-regex", + "indexmap 2.7.1", "lazy_static", "miniz_oxide", "pathdiff", @@ -792,9 +793,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f" dependencies = [ "bitflags", ] @@ -873,18 +874,18 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -893,9 +894,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap 2.7.1", "itoa", @@ -1095,9 +1096,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "uuid" -version = "1.13.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f41ffb7cf259f1ecc2876861a17e7142e63ead296f671f81f6ae85903e0d6" +checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1" dependencies = [ "getrandom", ] From f6f8688239e4d77f7a38c1910b610ae74becfc61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 09:56:54 +0800 Subject: [PATCH 08/19] chore(deps): update crate-ci/typos action to v1.29.10 (#405) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de3d1ab..9de6250d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: components: clippy rust-docs - run: cargo clippy --all-features --all-targets -- -D warnings - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --all-features - - uses: crate-ci/typos@212923e4ff05b7fc2294a204405eec047b807138 # v1.29.9 + - uses: crate-ci/typos@db35ee91e80fbb447f33b0e5fbddb24d2a1a884f # v1.29.10 with: files: . From 91b05952bb0b5c8885ab1144e5125b2d414cbdad Mon Sep 17 00:00:00 2001 From: Boshen Date: Wed, 26 Feb 2025 09:57:15 +0800 Subject: [PATCH 09/19] chore: bump napi (#404) --- Cargo.lock | 9 +- napi/Cargo.toml | 4 - napi/index.js | 8 +- napi/resolver.wasi-browser.js | 18 +- napi/resolver.wasi.cjs | 17 +- package.json | 10 +- pnpm-lock.yaml | 648 +++++++++++++++++----------------- 7 files changed, 350 insertions(+), 364 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d41913f..a3eb76f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -558,9 +558,9 @@ dependencies = [ [[package]] name = "napi" -version = "3.0.0-alpha.30" +version = "3.0.0-alpha.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fde2ea4fb7f75eb001002f33cf502df0aff268665d3717ed2e45dc69021d6e8" +checksum = "b1911b4f0d33fbcb5f46ff68319ec053ab8a655f3a17440eae1246a23ba2ad78" dependencies = [ "bitflags", "ctor", @@ -572,9 +572,9 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.1.4" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db836caddef23662b94e16bf1f26c40eceb09d6aee5d5b06a7ac199320b69b19" +checksum = "40685973218af4aa4b42486652692c294c44b5a67e4b2202df721c9063f2e51c" [[package]] name = "napi-derive" @@ -657,7 +657,6 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" name = "oxc_napi_resolver" version = "0.0.0" dependencies = [ - "ctor", "napi", "napi-build", "napi-derive", diff --git a/napi/Cargo.toml b/napi/Cargo.toml index 313bfcf6..bb6b0d6c 100644 --- a/napi/Cargo.toml +++ b/napi/Cargo.toml @@ -11,7 +11,6 @@ test = false doctest = false [dependencies] -ctor = "0.3.4" napi = { version = "3.0.0-alpha", default-features = false, features = ["napi3", "serde-json"] } napi-derive = { version = "3.0.0-alpha" } oxc_resolver = { path = ".." } @@ -19,6 +18,3 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features = [build-dependencies] napi-build = "2.1.3" - -[package.metadata.cargo-shear] -ignored = ["ctor"] diff --git a/napi/index.js b/napi/index.js index 01ef9fb1..42bfea49 100644 --- a/napi/index.js +++ b/napi/index.js @@ -60,7 +60,13 @@ const isMuslFromChildProcess = () => { }; function requireNative() { - if (process.platform === 'android') { + if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) { + try { + nativeBinding = require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH); + } catch (err) { + loadErrors.push(err); + } + } else if (process.platform === 'android') { if (process.arch === 'arm64') { try { return require('./resolver.android-arm64.node'); diff --git a/napi/resolver.wasi-browser.js b/napi/resolver.wasi-browser.js index e2e360f7..371ad31c 100644 --- a/napi/resolver.wasi-browser.js +++ b/napi/resolver.wasi-browser.js @@ -53,21 +53,13 @@ const { return importObject; }, beforeInit({ instance }) { - __napi_rs_initialize_modules(instance); + for (const name of Object.keys(instance.exports)) { + if (name.startsWith('__napi_register__')) { + instance.exports[name](); + } + } }, }); - -function __napi_rs_initialize_modules(__napiInstance) { - __napiInstance.exports['__napi_register__NapiResolveOptions_struct_0']?.(); - __napiInstance.exports['__napi_register__EnforceExtension_1']?.(); - __napiInstance.exports['__napi_register__Restriction_struct_2']?.(); - __napiInstance.exports['__napi_register__TsconfigOptions_struct_3']?.(); - __napiInstance.exports['__napi_register__ResolveResult_struct_4']?.(); - __napiInstance.exports['__napi_register__sync_5']?.(); - __napiInstance.exports['__napi_register__ResolveTask_impl_6']?.(); - __napiInstance.exports['__napi_register__ResolverFactory_struct_7']?.(); - __napiInstance.exports['__napi_register__ResolverFactory_impl_14']?.(); -} export const ResolverFactory = __napiModule.exports.ResolverFactory; export const EnforceExtension = __napiModule.exports.EnforceExtension; export const sync = __napiModule.exports.sync; diff --git a/napi/resolver.wasi.cjs b/napi/resolver.wasi.cjs index e9b63e92..a3d5fb75 100644 --- a/napi/resolver.wasi.cjs +++ b/napi/resolver.wasi.cjs @@ -81,22 +81,15 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule return importObject; }, beforeInit({ instance }) { - __napi_rs_initialize_modules(instance); + for (const name of Object.keys(instance.exports)) { + if (name.startsWith('__napi_register__')) { + instance.exports[name](); + } + } }, }, ); -function __napi_rs_initialize_modules(__napiInstance) { - __napiInstance.exports['__napi_register__NapiResolveOptions_struct_0']?.(); - __napiInstance.exports['__napi_register__EnforceExtension_1']?.(); - __napiInstance.exports['__napi_register__Restriction_struct_2']?.(); - __napiInstance.exports['__napi_register__TsconfigOptions_struct_3']?.(); - __napiInstance.exports['__napi_register__ResolveResult_struct_4']?.(); - __napiInstance.exports['__napi_register__sync_5']?.(); - __napiInstance.exports['__napi_register__ResolveTask_impl_6']?.(); - __napiInstance.exports['__napi_register__ResolverFactory_struct_7']?.(); - __napiInstance.exports['__napi_register__ResolverFactory_impl_14']?.(); -} module.exports.ResolverFactory = __napiModule.exports.ResolverFactory; module.exports.EnforceExtension = __napiModule.exports.EnforceExtension; module.exports.sync = __napiModule.exports.sync; diff --git a/package.json b/package.json index 247fd723..07b87746 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "test": "vitest run -r ./napi" }, "devDependencies": { - "@napi-rs/cli": "3.0.0-alpha.70", - "@napi-rs/wasm-runtime": "^0.2.5", - "@types/node": "^22.10.2", + "@napi-rs/cli": "3.0.0-alpha.72", + "@napi-rs/wasm-runtime": "^0.2.7", + "@types/node": "^22.13.5", "emnapi": "^1.3.1", - "typescript": "^5.7.2", - "vitest": "^3.0.5" + "typescript": "^5.7.3", + "vitest": "^3.0.7" }, "packageManager": "pnpm@10.4.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 145aeab2..5314a12b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,23 +9,23 @@ importers: .: devDependencies: '@napi-rs/cli': - specifier: 3.0.0-alpha.70 - version: 3.0.0-alpha.70(@emnapi/runtime@1.3.1)(@types/node@22.13.4)(emnapi@1.3.1) + specifier: 3.0.0-alpha.72 + version: 3.0.0-alpha.72(@emnapi/runtime@1.3.1)(@types/node@22.13.5)(emnapi@1.3.1) '@napi-rs/wasm-runtime': - specifier: ^0.2.5 - version: 0.2.6 + specifier: ^0.2.7 + version: 0.2.7 '@types/node': - specifier: ^22.10.2 - version: 22.13.4 + specifier: ^22.13.5 + version: 22.13.5 emnapi: specifier: ^1.3.1 version: 1.3.1 typescript: - specifier: ^5.7.2 + specifier: ^5.7.3 version: 5.7.3 vitest: - specifier: ^3.0.5 - version: 3.0.5(@types/node@22.13.4) + specifier: ^3.0.7 + version: 3.0.7(@types/node@22.13.5) fixtures/pnpm: devDependencies: @@ -77,152 +77,152 @@ packages: '@emotion/unitless@0.8.1': resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} - '@esbuild/aix-ppc64@0.24.2': - resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==} + '@esbuild/aix-ppc64@0.25.0': + resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.24.2': - resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==} + '@esbuild/android-arm64@0.25.0': + resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.24.2': - resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==} + '@esbuild/android-arm@0.25.0': + resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.24.2': - resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==} + '@esbuild/android-x64@0.25.0': + resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.24.2': - resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==} + '@esbuild/darwin-arm64@0.25.0': + resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.24.2': - resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==} + '@esbuild/darwin-x64@0.25.0': + resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.24.2': - resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==} + '@esbuild/freebsd-arm64@0.25.0': + resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.24.2': - resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==} + '@esbuild/freebsd-x64@0.25.0': + resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.24.2': - resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==} + '@esbuild/linux-arm64@0.25.0': + resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.24.2': - resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==} + '@esbuild/linux-arm@0.25.0': + resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.24.2': - resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==} + '@esbuild/linux-ia32@0.25.0': + resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.24.2': - resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==} + '@esbuild/linux-loong64@0.25.0': + resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.24.2': - resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==} + '@esbuild/linux-mips64el@0.25.0': + resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.24.2': - resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==} + '@esbuild/linux-ppc64@0.25.0': + resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.24.2': - resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==} + '@esbuild/linux-riscv64@0.25.0': + resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.24.2': - resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==} + '@esbuild/linux-s390x@0.25.0': + resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.24.2': - resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==} + '@esbuild/linux-x64@0.25.0': + resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.24.2': - resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==} + '@esbuild/netbsd-arm64@0.25.0': + resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.24.2': - resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==} + '@esbuild/netbsd-x64@0.25.0': + resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.24.2': - resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==} + '@esbuild/openbsd-arm64@0.25.0': + resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.24.2': - resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==} + '@esbuild/openbsd-x64@0.25.0': + resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.24.2': - resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==} + '@esbuild/sunos-x64@0.25.0': + resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.24.2': - resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==} + '@esbuild/win32-arm64@0.25.0': + resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.24.2': - resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==} + '@esbuild/win32-ia32@0.25.0': + resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.24.2': - resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==} + '@esbuild/win32-x64@0.25.0': + resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -351,8 +351,8 @@ packages: '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - '@napi-rs/cli@3.0.0-alpha.70': - resolution: {integrity: sha512-hYZuA1gXO7hx9sXzz4qCVBevh46unQMXRvgUhg2kHctnHJNOKKOjNcxM3OF7o60olzlNsjQ1SpzySWlYn/JLSg==} + '@napi-rs/cli@3.0.0-alpha.72': + resolution: {integrity: sha512-sELH8rrBMdNsPXai5fjRP44fDnJiCNqXxBvojAuUquWlG2BE7lRajaHWfpqtUaQHqwKJdYGsR55wCk/v3apSOA==} engines: {node: '>= 16'} hasBin: true peerDependencies: @@ -591,8 +591,8 @@ packages: resolution: {integrity: sha512-hDsvmMZY8tl2CcLfjnTeE1o5W1eGTSL+ZIX8YEybtcJwA+Cc8SNHb7l6JqMnGcjOrWBZbHt8tzTN+W7qHS5Wmg==} engines: {node: '>= 10'} - '@napi-rs/wasm-runtime@0.2.6': - resolution: {integrity: sha512-z8YVS3XszxFTO73iwvFDNpQIzdMmSDTP/mB3E/ucR37V3Sx57hSExcXyMoNwaucWxnsWf4xfbZv0iZ30jr0M4Q==} + '@napi-rs/wasm-runtime@0.2.7': + resolution: {integrity: sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==} '@napi-rs/wasm-tools-android-arm-eabi@0.0.2': resolution: {integrity: sha512-/b+UU3suXjW4P0DzHRNdrnebQtFKcQf/YMeZJH+xUlKgvwli5kbmWjx8Wqqz0VETVkUTuPqJMBDIVLyc+14FGw==} @@ -694,8 +694,8 @@ packages: '@octokit/openapi-types@23.0.1': resolution: {integrity: sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==} - '@octokit/plugin-paginate-rest@11.4.2': - resolution: {integrity: sha512-BXJ7XPCTDXFF+wxcg/zscfgw2O/iDPtNSkwwR1W1W5c4Mb3zav/M2XvxQ23nVmKj7jpweB4g8viMeCQdm7LMVA==} + '@octokit/plugin-paginate-rest@11.4.3': + resolution: {integrity: sha512-tBXaAbXkqVJlRoA/zQVe9mUdb8rScmivqtpv3ovsC5xhje/a+NOCivs7eUhWBwCApJVsR4G5HMeaLbq7PxqZGA==} engines: {node: '>= 18'} peerDependencies: '@octokit/core': '>=6' @@ -730,98 +730,98 @@ packages: '@oxc-resolver/test-longfilename-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@file:fixtures/pnpm/longfilename': resolution: {directory: fixtures/pnpm/longfilename, type: directory} - '@rollup/rollup-android-arm-eabi@4.34.7': - resolution: {integrity: sha512-l6CtzHYo8D2TQ3J7qJNpp3Q1Iye56ssIAtqbM2H8axxCEEwvN7o8Ze9PuIapbxFL3OHrJU2JBX6FIIVnP/rYyw==} + '@rollup/rollup-android-arm-eabi@4.34.8': + resolution: {integrity: sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.34.7': - resolution: {integrity: sha512-KvyJpFUueUnSp53zhAa293QBYqwm94TgYTIfXyOTtidhm5V0LbLCJQRGkQClYiX3FXDQGSvPxOTD/6rPStMMDg==} + '@rollup/rollup-android-arm64@4.34.8': + resolution: {integrity: sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.34.7': - resolution: {integrity: sha512-jq87CjmgL9YIKvs8ybtIC98s/M3HdbqXhllcy9EdLV0yMg1DpxES2gr65nNy7ObNo/vZ/MrOTxt0bE5LinL6mA==} + '@rollup/rollup-darwin-arm64@4.34.8': + resolution: {integrity: sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.34.7': - resolution: {integrity: sha512-rSI/m8OxBjsdnMMg0WEetu/w+LhLAcCDEiL66lmMX4R3oaml3eXz3Dxfvrxs1FbzPbJMaItQiksyMfv1hoIxnA==} + '@rollup/rollup-darwin-x64@4.34.8': + resolution: {integrity: sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.34.7': - resolution: {integrity: sha512-oIoJRy3ZrdsXpFuWDtzsOOa/E/RbRWXVokpVrNnkS7npz8GEG++E1gYbzhYxhxHbO2om1T26BZjVmdIoyN2WtA==} + '@rollup/rollup-freebsd-arm64@4.34.8': + resolution: {integrity: sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.34.7': - resolution: {integrity: sha512-X++QSLm4NZfZ3VXGVwyHdRf58IBbCu9ammgJxuWZYLX0du6kZvdNqPwrjvDfwmi6wFdvfZ/s6K7ia0E5kI7m8Q==} + '@rollup/rollup-freebsd-x64@4.34.8': + resolution: {integrity: sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.34.7': - resolution: {integrity: sha512-Z0TzhrsNqukTz3ISzrvyshQpFnFRfLunYiXxlCRvcrb3nvC5rVKI+ZXPFG/Aa4jhQa1gHgH3A0exHaRRN4VmdQ==} + '@rollup/rollup-linux-arm-gnueabihf@4.34.8': + resolution: {integrity: sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.34.7': - resolution: {integrity: sha512-nkznpyXekFAbvFBKBy4nNppSgneB1wwG1yx/hujN3wRnhnkrYVugMTCBXED4+Ni6thoWfQuHNYbFjgGH0MBXtw==} + '@rollup/rollup-linux-arm-musleabihf@4.34.8': + resolution: {integrity: sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.34.7': - resolution: {integrity: sha512-KCjlUkcKs6PjOcxolqrXglBDcfCuUCTVlX5BgzgoJHw+1rWH1MCkETLkLe5iLLS9dP5gKC7mp3y6x8c1oGBUtA==} + '@rollup/rollup-linux-arm64-gnu@4.34.8': + resolution: {integrity: sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.34.7': - resolution: {integrity: sha512-uFLJFz6+utmpbR313TTx+NpPuAXbPz4BhTQzgaP0tozlLnGnQ6rCo6tLwaSa6b7l6gRErjLicXQ1iPiXzYotjw==} + '@rollup/rollup-linux-arm64-musl@4.34.8': + resolution: {integrity: sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.34.7': - resolution: {integrity: sha512-ws8pc68UcJJqCpneDFepnwlsMUFoWvPbWXT/XUrJ7rWUL9vLoIN3GAasgG+nCvq8xrE3pIrd+qLX/jotcLy0Qw==} + '@rollup/rollup-linux-loongarch64-gnu@4.34.8': + resolution: {integrity: sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==} cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.34.7': - resolution: {integrity: sha512-vrDk9JDa/BFkxcS2PbWpr0C/LiiSLxFbNOBgfbW6P8TBe9PPHx9Wqbvx2xgNi1TOAyQHQJ7RZFqBiEohm79r0w==} + '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': + resolution: {integrity: sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.34.7': - resolution: {integrity: sha512-rB+ejFyjtmSo+g/a4eovDD1lHWHVqizN8P0Hm0RElkINpS0XOdpaXloqM4FBkF9ZWEzg6bezymbpLmeMldfLTw==} + '@rollup/rollup-linux-riscv64-gnu@4.34.8': + resolution: {integrity: sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.34.7': - resolution: {integrity: sha512-nNXNjo4As6dNqRn7OrsnHzwTgtypfRA3u3AKr0B3sOOo+HkedIbn8ZtFnB+4XyKJojIfqDKmbIzO1QydQ8c+Pw==} + '@rollup/rollup-linux-s390x-gnu@4.34.8': + resolution: {integrity: sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.34.7': - resolution: {integrity: sha512-9kPVf9ahnpOMSGlCxXGv980wXD0zRR3wyk8+33/MXQIpQEOpaNe7dEHm5LMfyRZRNt9lMEQuH0jUKj15MkM7QA==} + '@rollup/rollup-linux-x64-gnu@4.34.8': + resolution: {integrity: sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.34.7': - resolution: {integrity: sha512-7wJPXRWTTPtTFDFezA8sle/1sdgxDjuMoRXEKtx97ViRxGGkVQYovem+Q8Pr/2HxiHp74SSRG+o6R0Yq0shPwQ==} + '@rollup/rollup-linux-x64-musl@4.34.8': + resolution: {integrity: sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.34.7': - resolution: {integrity: sha512-MN7aaBC7mAjsiMEZcsJvwNsQVNZShgES/9SzWp1HC9Yjqb5OpexYnRjF7RmE4itbeesHMYYQiAtUAQaSKs2Rfw==} + '@rollup/rollup-win32-arm64-msvc@4.34.8': + resolution: {integrity: sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.34.7': - resolution: {integrity: sha512-aeawEKYswsFu1LhDM9RIgToobquzdtSc4jSVqHV8uApz4FVvhFl/mKh92wc8WpFc6aYCothV/03UjY6y7yLgbg==} + '@rollup/rollup-win32-ia32-msvc@4.34.8': + resolution: {integrity: sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.34.7': - resolution: {integrity: sha512-4ZedScpxxIrVO7otcZ8kCX1mZArtH2Wfj3uFCxRJ9NO80gg1XV0U/b2f/MKaGwj2X3QopHfoWiDQ917FRpwY3w==} + '@rollup/rollup-win32-x64-msvc@4.34.8': + resolution: {integrity: sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==} cpu: [x64] os: [win32] @@ -831,17 +831,17 @@ packages: '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} - '@types/node@22.13.4': - resolution: {integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==} + '@types/node@22.13.5': + resolution: {integrity: sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==} '@types/stylis@4.2.7': resolution: {integrity: sha512-VgDNokpBoKF+wrdvhAAfS55OMQpL6QRglwTwNC3kIgBrzZxA4WsFj+2eLfEA/uMUDzBcEhYmjSbwQakn/i3ajA==} - '@vitest/expect@3.0.5': - resolution: {integrity: sha512-nNIOqupgZ4v5jWuQx2DSlHLEs7Q4Oh/7AYwNyE+k0UQzG7tSmjPXShUikn1mpNGzYEN2jJbTvLejwShMitovBA==} + '@vitest/expect@3.0.7': + resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==} - '@vitest/mocker@3.0.5': - resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==} + '@vitest/mocker@3.0.7': + resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -851,20 +851,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.5': - resolution: {integrity: sha512-CjUtdmpOcm4RVtB+up8r2vVDLR16Mgm/bYdkGFe3Yj/scRfCpbSi2W/BDSDcFK7ohw8UXvjMbOp9H4fByd/cOA==} + '@vitest/pretty-format@3.0.7': + resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==} - '@vitest/runner@3.0.5': - resolution: {integrity: sha512-BAiZFityFexZQi2yN4OX3OkJC6scwRo8EhRB0Z5HIGGgd2q+Nq29LgHU/+ovCtd0fOfXj5ZI6pwdlUmC5bpi8A==} + '@vitest/runner@3.0.7': + resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==} - '@vitest/snapshot@3.0.5': - resolution: {integrity: sha512-GJPZYcd7v8QNUJ7vRvLDmRwl+a1fGg4T/54lZXe+UOGy47F9yUfE18hRCtXL5aHN/AONu29NGzIXSVFh9K0feA==} + '@vitest/snapshot@3.0.7': + resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==} - '@vitest/spy@3.0.5': - resolution: {integrity: sha512-5fOzHj0WbUNqPK6blI/8VzZdkBlQLnT25knX0r4dbZI9qoZDf3qAdjoMmDcLG5A83W6oUUFJgUd0EYBc2P5xqg==} + '@vitest/spy@3.0.7': + resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==} - '@vitest/utils@3.0.5': - resolution: {integrity: sha512-N9AX0NUoUtVwKwy21JtwzaqR5L5R5A99GAbrHfCCXK1lp593i/3AZAXhSP43wRQuxYsflrdzEfXZFo1reR1Nkg==} + '@vitest/utils@3.0.7': + resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==} ansi-escapes@4.3.2: resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} @@ -1006,8 +1006,8 @@ packages: resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} engines: {node: '>= 0.4'} - esbuild@0.24.2: - resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==} + esbuild@0.25.0: + resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==} engines: {node: '>=18'} hasBin: true @@ -1154,8 +1154,8 @@ packages: resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} engines: {node: ^10 || ^12 || >=14} - postcss@8.5.2: - resolution: {integrity: sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==} + postcss@8.5.3: + resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} proxy-from-env@1.1.0: @@ -1173,8 +1173,8 @@ packages: regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - rollup@4.34.7: - resolution: {integrity: sha512-8qhyN0oZ4x0H6wmBgfKxJtxM7qS98YJ0k0kNh5ECVtuchIJ7z9IVVvzpmtQyT10PXKMtBxYr1wQ5Apg8RS8kXQ==} + rollup@4.34.8: + resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1283,13 +1283,13 @@ packages: universal-user-agent@7.0.2: resolution: {integrity: sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==} - vite-node@3.0.5: - resolution: {integrity: sha512-02JEJl7SbtwSDJdYS537nU6l+ktdvcREfLksk/NDAqtdKWGqHl+joXzEubHROmS3E6pip+Xgu2tFezMu75jH7A==} + vite-node@3.0.7: + resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true - vite@6.1.0: - resolution: {integrity: sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==} + vite@6.2.0: + resolution: {integrity: sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -1328,16 +1328,16 @@ packages: yaml: optional: true - vitest@3.0.5: - resolution: {integrity: sha512-4dof+HvqONw9bvsYxtkfUp2uHsTN9bV2CZIi1pWgoFpL1Lld8LA1ka9q/ONSsoScAKG7NVGf2stJTI7XRkXb2Q==} + vitest@3.0.7: + resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.5 - '@vitest/ui': 3.0.5 + '@vitest/browser': 3.0.7 + '@vitest/ui': 3.0.7 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1399,102 +1399,102 @@ snapshots: '@emotion/unitless@0.8.1': {} - '@esbuild/aix-ppc64@0.24.2': + '@esbuild/aix-ppc64@0.25.0': optional: true - '@esbuild/android-arm64@0.24.2': + '@esbuild/android-arm64@0.25.0': optional: true - '@esbuild/android-arm@0.24.2': + '@esbuild/android-arm@0.25.0': optional: true - '@esbuild/android-x64@0.24.2': + '@esbuild/android-x64@0.25.0': optional: true - '@esbuild/darwin-arm64@0.24.2': + '@esbuild/darwin-arm64@0.25.0': optional: true - '@esbuild/darwin-x64@0.24.2': + '@esbuild/darwin-x64@0.25.0': optional: true - '@esbuild/freebsd-arm64@0.24.2': + '@esbuild/freebsd-arm64@0.25.0': optional: true - '@esbuild/freebsd-x64@0.24.2': + '@esbuild/freebsd-x64@0.25.0': optional: true - '@esbuild/linux-arm64@0.24.2': + '@esbuild/linux-arm64@0.25.0': optional: true - '@esbuild/linux-arm@0.24.2': + '@esbuild/linux-arm@0.25.0': optional: true - '@esbuild/linux-ia32@0.24.2': + '@esbuild/linux-ia32@0.25.0': optional: true - '@esbuild/linux-loong64@0.24.2': + '@esbuild/linux-loong64@0.25.0': optional: true - '@esbuild/linux-mips64el@0.24.2': + '@esbuild/linux-mips64el@0.25.0': optional: true - '@esbuild/linux-ppc64@0.24.2': + '@esbuild/linux-ppc64@0.25.0': optional: true - '@esbuild/linux-riscv64@0.24.2': + '@esbuild/linux-riscv64@0.25.0': optional: true - '@esbuild/linux-s390x@0.24.2': + '@esbuild/linux-s390x@0.25.0': optional: true - '@esbuild/linux-x64@0.24.2': + '@esbuild/linux-x64@0.25.0': optional: true - '@esbuild/netbsd-arm64@0.24.2': + '@esbuild/netbsd-arm64@0.25.0': optional: true - '@esbuild/netbsd-x64@0.24.2': + '@esbuild/netbsd-x64@0.25.0': optional: true - '@esbuild/openbsd-arm64@0.24.2': + '@esbuild/openbsd-arm64@0.25.0': optional: true - '@esbuild/openbsd-x64@0.24.2': + '@esbuild/openbsd-x64@0.25.0': optional: true - '@esbuild/sunos-x64@0.24.2': + '@esbuild/sunos-x64@0.25.0': optional: true - '@esbuild/win32-arm64@0.24.2': + '@esbuild/win32-arm64@0.25.0': optional: true - '@esbuild/win32-ia32@0.24.2': + '@esbuild/win32-ia32@0.25.0': optional: true - '@esbuild/win32-x64@0.24.2': + '@esbuild/win32-x64@0.25.0': optional: true - '@inquirer/checkbox@4.1.2(@types/node@22.13.4)': + '@inquirer/checkbox@4.1.2(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/type': 3.0.4(@types/node@22.13.5) ansi-escapes: 4.3.2 yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/confirm@5.1.6(@types/node@22.13.4)': + '@inquirer/confirm@5.1.6(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/core@10.1.7(@types/node@22.13.4)': + '@inquirer/core@10.1.7(@types/node@22.13.5)': dependencies: '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/type': 3.0.4(@types/node@22.13.5) ansi-escapes: 4.3.2 cli-width: 4.1.0 mute-stream: 2.0.0 @@ -1502,99 +1502,99 @@ snapshots: wrap-ansi: 6.2.0 yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/editor@4.2.7(@types/node@22.13.4)': + '@inquirer/editor@4.2.7(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) external-editor: 3.1.0 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/expand@4.0.9(@types/node@22.13.4)': + '@inquirer/expand@4.0.9(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 '@inquirer/figures@1.0.10': {} - '@inquirer/input@4.1.6(@types/node@22.13.4)': + '@inquirer/input@4.1.6(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/number@3.0.9(@types/node@22.13.4)': + '@inquirer/number@3.0.9(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/password@4.0.9(@types/node@22.13.4)': + '@inquirer/password@4.0.9(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) ansi-escapes: 4.3.2 optionalDependencies: - '@types/node': 22.13.4 - - '@inquirer/prompts@7.3.2(@types/node@22.13.4)': - dependencies: - '@inquirer/checkbox': 4.1.2(@types/node@22.13.4) - '@inquirer/confirm': 5.1.6(@types/node@22.13.4) - '@inquirer/editor': 4.2.7(@types/node@22.13.4) - '@inquirer/expand': 4.0.9(@types/node@22.13.4) - '@inquirer/input': 4.1.6(@types/node@22.13.4) - '@inquirer/number': 3.0.9(@types/node@22.13.4) - '@inquirer/password': 4.0.9(@types/node@22.13.4) - '@inquirer/rawlist': 4.0.9(@types/node@22.13.4) - '@inquirer/search': 3.0.9(@types/node@22.13.4) - '@inquirer/select': 4.0.9(@types/node@22.13.4) + '@types/node': 22.13.5 + + '@inquirer/prompts@7.3.2(@types/node@22.13.5)': + dependencies: + '@inquirer/checkbox': 4.1.2(@types/node@22.13.5) + '@inquirer/confirm': 5.1.6(@types/node@22.13.5) + '@inquirer/editor': 4.2.7(@types/node@22.13.5) + '@inquirer/expand': 4.0.9(@types/node@22.13.5) + '@inquirer/input': 4.1.6(@types/node@22.13.5) + '@inquirer/number': 3.0.9(@types/node@22.13.5) + '@inquirer/password': 4.0.9(@types/node@22.13.5) + '@inquirer/rawlist': 4.0.9(@types/node@22.13.5) + '@inquirer/search': 3.0.9(@types/node@22.13.5) + '@inquirer/select': 4.0.9(@types/node@22.13.5) optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/rawlist@4.0.9(@types/node@22.13.4)': + '@inquirer/rawlist@4.0.9(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.5) yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/search@3.0.9(@types/node@22.13.4)': + '@inquirer/search@3.0.9(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/type': 3.0.4(@types/node@22.13.5) yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/select@4.0.9(@types/node@22.13.4)': + '@inquirer/select@4.0.9(@types/node@22.13.5)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.4) + '@inquirer/core': 10.1.7(@types/node@22.13.5) '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.4) + '@inquirer/type': 3.0.4(@types/node@22.13.5) ansi-escapes: 4.3.2 yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 - '@inquirer/type@3.0.4(@types/node@22.13.4)': + '@inquirer/type@3.0.4(@types/node@22.13.5)': optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 '@jridgewell/sourcemap-codec@1.5.0': {} - '@napi-rs/cli@3.0.0-alpha.70(@emnapi/runtime@1.3.1)(@types/node@22.13.4)(emnapi@1.3.1)': + '@napi-rs/cli@3.0.0-alpha.72(@emnapi/runtime@1.3.1)(@types/node@22.13.5)(emnapi@1.3.1)': dependencies: - '@inquirer/prompts': 7.3.2(@types/node@22.13.4) + '@inquirer/prompts': 7.3.2(@types/node@22.13.5) '@napi-rs/cross-toolchain': 0.0.19 '@napi-rs/wasm-tools': 0.0.2 '@octokit/rest': 21.1.1 @@ -1669,7 +1669,7 @@ snapshots: '@napi-rs/lzma-wasm32-wasi@1.4.1': dependencies: - '@napi-rs/wasm-runtime': 0.2.6 + '@napi-rs/wasm-runtime': 0.2.7 optional: true '@napi-rs/lzma-win32-arm64-msvc@1.4.1': @@ -1739,7 +1739,7 @@ snapshots: '@napi-rs/tar-wasm32-wasi@0.1.4': dependencies: - '@napi-rs/wasm-runtime': 0.2.6 + '@napi-rs/wasm-runtime': 0.2.7 optional: true '@napi-rs/tar-win32-arm64-msvc@0.1.4': @@ -1770,7 +1770,7 @@ snapshots: '@napi-rs/tar-win32-ia32-msvc': 0.1.4 '@napi-rs/tar-win32-x64-msvc': 0.1.4 - '@napi-rs/wasm-runtime@0.2.6': + '@napi-rs/wasm-runtime@0.2.7': dependencies: '@emnapi/core': 1.3.1 '@emnapi/runtime': 1.3.1 @@ -1805,7 +1805,7 @@ snapshots: '@napi-rs/wasm-tools-wasm32-wasi@0.0.2': dependencies: - '@napi-rs/wasm-runtime': 0.2.6 + '@napi-rs/wasm-runtime': 0.2.7 optional: true '@napi-rs/wasm-tools-win32-arm64-msvc@0.0.2': @@ -1858,7 +1858,7 @@ snapshots: '@octokit/openapi-types@23.0.1': {} - '@octokit/plugin-paginate-rest@11.4.2(@octokit/core@6.1.4)': + '@octokit/plugin-paginate-rest@11.4.3(@octokit/core@6.1.4)': dependencies: '@octokit/core': 6.1.4 '@octokit/types': 13.8.0 @@ -1887,7 +1887,7 @@ snapshots: '@octokit/rest@21.1.1': dependencies: '@octokit/core': 6.1.4 - '@octokit/plugin-paginate-rest': 11.4.2(@octokit/core@6.1.4) + '@octokit/plugin-paginate-rest': 11.4.3(@octokit/core@6.1.4) '@octokit/plugin-request-log': 5.3.1(@octokit/core@6.1.4) '@octokit/plugin-rest-endpoint-methods': 13.3.1(@octokit/core@6.1.4) @@ -1897,61 +1897,61 @@ snapshots: '@oxc-resolver/test-longfilename-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@file:fixtures/pnpm/longfilename': {} - '@rollup/rollup-android-arm-eabi@4.34.7': + '@rollup/rollup-android-arm-eabi@4.34.8': optional: true - '@rollup/rollup-android-arm64@4.34.7': + '@rollup/rollup-android-arm64@4.34.8': optional: true - '@rollup/rollup-darwin-arm64@4.34.7': + '@rollup/rollup-darwin-arm64@4.34.8': optional: true - '@rollup/rollup-darwin-x64@4.34.7': + '@rollup/rollup-darwin-x64@4.34.8': optional: true - '@rollup/rollup-freebsd-arm64@4.34.7': + '@rollup/rollup-freebsd-arm64@4.34.8': optional: true - '@rollup/rollup-freebsd-x64@4.34.7': + '@rollup/rollup-freebsd-x64@4.34.8': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.34.7': + '@rollup/rollup-linux-arm-gnueabihf@4.34.8': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.34.7': + '@rollup/rollup-linux-arm-musleabihf@4.34.8': optional: true - '@rollup/rollup-linux-arm64-gnu@4.34.7': + '@rollup/rollup-linux-arm64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-arm64-musl@4.34.7': + '@rollup/rollup-linux-arm64-musl@4.34.8': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.34.7': + '@rollup/rollup-linux-loongarch64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.34.7': + '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.34.7': + '@rollup/rollup-linux-riscv64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-s390x-gnu@4.34.7': + '@rollup/rollup-linux-s390x-gnu@4.34.8': optional: true - '@rollup/rollup-linux-x64-gnu@4.34.7': + '@rollup/rollup-linux-x64-gnu@4.34.8': optional: true - '@rollup/rollup-linux-x64-musl@4.34.7': + '@rollup/rollup-linux-x64-musl@4.34.8': optional: true - '@rollup/rollup-win32-arm64-msvc@4.34.7': + '@rollup/rollup-win32-arm64-msvc@4.34.8': optional: true - '@rollup/rollup-win32-ia32-msvc@4.34.7': + '@rollup/rollup-win32-ia32-msvc@4.34.8': optional: true - '@rollup/rollup-win32-x64-msvc@4.34.7': + '@rollup/rollup-win32-x64-msvc@4.34.8': optional: true '@tybys/wasm-util@0.9.0': @@ -1960,49 +1960,49 @@ snapshots: '@types/estree@1.0.6': {} - '@types/node@22.13.4': + '@types/node@22.13.5': dependencies: undici-types: 6.20.0 '@types/stylis@4.2.7': {} - '@vitest/expect@3.0.5': + '@vitest/expect@3.0.7': dependencies: - '@vitest/spy': 3.0.5 - '@vitest/utils': 3.0.5 + '@vitest/spy': 3.0.7 + '@vitest/utils': 3.0.7 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.5(vite@6.1.0(@types/node@22.13.4))': + '@vitest/mocker@3.0.7(vite@6.2.0(@types/node@22.13.5))': dependencies: - '@vitest/spy': 3.0.5 + '@vitest/spy': 3.0.7 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 6.1.0(@types/node@22.13.4) + vite: 6.2.0(@types/node@22.13.5) - '@vitest/pretty-format@3.0.5': + '@vitest/pretty-format@3.0.7': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.5': + '@vitest/runner@3.0.7': dependencies: - '@vitest/utils': 3.0.5 + '@vitest/utils': 3.0.7 pathe: 2.0.3 - '@vitest/snapshot@3.0.5': + '@vitest/snapshot@3.0.7': dependencies: - '@vitest/pretty-format': 3.0.5 + '@vitest/pretty-format': 3.0.7 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.0.5': + '@vitest/spy@3.0.7': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.5': + '@vitest/utils@3.0.7': dependencies: - '@vitest/pretty-format': 3.0.5 + '@vitest/pretty-format': 3.0.7 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2120,33 +2120,33 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 - esbuild@0.24.2: + esbuild@0.25.0: optionalDependencies: - '@esbuild/aix-ppc64': 0.24.2 - '@esbuild/android-arm': 0.24.2 - '@esbuild/android-arm64': 0.24.2 - '@esbuild/android-x64': 0.24.2 - '@esbuild/darwin-arm64': 0.24.2 - '@esbuild/darwin-x64': 0.24.2 - '@esbuild/freebsd-arm64': 0.24.2 - '@esbuild/freebsd-x64': 0.24.2 - '@esbuild/linux-arm': 0.24.2 - '@esbuild/linux-arm64': 0.24.2 - '@esbuild/linux-ia32': 0.24.2 - '@esbuild/linux-loong64': 0.24.2 - '@esbuild/linux-mips64el': 0.24.2 - '@esbuild/linux-ppc64': 0.24.2 - '@esbuild/linux-riscv64': 0.24.2 - '@esbuild/linux-s390x': 0.24.2 - '@esbuild/linux-x64': 0.24.2 - '@esbuild/netbsd-arm64': 0.24.2 - '@esbuild/netbsd-x64': 0.24.2 - '@esbuild/openbsd-arm64': 0.24.2 - '@esbuild/openbsd-x64': 0.24.2 - '@esbuild/sunos-x64': 0.24.2 - '@esbuild/win32-arm64': 0.24.2 - '@esbuild/win32-ia32': 0.24.2 - '@esbuild/win32-x64': 0.24.2 + '@esbuild/aix-ppc64': 0.25.0 + '@esbuild/android-arm': 0.25.0 + '@esbuild/android-arm64': 0.25.0 + '@esbuild/android-x64': 0.25.0 + '@esbuild/darwin-arm64': 0.25.0 + '@esbuild/darwin-x64': 0.25.0 + '@esbuild/freebsd-arm64': 0.25.0 + '@esbuild/freebsd-x64': 0.25.0 + '@esbuild/linux-arm': 0.25.0 + '@esbuild/linux-arm64': 0.25.0 + '@esbuild/linux-ia32': 0.25.0 + '@esbuild/linux-loong64': 0.25.0 + '@esbuild/linux-mips64el': 0.25.0 + '@esbuild/linux-ppc64': 0.25.0 + '@esbuild/linux-riscv64': 0.25.0 + '@esbuild/linux-s390x': 0.25.0 + '@esbuild/linux-x64': 0.25.0 + '@esbuild/netbsd-arm64': 0.25.0 + '@esbuild/netbsd-x64': 0.25.0 + '@esbuild/openbsd-arm64': 0.25.0 + '@esbuild/openbsd-x64': 0.25.0 + '@esbuild/sunos-x64': 0.25.0 + '@esbuild/win32-arm64': 0.25.0 + '@esbuild/win32-ia32': 0.25.0 + '@esbuild/win32-x64': 0.25.0 escape-latex@1.2.0: {} @@ -2274,7 +2274,7 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 - postcss@8.5.2: + postcss@8.5.3: dependencies: nanoid: 3.3.8 picocolors: 1.1.1 @@ -2291,29 +2291,29 @@ snapshots: regenerator-runtime@0.14.1: {} - rollup@4.34.7: + rollup@4.34.8: dependencies: '@types/estree': 1.0.6 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.34.7 - '@rollup/rollup-android-arm64': 4.34.7 - '@rollup/rollup-darwin-arm64': 4.34.7 - '@rollup/rollup-darwin-x64': 4.34.7 - '@rollup/rollup-freebsd-arm64': 4.34.7 - '@rollup/rollup-freebsd-x64': 4.34.7 - '@rollup/rollup-linux-arm-gnueabihf': 4.34.7 - '@rollup/rollup-linux-arm-musleabihf': 4.34.7 - '@rollup/rollup-linux-arm64-gnu': 4.34.7 - '@rollup/rollup-linux-arm64-musl': 4.34.7 - '@rollup/rollup-linux-loongarch64-gnu': 4.34.7 - '@rollup/rollup-linux-powerpc64le-gnu': 4.34.7 - '@rollup/rollup-linux-riscv64-gnu': 4.34.7 - '@rollup/rollup-linux-s390x-gnu': 4.34.7 - '@rollup/rollup-linux-x64-gnu': 4.34.7 - '@rollup/rollup-linux-x64-musl': 4.34.7 - '@rollup/rollup-win32-arm64-msvc': 4.34.7 - '@rollup/rollup-win32-ia32-msvc': 4.34.7 - '@rollup/rollup-win32-x64-msvc': 4.34.7 + '@rollup/rollup-android-arm-eabi': 4.34.8 + '@rollup/rollup-android-arm64': 4.34.8 + '@rollup/rollup-darwin-arm64': 4.34.8 + '@rollup/rollup-darwin-x64': 4.34.8 + '@rollup/rollup-freebsd-arm64': 4.34.8 + '@rollup/rollup-freebsd-x64': 4.34.8 + '@rollup/rollup-linux-arm-gnueabihf': 4.34.8 + '@rollup/rollup-linux-arm-musleabihf': 4.34.8 + '@rollup/rollup-linux-arm64-gnu': 4.34.8 + '@rollup/rollup-linux-arm64-musl': 4.34.8 + '@rollup/rollup-linux-loongarch64-gnu': 4.34.8 + '@rollup/rollup-linux-powerpc64le-gnu': 4.34.8 + '@rollup/rollup-linux-riscv64-gnu': 4.34.8 + '@rollup/rollup-linux-s390x-gnu': 4.34.8 + '@rollup/rollup-linux-x64-gnu': 4.34.8 + '@rollup/rollup-linux-x64-musl': 4.34.8 + '@rollup/rollup-win32-arm64-msvc': 4.34.8 + '@rollup/rollup-win32-ia32-msvc': 4.34.8 + '@rollup/rollup-win32-x64-msvc': 4.34.8 fsevents: 2.3.3 safer-buffer@2.1.2: {} @@ -2394,13 +2394,13 @@ snapshots: universal-user-agent@7.0.2: {} - vite-node@3.0.5(@types/node@22.13.4): + vite-node@3.0.7(@types/node@22.13.5): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 6.1.0(@types/node@22.13.4) + vite: 6.2.0(@types/node@22.13.5) transitivePeerDependencies: - '@types/node' - jiti @@ -2415,24 +2415,24 @@ snapshots: - tsx - yaml - vite@6.1.0(@types/node@22.13.4): + vite@6.2.0(@types/node@22.13.5): dependencies: - esbuild: 0.24.2 - postcss: 8.5.2 - rollup: 4.34.7 + esbuild: 0.25.0 + postcss: 8.5.3 + rollup: 4.34.8 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 fsevents: 2.3.3 - vitest@3.0.5(@types/node@22.13.4): + vitest@3.0.7(@types/node@22.13.5): dependencies: - '@vitest/expect': 3.0.5 - '@vitest/mocker': 3.0.5(vite@6.1.0(@types/node@22.13.4)) - '@vitest/pretty-format': 3.0.5 - '@vitest/runner': 3.0.5 - '@vitest/snapshot': 3.0.5 - '@vitest/spy': 3.0.5 - '@vitest/utils': 3.0.5 + '@vitest/expect': 3.0.7 + '@vitest/mocker': 3.0.7(vite@6.2.0(@types/node@22.13.5)) + '@vitest/pretty-format': 3.0.7 + '@vitest/runner': 3.0.7 + '@vitest/snapshot': 3.0.7 + '@vitest/spy': 3.0.7 + '@vitest/utils': 3.0.7 chai: 5.2.0 debug: 4.4.0 expect-type: 1.1.0 @@ -2443,11 +2443,11 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 6.1.0(@types/node@22.13.4) - vite-node: 3.0.5(@types/node@22.13.4) + vite: 6.2.0(@types/node@22.13.5) + vite-node: 3.0.7(@types/node@22.13.5) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 transitivePeerDependencies: - jiti - less From 6cbec4cfa4b79f1078b2266b518a3fb550315914 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 14:16:11 +0800 Subject: [PATCH 10/19] chore(deps): update taiki-e/install-action action to v2.49.1 (#401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [taiki-e/install-action](https://redirect.github.com/taiki-e/install-action) | action | patch | `v2.49.0` -> `v2.49.1` | --- ### Release Notes
taiki-e/install-action (taiki-e/install-action) ### [`v2.49.1`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.1): 2.49.1 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.0...v2.49.1) - Update `cargo-deny@latest` to 0.18.0.
--- ### Configuration 📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone Asia/Shanghai, Automerge - "before 10pm on monday" in timezone Asia/Shanghai. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxc-project/oxc-resolver). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/zizmor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index f1d061f8..45a26b28 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: taiki-e/install-action@e03236526ace47fa2e04bebcfc6da471ebd4690c # v2.49.0 + - uses: taiki-e/install-action@ae97ff9daf1cd2e216671a047d80ff48461e30bb # v2.49.1 with: tool: zizmor From eb47b26f92896683fdc943038e4b019d7182a60e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 06:20:38 +0000 Subject: [PATCH 11/19] chore(deps): update crate-ci/typos action to v1.30.0 (#407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [crate-ci/typos](https://redirect.github.com/crate-ci/typos) | action | minor | `v1.29.10` -> `v1.30.0` | --- ### Release Notes
crate-ci/typos (crate-ci/typos) ### [`v1.30.0`](https://redirect.github.com/crate-ci/typos/compare/v1.29.10...v1.30.0) [Compare Source](https://redirect.github.com/crate-ci/typos/compare/v1.29.10...v1.30.0)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - "before 10pm on monday" in timezone Asia/Shanghai. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxc-project/oxc-resolver). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9de6250d..1dd0115a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: components: clippy rust-docs - run: cargo clippy --all-features --all-targets -- -D warnings - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --all-features - - uses: crate-ci/typos@db35ee91e80fbb447f33b0e5fbddb24d2a1a884f # v1.29.10 + - uses: crate-ci/typos@8951ef9cb569c860bc8f3f18070fbfaf65cdb349 # v1.30.0 with: files: . From 13f689c9465612454c12e8484ed7b3c3b0e7b8ed Mon Sep 17 00:00:00 2001 From: Boshen Date: Sun, 2 Mar 2025 10:27:27 +0800 Subject: [PATCH 12/19] fix: segfault when running napi-rs inside a Node.js worder thread under gnu linux --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..f5411f2f --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +# Addresses a potential segmentation fault issue that occurs when +# running napi-rs within a Node.js worker thread on GNU/Linux systems. +# See https://x.com/Brooooook_lyn/status/1895848334692401270 +[target.'cfg(target_env = "gnu")'] +rustflags = ["-C", "link-args=-Wl,-z,nodelete"] From 6159a9713ef070f4a3681c3a64bd05fc63deeb52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Mar 2025 18:53:13 +0000 Subject: [PATCH 13/19] chore(deps): update github-actions (#408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | MarcoIeni/release-plz-action | action | digest | `49d2116` -> `7049379` | | [actions/cache](https://redirect.github.com/actions/cache) | action | patch | `v4.2.1` -> `v4.2.2` | | [actions/download-artifact](https://redirect.github.com/actions/download-artifact) | action | patch | `v4.1.8` -> `v4.1.9` | | [codecov/codecov-action](https://redirect.github.com/codecov/codecov-action) | action | minor | `v5.3.1` -> `v5.4.0` | | [docker/setup-qemu-action](https://redirect.github.com/docker/setup-qemu-action) | action | minor | `v3.4.0` -> `v3.6.0` | | [taiki-e/install-action](https://redirect.github.com/taiki-e/install-action) | action | patch | `v2.49.1` -> `v2.49.10` | --- ### Release Notes
actions/cache (actions/cache) ### [`v4.2.2`](https://redirect.github.com/actions/cache/releases/tag/v4.2.2) [Compare Source](https://redirect.github.com/actions/cache/compare/v4.2.1...v4.2.2) ##### What's Changed > \[!IMPORTANT] > As a reminder, there were important backend changes to release v4.2.0, see [those release notes](https://redirect.github.com/actions/cache/releases/tag/v4.2.0) and [the announcement](https://redirect.github.com/actions/cache/discussions/1510) for more details. - Bump [@​actions/cache](https://redirect.github.com/actions/cache) to v4.0.2 by [@​robherley](https://redirect.github.com/robherley) in [https://github.com/actions/cache/pull/1560](https://redirect.github.com/actions/cache/pull/1560) **Full Changelog**: https://github.com/actions/cache/compare/v4.2.1...v4.2.2
actions/download-artifact (actions/download-artifact) ### [`v4.1.9`](https://redirect.github.com/actions/download-artifact/releases/tag/v4.1.9) [Compare Source](https://redirect.github.com/actions/download-artifact/compare/v4.1.8...v4.1.9) ##### What's Changed - Add workflow file for publishing releases to immutable action package by [@​Jcambass](https://redirect.github.com/Jcambass) in [https://github.com/actions/download-artifact/pull/354](https://redirect.github.com/actions/download-artifact/pull/354) - docs: small migration fix by [@​froblesmartin](https://redirect.github.com/froblesmartin) in [https://github.com/actions/download-artifact/pull/370](https://redirect.github.com/actions/download-artifact/pull/370) - Update MIGRATION.md by [@​andyfeller](https://redirect.github.com/andyfeller) in [https://github.com/actions/download-artifact/pull/372](https://redirect.github.com/actions/download-artifact/pull/372) - Update artifact package to 2.2.2 by [@​yacaovsnc](https://redirect.github.com/yacaovsnc) in [https://github.com/actions/download-artifact/pull/380](https://redirect.github.com/actions/download-artifact/pull/380) ##### New Contributors - [@​Jcambass](https://redirect.github.com/Jcambass) made their first contribution in [https://github.com/actions/download-artifact/pull/354](https://redirect.github.com/actions/download-artifact/pull/354) - [@​froblesmartin](https://redirect.github.com/froblesmartin) made their first contribution in [https://github.com/actions/download-artifact/pull/370](https://redirect.github.com/actions/download-artifact/pull/370) - [@​andyfeller](https://redirect.github.com/andyfeller) made their first contribution in [https://github.com/actions/download-artifact/pull/372](https://redirect.github.com/actions/download-artifact/pull/372) - [@​yacaovsnc](https://redirect.github.com/yacaovsnc) made their first contribution in [https://github.com/actions/download-artifact/pull/380](https://redirect.github.com/actions/download-artifact/pull/380) **Full Changelog**: https://github.com/actions/download-artifact/compare/v4...v4.1.9
codecov/codecov-action (codecov/codecov-action) ### [`v5.4.0`](https://redirect.github.com/codecov/codecov-action/blob/HEAD/CHANGELOG.md#v540) [Compare Source](https://redirect.github.com/codecov/codecov-action/compare/v5.3.1...v5.4.0) ##### What's Changed - update wrapper submodule to 0.2.0, add recurse_submodules arg by [@​matt-codecov](https://redirect.github.com/matt-codecov) in [https://github.com/codecov/codecov-action/pull/1780](https://redirect.github.com/codecov/codecov-action/pull/1780) - build(deps): bump actions/upload-artifact from 4.6.0 to 4.6.1 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [https://github.com/codecov/codecov-action/pull/1775](https://redirect.github.com/codecov/codecov-action/pull/1775) - build(deps): bump ossf/scorecard-action from 2.4.0 to 2.4.1 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [https://github.com/codecov/codecov-action/pull/1776](https://redirect.github.com/codecov/codecov-action/pull/1776) - build(deps): bump github/codeql-action from 3.28.9 to 3.28.10 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [https://github.com/codecov/codecov-action/pull/1777](https://redirect.github.com/codecov/codecov-action/pull/1777) - Clarify in README that `use_pypi` bypasses integrity checks too by [@​webknjaz](https://redirect.github.com/webknjaz) in [https://github.com/codecov/codecov-action/pull/1773](https://redirect.github.com/codecov/codecov-action/pull/1773) - Fix use of safe.directory inside containers by [@​Flamefire](https://redirect.github.com/Flamefire) in [https://github.com/codecov/codecov-action/pull/1768](https://redirect.github.com/codecov/codecov-action/pull/1768) - Fix description for report_type input by [@​craigscott-crascit](https://redirect.github.com/craigscott-crascit) in [https://github.com/codecov/codecov-action/pull/1770](https://redirect.github.com/codecov/codecov-action/pull/1770) - build(deps): bump github/codeql-action from 3.28.8 to 3.28.9 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [https://github.com/codecov/codecov-action/pull/1765](https://redirect.github.com/codecov/codecov-action/pull/1765) - Fix a typo in the example by [@​miranska](https://redirect.github.com/miranska) in [https://github.com/codecov/codecov-action/pull/1758](https://redirect.github.com/codecov/codecov-action/pull/1758) - build(deps): bump github/codeql-action from 3.28.5 to 3.28.8 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [https://github.com/codecov/codecov-action/pull/1757](https://redirect.github.com/codecov/codecov-action/pull/1757) - build(deps): bump github/codeql-action from 3.28.1 to 3.28.5 by [@​app/dependabot](https://redirect.github.com/app/dependabot) in [https://github.com/codecov/codecov-action/pull/1753](https://redirect.github.com/codecov/codecov-action/pull/1753) **Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.3.1..v5.4.0
docker/setup-qemu-action (docker/setup-qemu-action) ### [`v3.6.0`](https://redirect.github.com/docker/setup-qemu-action/releases/tag/v3.6.0) [Compare Source](https://redirect.github.com/docker/setup-qemu-action/compare/v3.5.0...v3.6.0) - Display binfmt version by [@​crazy-max](https://redirect.github.com/crazy-max) in [https://github.com/docker/setup-qemu-action/pull/202](https://redirect.github.com/docker/setup-qemu-action/pull/202) **Full Changelog**: https://github.com/docker/setup-qemu-action/compare/v3.5.0...v3.6.0 ### [`v3.5.0`](https://redirect.github.com/docker/setup-qemu-action/releases/tag/v3.5.0) [Compare Source](https://redirect.github.com/docker/setup-qemu-action/compare/v3.4.0...v3.5.0) - Bump [@​docker/actions-toolkit](https://redirect.github.com/docker/actions-toolkit) from 0.54.0 to 0.56.0 in [https://github.com/docker/setup-qemu-action/pull/205](https://redirect.github.com/docker/setup-qemu-action/pull/205) **Full Changelog**: https://github.com/docker/setup-qemu-action/compare/v3.4.0...v3.5.0
taiki-e/install-action (taiki-e/install-action) ### [`v2.49.10`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.10): 2.49.10 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.9...v2.49.10) - Update `release-plz@latest` to 0.3.124. ### [`v2.49.9`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.9): 2.49.9 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.8...v2.49.9) - Update `typos@latest` to 1.30.0. ### [`v2.49.8`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.8): 2.49.8 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.7...v2.49.8) - Update `cargo-binstall@latest` to 1.11.2. - Update `cargo-audit@latest` to 0.21.2. ### [`v2.49.7`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.7): 2.49.7 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.6...v2.49.7) - Update `cargo-deny@latest` to 0.18.1. ### [`v2.49.6`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.6): 2.49.6 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.5...v2.49.6) - Update `cargo-lambda@latest` to 1.7.0. ### [`v2.49.5`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.5): 2.49.5 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.4...v2.49.5) - Update `wasmtime@latest` to 30.0.2. - Update `release-plz@latest` to 0.3.123. ### [`v2.49.4`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.4): 2.49.4 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.3...v2.49.4) - Update `typos@latest` to 1.29.10. ### [`v2.49.3`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.3): 2.49.3 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.2...v2.49.3) - Update `wash@latest` to 0.39.0. - Update `cargo-nextest@latest` to 0.9.92. ### [`v2.49.2`](https://redirect.github.com/taiki-e/install-action/releases/tag/v2.49.2): 2.49.2 [Compare Source](https://redirect.github.com/taiki-e/install-action/compare/v2.49.1...v2.49.2) - Update `sccache@latest` to 0.10.0. - Update `cargo-machete@latest` to 0.8.0.
--- ### Configuration 📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone Asia/Shanghai, Automerge - "before 10pm on monday" in timezone Asia/Shanghai. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxc-project/oxc-resolver). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/autofix.yml | 4 ++-- .github/workflows/codecov.yml | 4 ++-- .github/workflows/release-napi.yml | 4 ++-- .github/workflows/release-plz.yml | 2 +- .github/workflows/zizmor.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml index 96bbb9df..6f19ee24 100644 --- a/.github/workflows/autofix.yml +++ b/.github/workflows/autofix.yml @@ -24,7 +24,7 @@ jobs: - name: Restore dprint plugin cache id: cache-restore - uses: actions/cache/restore@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1 + uses: actions/cache/restore@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: key: dprint-autofix-ci-${{ runner.os }}-${{ hashFiles('dprint.json') }} path: ~/.cache/dprint @@ -38,7 +38,7 @@ jobs: - name: Save dprint plugin cache if: ${{ github.ref_name == 'main' }} id: cache-save - uses: actions/cache/save@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1 + uses: actions/cache/save@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 with: key: ${{ steps.cache-restore.outputs.cache-primary-key }} path: ~/.cache/dprint diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 960732a1..f3a5d17f 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -60,13 +60,13 @@ jobs: - name: Download coverage file if: env.CODECOV_TOKEN - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: name: codecov - name: Upload to codecov.io if: env.CODECOV_TOKEN - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1 + uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0 with: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true diff --git a/.github/workflows/release-napi.yml b/.github/workflows/release-napi.yml index 0324f0c1..14f94340 100644 --- a/.github/workflows/release-napi.yml +++ b/.github/workflows/release-napi.yml @@ -137,7 +137,7 @@ jobs: echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0 + uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0 if: ${{ contains(matrix.target, 'linux') }} with: platforms: all @@ -235,7 +235,7 @@ jobs: run: pnpm install --frozen-lockfile - name: Download Artifacts - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 with: path: artifacts diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml index 31783575..29d0ae46 100644 --- a/.github/workflows/release-plz.yml +++ b/.github/workflows/release-plz.yml @@ -24,7 +24,7 @@ jobs: - name: Run release-plz id: release-plz - uses: MarcoIeni/release-plz-action@49d211662734649022d06ac385e317aa025c64e7 # v0.5 + uses: MarcoIeni/release-plz-action@704937995982d7590add777dbdb2bf7aa94a6cf6 # v0.5 env: GITHUB_TOKEN: ${{ secrets.OXC_BOT_PAT }} CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index 45a26b28..7c805831 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1 - - uses: taiki-e/install-action@ae97ff9daf1cd2e216671a047d80ff48461e30bb # v2.49.1 + - uses: taiki-e/install-action@3c8fc6eaa5fcff049bb133c1f540c6c2287a191f # v2.49.10 with: tool: zizmor From 6fc9c6b9e3de4bc39c2fad9efade0d9ab6960df4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Mar 2025 18:54:34 +0000 Subject: [PATCH 14/19] chore(deps): lock file maintenance (#409) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Update | Change | |---|---| | lockFileMaintenance | All locks refreshed | 🔧 This Pull Request updates lock files to use the latest dependency versions. --- ### Configuration 📅 **Schedule**: Branch creation - "before 4am on monday" in timezone Asia/Shanghai, Automerge - "before 10pm on monday" in timezone Asia/Shanghai. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxc-project/oxc-resolver). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3eb76f1..1737c942 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,15 +78,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "bpaf" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "913d667d4716acd286a0dc58824a4c0ec8ce58eeca95cfb58172d17a9ec01035" +checksum = "fd343f000c4472dc4557e093f314c5210375d3e9349ad866fee0ddb7f4ed10bf" [[package]] name = "bumpalo" @@ -108,9 +108,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.15" +version = "1.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" +checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" dependencies = [ "shlex", ] @@ -123,15 +123,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-link", ] [[package]] @@ -169,9 +169,9 @@ checksum = "aaa6b4b263a5d737e9bf6b7c09b72c41a5480aec4d7219af827f6564e950b6a5" [[package]] name = "codspeed" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25d2f5a6570db487f5258e0bded6352fa2034c2aeb46bb5cc3ff060a0fcfba2f" +checksum = "de4b67ff8985f3993f06167d71cf4aec178b0a1580f91a987170c59d60021103" dependencies = [ "colored", "libc", @@ -1095,9 +1095,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "uuid" -version = "1.14.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d59ca99a559661b96bf898d8fce28ed87935fd2bea9f05983c1464dd6c71b1" +checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" dependencies = [ "getrandom", ] @@ -1206,6 +1206,12 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-link" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" + [[package]] name = "windows-sys" version = "0.52.0" From 4cd3c85b125eb29035b2138853b5559a8727353f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 03:44:18 +0000 Subject: [PATCH 15/19] chore(deps): update crate-ci/typos action to v1.30.1 (#410) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [crate-ci/typos](https://redirect.github.com/crate-ci/typos) | action | patch | `v1.30.0` -> `v1.30.1` | --- ### Release Notes
crate-ci/typos (crate-ci/typos) ### [`v1.30.1`](https://redirect.github.com/crate-ci/typos/compare/v1.30.0...v1.30.1) [Compare Source](https://redirect.github.com/crate-ci/typos/compare/v1.30.0...v1.30.1)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - "before 10pm on monday" in timezone Asia/Shanghai. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/oxc-project/oxc-resolver). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1dd0115a..044663a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: components: clippy rust-docs - run: cargo clippy --all-features --all-targets -- -D warnings - run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --all-features - - uses: crate-ci/typos@8951ef9cb569c860bc8f3f18070fbfaf65cdb349 # v1.30.0 + - uses: crate-ci/typos@72f3776b6edc3a10a567b8e43fd0524b2a3f1419 # v1.30.1 with: files: . From 598b44cd0c621c5011f0fe757c3ceb5e2628ea00 Mon Sep 17 00:00:00 2001 From: IWANABETHATGUY Date: Fri, 7 Mar 2025 23:05:27 +0800 Subject: [PATCH 16/19] feat: deserialize `verbatim_module_syntax` from compilerOptions (#411) 1. related to https://github.com/rolldown/rolldown/issues/3777, rolldown needs this field to merge tsc options. --- src/tsconfig_serde.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tsconfig_serde.rs b/src/tsconfig_serde.rs index 9347f760..c90ab11c 100644 --- a/src/tsconfig_serde.rs +++ b/src/tsconfig_serde.rs @@ -125,6 +125,9 @@ pub struct CompilerOptionsSerde { /// pub jsx_import_source: Option, + + /// + pub verbatim_module_syntax: Option, } impl CompilerOptions for CompilerOptionsSerde { From 0a911dcdd9aab61cfeafc8570dea94ddc7a3b837 Mon Sep 17 00:00:00 2001 From: Boshen Date: Fri, 7 Mar 2025 23:18:05 +0800 Subject: [PATCH 17/19] feat!: Rust Edition 2024 (#402) --- .rustfmt.toml | 4 + Cargo.lock | 64 +++--- Cargo.toml | 4 +- benches/resolver.rs | 2 +- napi/src/lib.rs | 2 +- package.json | 6 +- pnpm-lock.yaml | 435 +++++++++++++++++++------------------ src/file_system.rs | 3 +- src/fs_cache.rs | 6 +- src/lib.rs | 20 +- src/package_json_serde.rs | 2 +- src/tests/exports_field.rs | 4 +- src/tests/imports_field.rs | 4 +- src/tests/resolution.rs | 2 +- src/tsconfig.rs | 2 +- tests/integration_test.rs | 14 +- 16 files changed, 295 insertions(+), 279 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index 1a21c134..ccd5b1bf 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,3 +1,5 @@ +style_edition = "2024" + # Make Rust more readable given most people have wide screens nowadays. # This is also the setting used by [rustc](https://github.com/rust-lang/rust/blob/master/rustfmt.toml) use_small_heuristics = "Max" @@ -5,6 +7,8 @@ use_small_heuristics = "Max" # Use field initialize shorthand if possible use_field_init_shorthand = true +reorder_modules = true + # For `cargo +nightly fmt` # unstable_features = true # style_edition = '2024' diff --git a/Cargo.lock b/Cargo.lock index 1737c942..48b5758e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,9 +84,9 @@ checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "bpaf" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd343f000c4472dc4557e093f314c5210375d3e9349ad866fee0ddb7f4ed10bf" +checksum = "4de4d74c5891642753c67ab88f58d971a68dd98673b69689a8c24ce3ec78a412" [[package]] name = "bumpalo" @@ -335,9 +335,9 @@ dependencies = [ [[package]] name = "either" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "endian-type" @@ -473,9 +473,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" @@ -649,9 +649,9 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "oxc_napi_resolver" @@ -744,18 +744,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" dependencies = [ "proc-macro2", ] @@ -792,9 +792,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f" +checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" dependencies = [ "bitflags", ] @@ -836,15 +836,15 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" [[package]] name = "ryu" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -867,9 +867,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" @@ -893,9 +893,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.139" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "indexmap 2.7.1", "itoa", @@ -969,9 +969,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.98" +version = "2.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2" dependencies = [ "proc-macro2", "quote", @@ -1010,9 +1010,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8" dependencies = [ "deranged", "itoa", @@ -1025,15 +1025,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef" [[package]] name = "time-macros" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c" dependencies = [ "num-conv", "time-core", @@ -1083,9 +1083,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" diff --git a/Cargo.toml b/Cargo.toml index ef4bf35f..3663080a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,14 +7,14 @@ name = "oxc_resolver" version = "4.2.0" authors = ["Boshen "] categories = ["development-tools"] -edition = "2021" +edition = "2024" homepage = "https://github.com/oxc-project/oxc-resolver" include = ["/src", "/examples", "/benches"] keywords = ["node", "resolve", "cjs", "esm", "enhanced-resolve"] license = "MIT" readme = "README.md" repository = "https://github.com/oxc-project/oxc-resolver" -rust-version = "1.74" +rust-version = "1.85.0" description = "ESM / CJS module resolution" [lib] diff --git a/benches/resolver.rs b/benches/resolver.rs index b64cd866..9e2a6d8d 100644 --- a/benches/resolver.rs +++ b/benches/resolver.rs @@ -4,7 +4,7 @@ use std::{ path::{Path, PathBuf}, }; -use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; +use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main}; use rayon::prelude::*; fn data() -> Vec<(PathBuf, &'static str)> { diff --git a/napi/src/lib.rs b/napi/src/lib.rs index 0365ea60..79ed19f7 100644 --- a/napi/src/lib.rs +++ b/napi/src/lib.rs @@ -7,7 +7,7 @@ use std::{ sync::Arc, }; -use napi::{bindgen_prelude::AsyncTask, Task}; +use napi::{Task, bindgen_prelude::AsyncTask}; use napi_derive::napi; use oxc_resolver::{PackageJson, ResolveOptions, Resolver}; diff --git a/package.json b/package.json index 07b87746..4c3cbc14 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ "devDependencies": { "@napi-rs/cli": "3.0.0-alpha.72", "@napi-rs/wasm-runtime": "^0.2.7", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "emnapi": "^1.3.1", - "typescript": "^5.7.3", - "vitest": "^3.0.7" + "typescript": "^5.8.2", + "vitest": "^3.0.8" }, "packageManager": "pnpm@10.4.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5314a12b..481703ed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,22 +10,22 @@ importers: devDependencies: '@napi-rs/cli': specifier: 3.0.0-alpha.72 - version: 3.0.0-alpha.72(@emnapi/runtime@1.3.1)(@types/node@22.13.5)(emnapi@1.3.1) + version: 3.0.0-alpha.72(@emnapi/runtime@1.3.1)(@types/node@22.13.9)(emnapi@1.3.1) '@napi-rs/wasm-runtime': specifier: ^0.2.7 version: 0.2.7 '@types/node': - specifier: ^22.13.5 - version: 22.13.5 + specifier: ^22.13.9 + version: 22.13.9 emnapi: specifier: ^1.3.1 version: 1.3.1 typescript: - specifier: ^5.7.3 - version: 5.7.3 + specifier: ^5.8.2 + version: 5.8.2 vitest: - specifier: ^3.0.7 - version: 3.0.7(@types/node@22.13.5) + specifier: ^3.0.8 + version: 3.0.8(@types/node@22.13.9) fixtures/pnpm: devDependencies: @@ -730,98 +730,98 @@ packages: '@oxc-resolver/test-longfilename-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@file:fixtures/pnpm/longfilename': resolution: {directory: fixtures/pnpm/longfilename, type: directory} - '@rollup/rollup-android-arm-eabi@4.34.8': - resolution: {integrity: sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==} + '@rollup/rollup-android-arm-eabi@4.34.9': + resolution: {integrity: sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.34.8': - resolution: {integrity: sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==} + '@rollup/rollup-android-arm64@4.34.9': + resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.34.8': - resolution: {integrity: sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==} + '@rollup/rollup-darwin-arm64@4.34.9': + resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.34.8': - resolution: {integrity: sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==} + '@rollup/rollup-darwin-x64@4.34.9': + resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.34.8': - resolution: {integrity: sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==} + '@rollup/rollup-freebsd-arm64@4.34.9': + resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.34.8': - resolution: {integrity: sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==} + '@rollup/rollup-freebsd-x64@4.34.9': + resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.34.8': - resolution: {integrity: sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==} + '@rollup/rollup-linux-arm-gnueabihf@4.34.9': + resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.34.8': - resolution: {integrity: sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==} + '@rollup/rollup-linux-arm-musleabihf@4.34.9': + resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.34.8': - resolution: {integrity: sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==} + '@rollup/rollup-linux-arm64-gnu@4.34.9': + resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.34.8': - resolution: {integrity: sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==} + '@rollup/rollup-linux-arm64-musl@4.34.9': + resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-loongarch64-gnu@4.34.8': - resolution: {integrity: sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==} + '@rollup/rollup-linux-loongarch64-gnu@4.34.9': + resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==} cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': - resolution: {integrity: sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==} + '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': + resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.34.8': - resolution: {integrity: sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==} + '@rollup/rollup-linux-riscv64-gnu@4.34.9': + resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.34.8': - resolution: {integrity: sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==} + '@rollup/rollup-linux-s390x-gnu@4.34.9': + resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.34.8': - resolution: {integrity: sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==} + '@rollup/rollup-linux-x64-gnu@4.34.9': + resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.34.8': - resolution: {integrity: sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==} + '@rollup/rollup-linux-x64-musl@4.34.9': + resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.34.8': - resolution: {integrity: sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==} + '@rollup/rollup-win32-arm64-msvc@4.34.9': + resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.34.8': - resolution: {integrity: sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==} + '@rollup/rollup-win32-ia32-msvc@4.34.9': + resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.34.8': - resolution: {integrity: sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==} + '@rollup/rollup-win32-x64-msvc@4.34.9': + resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==} cpu: [x64] os: [win32] @@ -831,17 +831,17 @@ packages: '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} - '@types/node@22.13.5': - resolution: {integrity: sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==} + '@types/node@22.13.9': + resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==} '@types/stylis@4.2.7': resolution: {integrity: sha512-VgDNokpBoKF+wrdvhAAfS55OMQpL6QRglwTwNC3kIgBrzZxA4WsFj+2eLfEA/uMUDzBcEhYmjSbwQakn/i3ajA==} - '@vitest/expect@3.0.7': - resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==} + '@vitest/expect@3.0.8': + resolution: {integrity: sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==} - '@vitest/mocker@3.0.7': - resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==} + '@vitest/mocker@3.0.8': + resolution: {integrity: sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -851,20 +851,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.7': - resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==} + '@vitest/pretty-format@3.0.8': + resolution: {integrity: sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==} - '@vitest/runner@3.0.7': - resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==} + '@vitest/runner@3.0.8': + resolution: {integrity: sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==} - '@vitest/snapshot@3.0.7': - resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==} + '@vitest/snapshot@3.0.8': + resolution: {integrity: sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==} - '@vitest/spy@3.0.7': - resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==} + '@vitest/spy@3.0.8': + resolution: {integrity: sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==} - '@vitest/utils@3.0.7': - resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==} + '@vitest/utils@3.0.8': + resolution: {integrity: sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==} ansi-escapes@4.3.2: resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} @@ -1017,8 +1017,8 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - expect-type@1.1.0: - resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==} + expect-type@1.2.0: + resolution: {integrity: sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==} engines: {node: '>=12.0.0'} external-editor@3.1.0: @@ -1133,6 +1133,11 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + nanoid@3.3.9: + resolution: {integrity: sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -1173,8 +1178,8 @@ packages: regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - rollup@4.34.8: - resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==} + rollup@4.34.9: + resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1209,8 +1214,8 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - std-env@3.8.0: - resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==} + std-env@3.8.1: + resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==} string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} @@ -1272,8 +1277,8 @@ packages: resolution: {integrity: sha512-EGjWssW7Tsk4DGfE+5yluuljS1OGYWiI1J6e8puZz9nTMM51Oug8CD5Zo4gWMsOhq5BI+1bF+rWTm4Vbj3ivRA==} engines: {node: '>= 18'} - typescript@5.7.3: - resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} + typescript@5.8.2: + resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==} engines: {node: '>=14.17'} hasBin: true @@ -1283,13 +1288,13 @@ packages: universal-user-agent@7.0.2: resolution: {integrity: sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==} - vite-node@3.0.7: - resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==} + vite-node@3.0.8: + resolution: {integrity: sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true - vite@6.2.0: - resolution: {integrity: sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==} + vite@6.2.1: + resolution: {integrity: sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -1328,16 +1333,16 @@ packages: yaml: optional: true - vitest@3.0.7: - resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==} + vitest@3.0.8: + resolution: {integrity: sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.7 - '@vitest/ui': 3.0.7 + '@vitest/browser': 3.0.8 + '@vitest/ui': 3.0.8 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1474,27 +1479,27 @@ snapshots: '@esbuild/win32-x64@0.25.0': optional: true - '@inquirer/checkbox@4.1.2(@types/node@22.13.5)': + '@inquirer/checkbox@4.1.2(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.9) ansi-escapes: 4.3.2 yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/confirm@5.1.6(@types/node@22.13.5)': + '@inquirer/confirm@5.1.6(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/core@10.1.7(@types/node@22.13.5)': + '@inquirer/core@10.1.7(@types/node@22.13.9)': dependencies: '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.9) ansi-escapes: 4.3.2 cli-width: 4.1.0 mute-stream: 2.0.0 @@ -1502,99 +1507,99 @@ snapshots: wrap-ansi: 6.2.0 yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/editor@4.2.7(@types/node@22.13.5)': + '@inquirer/editor@4.2.7(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) external-editor: 3.1.0 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/expand@4.0.9(@types/node@22.13.5)': + '@inquirer/expand@4.0.9(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 '@inquirer/figures@1.0.10': {} - '@inquirer/input@4.1.6(@types/node@22.13.5)': + '@inquirer/input@4.1.6(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/number@3.0.9(@types/node@22.13.5)': + '@inquirer/number@3.0.9(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/password@4.0.9(@types/node@22.13.5)': + '@inquirer/password@4.0.9(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) ansi-escapes: 4.3.2 optionalDependencies: - '@types/node': 22.13.5 - - '@inquirer/prompts@7.3.2(@types/node@22.13.5)': - dependencies: - '@inquirer/checkbox': 4.1.2(@types/node@22.13.5) - '@inquirer/confirm': 5.1.6(@types/node@22.13.5) - '@inquirer/editor': 4.2.7(@types/node@22.13.5) - '@inquirer/expand': 4.0.9(@types/node@22.13.5) - '@inquirer/input': 4.1.6(@types/node@22.13.5) - '@inquirer/number': 3.0.9(@types/node@22.13.5) - '@inquirer/password': 4.0.9(@types/node@22.13.5) - '@inquirer/rawlist': 4.0.9(@types/node@22.13.5) - '@inquirer/search': 3.0.9(@types/node@22.13.5) - '@inquirer/select': 4.0.9(@types/node@22.13.5) + '@types/node': 22.13.9 + + '@inquirer/prompts@7.3.2(@types/node@22.13.9)': + dependencies: + '@inquirer/checkbox': 4.1.2(@types/node@22.13.9) + '@inquirer/confirm': 5.1.6(@types/node@22.13.9) + '@inquirer/editor': 4.2.7(@types/node@22.13.9) + '@inquirer/expand': 4.0.9(@types/node@22.13.9) + '@inquirer/input': 4.1.6(@types/node@22.13.9) + '@inquirer/number': 3.0.9(@types/node@22.13.9) + '@inquirer/password': 4.0.9(@types/node@22.13.9) + '@inquirer/rawlist': 4.0.9(@types/node@22.13.9) + '@inquirer/search': 3.0.9(@types/node@22.13.9) + '@inquirer/select': 4.0.9(@types/node@22.13.9) optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/rawlist@4.0.9(@types/node@22.13.5)': + '@inquirer/rawlist@4.0.9(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) + '@inquirer/type': 3.0.4(@types/node@22.13.9) yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/search@3.0.9(@types/node@22.13.5)': + '@inquirer/search@3.0.9(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.9) yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/select@4.0.9(@types/node@22.13.5)': + '@inquirer/select@4.0.9(@types/node@22.13.9)': dependencies: - '@inquirer/core': 10.1.7(@types/node@22.13.5) + '@inquirer/core': 10.1.7(@types/node@22.13.9) '@inquirer/figures': 1.0.10 - '@inquirer/type': 3.0.4(@types/node@22.13.5) + '@inquirer/type': 3.0.4(@types/node@22.13.9) ansi-escapes: 4.3.2 yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 - '@inquirer/type@3.0.4(@types/node@22.13.5)': + '@inquirer/type@3.0.4(@types/node@22.13.9)': optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 '@jridgewell/sourcemap-codec@1.5.0': {} - '@napi-rs/cli@3.0.0-alpha.72(@emnapi/runtime@1.3.1)(@types/node@22.13.5)(emnapi@1.3.1)': + '@napi-rs/cli@3.0.0-alpha.72(@emnapi/runtime@1.3.1)(@types/node@22.13.9)(emnapi@1.3.1)': dependencies: - '@inquirer/prompts': 7.3.2(@types/node@22.13.5) + '@inquirer/prompts': 7.3.2(@types/node@22.13.9) '@napi-rs/cross-toolchain': 0.0.19 '@napi-rs/wasm-tools': 0.0.2 '@octokit/rest': 21.1.1 @@ -1897,61 +1902,61 @@ snapshots: '@oxc-resolver/test-longfilename-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@file:fixtures/pnpm/longfilename': {} - '@rollup/rollup-android-arm-eabi@4.34.8': + '@rollup/rollup-android-arm-eabi@4.34.9': optional: true - '@rollup/rollup-android-arm64@4.34.8': + '@rollup/rollup-android-arm64@4.34.9': optional: true - '@rollup/rollup-darwin-arm64@4.34.8': + '@rollup/rollup-darwin-arm64@4.34.9': optional: true - '@rollup/rollup-darwin-x64@4.34.8': + '@rollup/rollup-darwin-x64@4.34.9': optional: true - '@rollup/rollup-freebsd-arm64@4.34.8': + '@rollup/rollup-freebsd-arm64@4.34.9': optional: true - '@rollup/rollup-freebsd-x64@4.34.8': + '@rollup/rollup-freebsd-x64@4.34.9': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.34.8': + '@rollup/rollup-linux-arm-gnueabihf@4.34.9': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.34.8': + '@rollup/rollup-linux-arm-musleabihf@4.34.9': optional: true - '@rollup/rollup-linux-arm64-gnu@4.34.8': + '@rollup/rollup-linux-arm64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-arm64-musl@4.34.8': + '@rollup/rollup-linux-arm64-musl@4.34.9': optional: true - '@rollup/rollup-linux-loongarch64-gnu@4.34.8': + '@rollup/rollup-linux-loongarch64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.34.8': + '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.34.8': + '@rollup/rollup-linux-riscv64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-s390x-gnu@4.34.8': + '@rollup/rollup-linux-s390x-gnu@4.34.9': optional: true - '@rollup/rollup-linux-x64-gnu@4.34.8': + '@rollup/rollup-linux-x64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-x64-musl@4.34.8': + '@rollup/rollup-linux-x64-musl@4.34.9': optional: true - '@rollup/rollup-win32-arm64-msvc@4.34.8': + '@rollup/rollup-win32-arm64-msvc@4.34.9': optional: true - '@rollup/rollup-win32-ia32-msvc@4.34.8': + '@rollup/rollup-win32-ia32-msvc@4.34.9': optional: true - '@rollup/rollup-win32-x64-msvc@4.34.8': + '@rollup/rollup-win32-x64-msvc@4.34.9': optional: true '@tybys/wasm-util@0.9.0': @@ -1960,49 +1965,49 @@ snapshots: '@types/estree@1.0.6': {} - '@types/node@22.13.5': + '@types/node@22.13.9': dependencies: undici-types: 6.20.0 '@types/stylis@4.2.7': {} - '@vitest/expect@3.0.7': + '@vitest/expect@3.0.8': dependencies: - '@vitest/spy': 3.0.7 - '@vitest/utils': 3.0.7 + '@vitest/spy': 3.0.8 + '@vitest/utils': 3.0.8 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.7(vite@6.2.0(@types/node@22.13.5))': + '@vitest/mocker@3.0.8(vite@6.2.1(@types/node@22.13.9))': dependencies: - '@vitest/spy': 3.0.7 + '@vitest/spy': 3.0.8 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 6.2.0(@types/node@22.13.5) + vite: 6.2.1(@types/node@22.13.9) - '@vitest/pretty-format@3.0.7': + '@vitest/pretty-format@3.0.8': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.7': + '@vitest/runner@3.0.8': dependencies: - '@vitest/utils': 3.0.7 + '@vitest/utils': 3.0.8 pathe: 2.0.3 - '@vitest/snapshot@3.0.7': + '@vitest/snapshot@3.0.8': dependencies: - '@vitest/pretty-format': 3.0.7 + '@vitest/pretty-format': 3.0.8 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.0.7': + '@vitest/spy@3.0.8': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.7': + '@vitest/utils@3.0.8': dependencies: - '@vitest/pretty-format': 3.0.7 + '@vitest/pretty-format': 3.0.8 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2154,7 +2159,7 @@ snapshots: dependencies: '@types/estree': 1.0.6 - expect-type@1.1.0: {} + expect-type@1.2.0: {} external-editor@3.1.0: dependencies: @@ -2258,6 +2263,8 @@ snapshots: nanoid@3.3.8: {} + nanoid@3.3.9: {} + os-tmpdir@1.0.2: {} pathe@2.0.3: {} @@ -2276,7 +2283,7 @@ snapshots: postcss@8.5.3: dependencies: - nanoid: 3.3.8 + nanoid: 3.3.9 picocolors: 1.1.1 source-map-js: 1.2.1 @@ -2291,29 +2298,29 @@ snapshots: regenerator-runtime@0.14.1: {} - rollup@4.34.8: + rollup@4.34.9: dependencies: '@types/estree': 1.0.6 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.34.8 - '@rollup/rollup-android-arm64': 4.34.8 - '@rollup/rollup-darwin-arm64': 4.34.8 - '@rollup/rollup-darwin-x64': 4.34.8 - '@rollup/rollup-freebsd-arm64': 4.34.8 - '@rollup/rollup-freebsd-x64': 4.34.8 - '@rollup/rollup-linux-arm-gnueabihf': 4.34.8 - '@rollup/rollup-linux-arm-musleabihf': 4.34.8 - '@rollup/rollup-linux-arm64-gnu': 4.34.8 - '@rollup/rollup-linux-arm64-musl': 4.34.8 - '@rollup/rollup-linux-loongarch64-gnu': 4.34.8 - '@rollup/rollup-linux-powerpc64le-gnu': 4.34.8 - '@rollup/rollup-linux-riscv64-gnu': 4.34.8 - '@rollup/rollup-linux-s390x-gnu': 4.34.8 - '@rollup/rollup-linux-x64-gnu': 4.34.8 - '@rollup/rollup-linux-x64-musl': 4.34.8 - '@rollup/rollup-win32-arm64-msvc': 4.34.8 - '@rollup/rollup-win32-ia32-msvc': 4.34.8 - '@rollup/rollup-win32-x64-msvc': 4.34.8 + '@rollup/rollup-android-arm-eabi': 4.34.9 + '@rollup/rollup-android-arm64': 4.34.9 + '@rollup/rollup-darwin-arm64': 4.34.9 + '@rollup/rollup-darwin-x64': 4.34.9 + '@rollup/rollup-freebsd-arm64': 4.34.9 + '@rollup/rollup-freebsd-x64': 4.34.9 + '@rollup/rollup-linux-arm-gnueabihf': 4.34.9 + '@rollup/rollup-linux-arm-musleabihf': 4.34.9 + '@rollup/rollup-linux-arm64-gnu': 4.34.9 + '@rollup/rollup-linux-arm64-musl': 4.34.9 + '@rollup/rollup-linux-loongarch64-gnu': 4.34.9 + '@rollup/rollup-linux-powerpc64le-gnu': 4.34.9 + '@rollup/rollup-linux-riscv64-gnu': 4.34.9 + '@rollup/rollup-linux-s390x-gnu': 4.34.9 + '@rollup/rollup-linux-x64-gnu': 4.34.9 + '@rollup/rollup-linux-x64-musl': 4.34.9 + '@rollup/rollup-win32-arm64-msvc': 4.34.9 + '@rollup/rollup-win32-ia32-msvc': 4.34.9 + '@rollup/rollup-win32-x64-msvc': 4.34.9 fsevents: 2.3.3 safer-buffer@2.1.2: {} @@ -2334,7 +2341,7 @@ snapshots: stackback@0.0.2: {} - std-env@3.8.0: {} + std-env@3.8.1: {} string-width@4.2.3: dependencies: @@ -2388,19 +2395,19 @@ snapshots: typed-function@4.2.1: {} - typescript@5.7.3: {} + typescript@5.8.2: {} undici-types@6.20.0: {} universal-user-agent@7.0.2: {} - vite-node@3.0.7(@types/node@22.13.5): + vite-node@3.0.8(@types/node@22.13.9): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 6.2.0(@types/node@22.13.5) + vite: 6.2.1(@types/node@22.13.9) transitivePeerDependencies: - '@types/node' - jiti @@ -2415,39 +2422,39 @@ snapshots: - tsx - yaml - vite@6.2.0(@types/node@22.13.5): + vite@6.2.1(@types/node@22.13.9): dependencies: esbuild: 0.25.0 postcss: 8.5.3 - rollup: 4.34.8 + rollup: 4.34.9 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 fsevents: 2.3.3 - vitest@3.0.7(@types/node@22.13.5): + vitest@3.0.8(@types/node@22.13.9): dependencies: - '@vitest/expect': 3.0.7 - '@vitest/mocker': 3.0.7(vite@6.2.0(@types/node@22.13.5)) - '@vitest/pretty-format': 3.0.7 - '@vitest/runner': 3.0.7 - '@vitest/snapshot': 3.0.7 - '@vitest/spy': 3.0.7 - '@vitest/utils': 3.0.7 + '@vitest/expect': 3.0.8 + '@vitest/mocker': 3.0.8(vite@6.2.1(@types/node@22.13.9)) + '@vitest/pretty-format': 3.0.8 + '@vitest/runner': 3.0.8 + '@vitest/snapshot': 3.0.8 + '@vitest/spy': 3.0.8 + '@vitest/utils': 3.0.8 chai: 5.2.0 debug: 4.4.0 - expect-type: 1.1.0 + expect-type: 1.2.0 magic-string: 0.30.17 pathe: 2.0.3 - std-env: 3.8.0 + std-env: 3.8.1 tinybench: 2.9.0 tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 6.2.0(@types/node@22.13.5) - vite-node: 3.0.7(@types/node@22.13.5) + vite: 6.2.1(@types/node@22.13.9) + vite-node: 3.0.8(@types/node@22.13.9) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 transitivePeerDependencies: - jiti - less diff --git a/src/file_system.rs b/src/file_system.rs index 006c4d8b..e229fc58 100644 --- a/src/file_system.rs +++ b/src/file_system.rs @@ -213,8 +213,7 @@ impl FileSystem for FileSystemOs { VPath::Native(path) => Self::metadata(&path), } } else { - Self::metadata(path).map(FileMetadata::from) - } + Self::metadata(path)} } } diff --git a/src/fs_cache.rs b/src/fs_cache.rs index 21e5f20c..7b2321f6 100644 --- a/src/fs_cache.rs +++ b/src/fs_cache.rs @@ -7,8 +7,8 @@ use std::{ ops::Deref, path::{Component, Path, PathBuf}, sync::{ - atomic::{AtomicU64, Ordering}, Arc, + atomic::{AtomicU64, Ordering}, }, }; @@ -18,11 +18,11 @@ use papaya::{Equivalent, HashMap, HashSet}; use rustc_hash::FxHasher; use crate::{ + FileMetadata, FileSystem, PackageJsonSerde, ResolveError, ResolveOptions, TsConfig, + TsConfigSerde, cache::{Cache, CachedPath}, context::ResolveContext as Ctx, path::PathUtil, - FileMetadata, FileSystem, PackageJsonSerde, ResolveError, ResolveOptions, TsConfig, - TsConfigSerde, }; static THREAD_COUNT: AtomicU64 = AtomicU64::new(1); diff --git a/src/lib.rs b/src/lib.rs index 3e34db9c..6832b844 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -378,10 +378,12 @@ impl ResolverGeneric { ctx: &mut Ctx, ) -> Result { // Make sure only path prefixes gets called - debug_assert!(Path::new(specifier) - .components() - .next() - .is_some_and(|c| matches!(c, Component::RootDir | Component::Prefix(_)))); + debug_assert!( + Path::new(specifier) + .components() + .next() + .is_some_and(|c| matches!(c, Component::RootDir | Component::Prefix(_))) + ); if !self.options.prefer_relative && self.options.prefer_absolute { if let Ok(path) = self.load_package_self_or_node_modules(cached_path, specifier, ctx) { return Ok(path); @@ -442,10 +444,12 @@ impl ResolverGeneric { ctx: &mut Ctx, ) -> Result { // Make sure no other path prefixes gets called - debug_assert!(Path::new(specifier) - .components() - .next() - .is_some_and(|c| matches!(c, Component::Normal(_)))); + debug_assert!( + Path::new(specifier) + .components() + .next() + .is_some_and(|c| matches!(c, Component::Normal(_))) + ); if self.options.prefer_relative { if let Ok(path) = self.require_relative(cached_path, specifier, ctx) { return Ok(path); diff --git a/src/package_json_serde.rs b/src/package_json_serde.rs index 132f67ce..729d37c5 100644 --- a/src/package_json_serde.rs +++ b/src/package_json_serde.rs @@ -6,9 +6,9 @@ use std::path::{Path, PathBuf}; use serde_json::Value as JSONValue; use crate::{ + ImportsExportsKind, ImportsExportsMap, PackageJson, ResolveError, package_json::{ImportsExportsArray, ImportsExportsEntry, PackageType}, path::PathUtil, - ImportsExportsKind, ImportsExportsMap, PackageJson, ResolveError, }; pub type JSONMap = serde_json::Map; diff --git a/src/tests/exports_field.rs b/src/tests/exports_field.rs index a2e3dd7a..bce72d03 100644 --- a/src/tests/exports_field.rs +++ b/src/tests/exports_field.rs @@ -7,8 +7,8 @@ use std::path::Path; use serde_json::json; use crate::{ - cache::CachedPath, package_json_serde::ImportsExportsSerdeEntry, Cache, Ctx, PathUtil, - ResolveError, ResolveOptions, Resolver, + Cache, Ctx, PathUtil, ResolveError, ResolveOptions, Resolver, cache::CachedPath, + package_json_serde::ImportsExportsSerdeEntry, }; #[test] diff --git a/src/tests/imports_field.rs b/src/tests/imports_field.rs index a37f7419..6dc57829 100644 --- a/src/tests/imports_field.rs +++ b/src/tests/imports_field.rs @@ -7,8 +7,8 @@ use std::path::Path; use serde_json::json; use crate::{ - cache::CachedPath, package_json_serde::ImportsExportsSerdeMap, Cache, Ctx, PathUtil, - ResolveError, ResolveOptions, Resolver, + Cache, Ctx, PathUtil, ResolveError, ResolveOptions, Resolver, cache::CachedPath, + package_json_serde::ImportsExportsSerdeMap, }; #[test] diff --git a/src/tests/resolution.rs b/src/tests/resolution.rs index d6248391..27b81f00 100644 --- a/src/tests/resolution.rs +++ b/src/tests/resolution.rs @@ -1,6 +1,6 @@ use std::path::{Path, PathBuf}; -use crate::{tests::memory_fs::MemoryFS, FsCache, Resolution}; +use crate::{FsCache, Resolution, tests::memory_fs::MemoryFS}; #[test] fn test() { diff --git a/src/tsconfig.rs b/src/tsconfig.rs index 39ac9d0d..a5ff3622 100644 --- a/src/tsconfig.rs +++ b/src/tsconfig.rs @@ -7,7 +7,7 @@ use std::{ use indexmap::IndexMap; use rustc_hash::FxHasher; -use crate::{path::PathUtil, TsconfigReferences}; +use crate::{TsconfigReferences, path::PathUtil}; pub type CompilerOptionsPathsMap = IndexMap, BuildHasherDefault>; diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 3451299b..bd2e7739 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -56,12 +56,14 @@ fn tsconfig() { #[test] fn package_json_raw_json_api() { let resolution = resolve("./tests/package.json"); - assert!(resolution - .package_json() - .unwrap() - .raw_json() - .get("name") - .is_some_and(|name| name == "name")); + assert!( + resolution + .package_json() + .unwrap() + .raw_json() + .get("name") + .is_some_and(|name| name == "name") + ); } #[test] From fe4bb03a811c97c2e9235f60e90552eca069f1e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 23:24:49 +0800 Subject: [PATCH 18/19] chore(deps): update rust crate criterion2 to v3 (#400) --- Cargo.lock | 17 +++++++++++++---- Cargo.toml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48b5758e..238ac91c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -173,7 +173,7 @@ version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de4b67ff8985f3993f06167d71cf4aec178b0a1580f91a987170c59d60021103" dependencies = [ - "colored", + "colored 2.2.0", "libc", "serde", "serde_json", @@ -190,6 +190,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "concurrent_lru" version = "0.2.0" @@ -216,16 +225,16 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "criterion2" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09db22066fd79bd628faf416dac96e44054deb00531601bcc20c6d12506b3701" +checksum = "7b43b9cdbf592c78d882f2a3b9e6ebe8aedc749ef84915103a0248802ce2f6b3" dependencies = [ "anes", "bpaf", "cast", "ciborium", "codspeed", - "colored", + "colored 3.0.0", "num-traits", "oorandom", "serde", diff --git a/Cargo.toml b/Cargo.toml index 3663080a..8df3535f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ pnp = { version = "0.9.0", optional = true } document-features = { version = "0.2.10", optional = true } [dev-dependencies] -criterion2 = { version = "2.0.0", default-features = false } +criterion2 = { version = "3.0.0", default-features = false } normalize-path = { version = "0.2.1" } rayon = { version = "1.10.0" } vfs = "0.12.0" # for testing with in memory file system From 8422ff6928da247943ad19c64be6c894da10a4a3 Mon Sep 17 00:00:00 2001 From: oxc-bot Date: Fri, 7 Mar 2025 23:28:51 +0800 Subject: [PATCH 19/19] chore: release v5.0.0 (#406) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 🤖 New release * `oxc_resolver`: 4.2.0 -> 5.0.0 (✓ API compatible changes)
Changelog

## [5.0.0](https://github.com/oxc-project/oxc-resolver/compare/oxc_resolver-v4.2.0...oxc_resolver-v5.0.0) - 2025-03-07 ### Features - [**breaking**] Rust Edition 2024 ([#402](https://github.com/oxc-project/oxc-resolver/pull/402)) - deserialize `verbatim_module_syntax` from compilerOptions ([#411](https://github.com/oxc-project/oxc-resolver/pull/411)) ### Refactor - remove papaya `.collector(seize::Collector::new())` call ([#393](https://github.com/oxc-project/oxc-resolver/pull/393))

--- This PR was generated with [release-plz](https://github.com/release-plz/release-plz/). --- CHANGELOG.md | 11 +++++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- npm/package.json | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d02218f8..6386f752 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.0.0](https://github.com/oxc-project/oxc-resolver/compare/oxc_resolver-v4.2.0...oxc_resolver-v5.0.0) - 2025-03-07 + +### Features + +- [**breaking**] Rust Edition 2024 ([#402](https://github.com/oxc-project/oxc-resolver/pull/402)) +- deserialize `verbatim_module_syntax` from compilerOptions ([#411](https://github.com/oxc-project/oxc-resolver/pull/411)) + +### Refactor + +- remove papaya `.collector(seize::Collector::new())` call ([#393](https://github.com/oxc-project/oxc-resolver/pull/393)) + ## [4.2.0](https://github.com/oxc-project/oxc-resolver/compare/oxc_resolver-v4.1.0...oxc_resolver-v4.2.0) - 2025-02-19 ### Features diff --git a/Cargo.lock b/Cargo.lock index 238ac91c..f6e994d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "oxc_resolver" -version = "4.2.0" +version = "5.0.0" dependencies = [ "cfg-if", "criterion2", diff --git a/Cargo.toml b/Cargo.toml index 8df3535f..3117c427 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" [package] name = "oxc_resolver" -version = "4.2.0" +version = "5.0.0" authors = ["Boshen "] categories = ["development-tools"] edition = "2024" diff --git a/npm/package.json b/npm/package.json index a865e303..463e4f8f 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "oxc-resolver", - "version": "4.2.0", + "version": "5.0.0", "description": "Oxc Resolver Node API", "main": "index.js", "browser": "browser.js", pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy