From 41169b8e1fbb805c536c43cad55b357b59e95acc Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 15 Sep 2026 21:30:43 +0800 Subject: [PATCH] chore(deps): update NAPI and regenerate bindings --- Cargo.lock | 24 ++++++------- Cargo.toml | 6 ++-- packages/rstack/binding.cjs | 63 +++++++++++++++++------------------ packages/rstack/binding.d.cts | 1 + pnpm-lock.yaml | 20 +++++------ pnpm-workspace.yaml | 2 +- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index babdf52f..67b84bcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,9 +35,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "convert_case" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49" +checksum = "1af709f1f33454bf52eadfc8c78b3b9ef9cb26fb54d16dc9cd9a7299f899fd1b" dependencies = [ "unicode-segmentation", ] @@ -220,9 +220,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "napi" -version = "3.12.2" +version = "3.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c5f4d5375213fdb7be2655e152386e82f026f9a5ba36a75556e11359aafe09" +checksum = "3d2c1d080c842ec1347ebf3cfb9347c15f8c2262f143cc30eea41ddf1c7da720" dependencies = [ "bitflags", "ctor", @@ -236,15 +236,15 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60fdf9b392c50e7c4170fa633bd909490ed7835cea4c046776d1a4dd8d2ae0ab" +checksum = "860e7c40864f95cfb83cde99f9ebadd88ef3d9bdccd7dd2cee0cc96a2dd4ffa7" [[package]] name = "napi-derive" -version = "3.6.3" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55ea69990c90b888e9e77044410e304ce7f35de599dc6d0b5c1923d2e59af" +checksum = "350057056a30368aa76c11a0d406b0aa61321710be2c36656ab4f6efe0b785a2" dependencies = [ "convert_case", "ctor", @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "6.1.2" +version = "6.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df4056ac7c18e4438ccf0edaed4340ca0d269278c8ec19284f7b23cb039fd0ae" +checksum = "4c1c87a71568f3fe5c736b10878ff55064b250bb4ea4b48c8055713e07b9e463" dependencies = [ "convert_case", "proc-macro2", @@ -269,9 +269,9 @@ dependencies = [ [[package]] name = "napi-sys" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fbf1fa9f1babfe396d74bbbf52b3643770243e8f5b0b46715d4caf7f0dfc9a" +checksum = "4d29a242104e456960e6c6479847570be731c1a92b8f8c05ddfb5439e5c09915" dependencies = [ "libloading", ] diff --git a/Cargo.toml b/Cargo.toml index 29cf6bd4..618a03b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/rstackjs/rstack-cli" [workspace.dependencies] ignore = { version = "0.4.33", default-features = false } -napi = { version = "3.12.2", default-features = false, features = ["napi9"] } -napi-build = "2.4.1" -napi-derive = "3.6.3" +napi = { version = "3.12.4", default-features = false, features = ["napi9"] } +napi-build = "2.4.2" +napi-derive = "3.6.5" pathdiff = "0.2.3" rstack-ignore = { path = "crates/rstack-ignore" } diff --git a/packages/rstack/binding.cjs b/packages/rstack/binding.cjs index 998778e1..a1d59a41 100644 --- a/packages/rstack/binding.cjs +++ b/packages/rstack/binding.cjs @@ -1,4 +1,3 @@ -// prettier-ignore /* eslint-disable */ // @ts-nocheck /* auto-generated by NAPI-RS */ @@ -63,7 +62,7 @@ const isMuslFromChildProcess = () => { function requireNative() { if (process.env.NAPI_RS_NATIVE_LIBRARY_PATH) { try { - return require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH); + return require(process.env.NAPI_RS_NATIVE_LIBRARY_PATH) } catch (err) { loadErrors.push(err) } @@ -107,36 +106,36 @@ function requireNative() { if (process.arch === 'x64') { if ((process.config && process.config.variables && process.config.variables.shlib_suffix === 'dll.a') || (process.config && process.config.variables && process.config.variables.node_target_type === 'shared_library')) { try { - return require('./rstack.win32-x64-gnu.node') - } catch (e) { - loadErrors.push(e) - } - try { - const binding = require('@rstackjs/cli-win32-x64-gnu') - const bindingPackageVersion = require('@rstackjs/cli-win32-x64-gnu/package.json').version - if (bindingPackageVersion !== '0.7.4' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') { - throw new Error(`Native binding package version mismatch, expected 0.7.4 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`) + return require('./rstack.win32-x64-gnu.node') + } catch (e) { + loadErrors.push(e) + } + try { + const binding = require('@rstackjs/cli-win32-x64-gnu') + const bindingPackageVersion = require('@rstackjs/cli-win32-x64-gnu/package.json').version + if (bindingPackageVersion !== '0.7.4' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') { + throw new Error(`Native binding package version mismatch, expected 0.7.4 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`) + } + return binding + } catch (e) { + loadErrors.push(e) } - return binding - } catch (e) { - loadErrors.push(e) - } } else { try { - return require('./rstack.win32-x64-msvc.node') - } catch (e) { - loadErrors.push(e) - } - try { - const binding = require('@rstackjs/cli-win32-x64-msvc') - const bindingPackageVersion = require('@rstackjs/cli-win32-x64-msvc/package.json').version - if (bindingPackageVersion !== '0.7.4' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') { - throw new Error(`Native binding package version mismatch, expected 0.7.4 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`) + return require('./rstack.win32-x64-msvc.node') + } catch (e) { + loadErrors.push(e) + } + try { + const binding = require('@rstackjs/cli-win32-x64-msvc') + const bindingPackageVersion = require('@rstackjs/cli-win32-x64-msvc/package.json').version + if (bindingPackageVersion !== '0.7.4' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') { + throw new Error(`Native binding package version mismatch, expected 0.7.4 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`) + } + return binding + } catch (e) { + loadErrors.push(e) } - return binding - } catch (e) { - loadErrors.push(e) - } } } else if (process.arch === 'ia32') { try { @@ -550,7 +549,7 @@ function createLoadErrorChain(errors) { // // NAPI_RS_WASI_FLAVOR selects one exact generated flavor and implies strict // WASI loading. It never crosses into another flavor or falls back to native. -const __napiWasiFlavors = ["wasm32-wasi"] +const __napiWasiFlavors = ['wasm32-wasi'] const __napiWasiFlavor = process.env.NAPI_RS_WASI_FLAVOR const __napiWasiFlavorRequested = typeof __napiWasiFlavor === 'string' && __napiWasiFlavor.length > 0 @@ -619,11 +618,11 @@ if (!nativeBinding || forceWasi) { } return null } - if (!wasiBindingLoaded && (!__napiWasiFlavorRequested || __napiWasiFlavor === "wasm32-wasi")) { + if (!wasiBindingLoaded && (!__napiWasiFlavorRequested || __napiWasiFlavor === 'wasm32-wasi')) { let candidateError = null let candidateFailed = false try { - candidateError = __napiWasiResolveCandidate('./rstack.wasi.cjs', false, ["./rstack.wasm32-wasi.debug.wasm","./rstack.wasm32-wasi.wasm"]) + candidateError = __napiWasiResolveCandidate('./rstack.wasi.cjs', false, ['./rstack.wasm32-wasi.debug.wasm', './rstack.wasm32-wasi.wasm']) candidateFailed = candidateError !== null if (!candidateFailed) { wasiBinding = require('./rstack.wasi.cjs') @@ -639,7 +638,7 @@ if (!nativeBinding || forceWasi) { loadErrors.push(candidateError) } } - if (!wasiBindingLoaded && (!__napiWasiFlavorRequested || __napiWasiFlavor === "wasm32-wasi")) { + if (!wasiBindingLoaded && (!__napiWasiFlavorRequested || __napiWasiFlavor === 'wasm32-wasi')) { let candidateError = null let candidateFailed = false try { diff --git a/packages/rstack/binding.d.cts b/packages/rstack/binding.d.cts index d5fb7349..2bee1df3 100644 --- a/packages/rstack/binding.d.cts +++ b/packages/rstack/binding.d.cts @@ -1,5 +1,6 @@ /* auto-generated by NAPI-RS */ /* eslint-disable */ + /** JavaScript-facing hierarchy for repository `.gitignore` files. */ export declare class GitIgnoreMatcher { /** Creates an empty matcher whose sources can be added during directory traversal. */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24f5245e..be2df26e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -166,8 +166,8 @@ settings: catalogs: default: '@napi-rs/cli': - specifier: ^3.9.0 - version: 3.9.0 + specifier: ^3.9.1 + version: 3.9.1 '@rsbuild/core': specifier: ~2.2.6 version: 2.2.6 @@ -543,7 +543,7 @@ importers: devDependencies: '@napi-rs/cli': specifier: 'catalog:' - version: 3.9.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@types/node@26.5.1)(supports-color@8.1.1) + version: 3.9.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@types/node@26.5.1)(supports-color@8.1.1) '@rspress/core': specifier: 'catalog:' version: 2.0.21(@rspack/core@2.2.4)(micromark-util-types@2.0.2)(micromark@4.0.2)(supports-color@8.1.1) @@ -924,8 +924,8 @@ packages: '@types/react': '>=16' react: '>=16' - '@napi-rs/cli@3.9.0': - resolution: {integrity: sha512-ZlerYOCLgVdaqbVDt8+uQxmU9j8bKMVFcYo6zRHJJHTO9jN5060+y953aIVc/0zkVSKq+fHjDAtTGOrbxpeZCw==} + '@napi-rs/cli@3.9.1': + resolution: {integrity: sha512-2DYBrM2j4n00L+O7fKAS38q19rVQK2HXz5RxSuJgFyZrd9TrdVQFmHOfqvqqsRIRBTZmqiMqBd/yzn4X1a23DQ==} engines: {node: ^20.17.0 || ^22.13.0 || >= 23.5.0} hasBin: true peerDependencies: @@ -2642,8 +2642,8 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-yaml@4.3.1: - resolution: {integrity: sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==} + js-yaml@5.4.2: + resolution: {integrity: sha512-m+aqu+LwO1O6sIopafj8HUVl5aawITwZQe/yHpMCKjaWBaA/d07B/QdMb3529REftiU+RMMHL3Vlsw3hON7vWg==} hasBin: true json-with-bigint@3.5.10: @@ -3802,7 +3802,7 @@ snapshots: '@types/react': 19.3.0 react: 19.3.0 - '@napi-rs/cli@3.9.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@types/node@26.5.1)(supports-color@8.1.1)': + '@napi-rs/cli@3.9.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@types/node@26.5.1)(supports-color@8.1.1)': dependencies: '@inquirer/prompts': 8.5.2(@types/node@26.5.1) '@napi-rs/cross-toolchain': 1.0.3(supports-color@8.1.1) @@ -3811,7 +3811,7 @@ snapshots: clipanion: 4.0.0-rc.4 colorette: 2.0.20 es-toolkit: 1.50.0 - js-yaml: 4.3.1 + js-yaml: 5.4.2 obug: 2.1.4 semver: 7.8.5 typanion: 3.14.0 @@ -5375,7 +5375,7 @@ snapshots: js-tokens@4.0.0: {} - js-yaml@4.3.1: + js-yaml@5.4.2: dependencies: argparse: 2.0.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 830e035a..9514765e 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -12,7 +12,7 @@ catalogMode: prefer cleanupUnusedCatalogs: true catalog: - '@napi-rs/cli': '^3.9.0' + '@napi-rs/cli': '^3.9.1' '@rsbuild/core': '~2.2.6' '@rsbuild/plugin-react': '^2.1.0' '@rsbuild/plugin-sass': '^2.0.1'