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

Filter by extension

Filter by extension


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

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
63 changes: 31 additions & 32 deletions packages/rstack/binding.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// prettier-ignore
/* eslint-disable */
// @ts-nocheck
/* auto-generated by NAPI-RS */
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions packages/rstack/binding.d.cts
Original file line number Diff line number Diff line change
@@ -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. */
Expand Down
20 changes: 10 additions & 10 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down