From 6228906c62d1236ba32ccd00c4308efdfe7dd8bd Mon Sep 17 00:00:00 2001 From: pshu Date: Mon, 22 Jun 2026 23:36:52 +0800 Subject: [PATCH] fix(release): track binding package.json so lockfile keeps bindings importers npm release failed with ERR_PNPM_OUTDATED_LOCKFILE on bindings/wasm32-wasi. napi create-npm-dirs regenerates the binding workspace packages at release time, but bindings/ was gitignored, so a renovate lockfile regeneration on a clean checkout (no bindings/ dir) silently dropped every bindings/* importer. Track bindings/*/package.json in git (rspack-style) so a clean checkout always carries the importers and renovate can no longer drop them; restore the importers in pnpm-lock.yaml. Exclude the generated bindings from prettier since napi output is not prettier-formatted. --- .gitignore | 1 - .prettierignore | 1 + bindings/.gitignore | 4 +++ bindings/darwin-arm64/package.json | 25 ++++++++++++++++++ bindings/darwin-x64/package.json | 25 ++++++++++++++++++ bindings/linux-arm64-gnu/package.json | 28 +++++++++++++++++++++ bindings/linux-arm64-musl/package.json | 28 +++++++++++++++++++++ bindings/linux-x64-gnu/package.json | 28 +++++++++++++++++++++ bindings/linux-x64-musl/package.json | 28 +++++++++++++++++++++ bindings/wasm32-wasi/package.json | 35 ++++++++++++++++++++++++++ bindings/win32-arm64-msvc/package.json | 25 ++++++++++++++++++ bindings/win32-ia32-msvc/package.json | 25 ++++++++++++++++++ bindings/win32-x64-msvc/package.json | 25 ++++++++++++++++++ pnpm-lock.yaml | 2 +- 14 files changed, 278 insertions(+), 2 deletions(-) create mode 100644 bindings/.gitignore create mode 100644 bindings/darwin-arm64/package.json create mode 100644 bindings/darwin-x64/package.json create mode 100644 bindings/linux-arm64-gnu/package.json create mode 100644 bindings/linux-arm64-musl/package.json create mode 100644 bindings/linux-x64-gnu/package.json create mode 100644 bindings/linux-x64-musl/package.json create mode 100644 bindings/wasm32-wasi/package.json create mode 100644 bindings/win32-arm64-msvc/package.json create mode 100644 bindings/win32-ia32-msvc/package.json create mode 100644 bindings/win32-x64-msvc/package.json diff --git a/.gitignore b/.gitignore index 779b0627..95680d9d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ target/ node_modules fuzz/Cargo.lock artifacts -bindings diff --git a/.prettierignore b/.prettierignore index 4b5c2e88..42a96ed3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,3 +4,4 @@ fixtures/enhanced_resolve/test/fixtures/tsconfig-paths/malformed-json/tsconfig.j pnpm-lock.yaml **/.pnp.cjs .claude/worktrees +bindings diff --git a/bindings/.gitignore b/bindings/.gitignore new file mode 100644 index 00000000..a85693ee --- /dev/null +++ b/bindings/.gitignore @@ -0,0 +1,4 @@ +* +!.gitignore +!*/ +!*/package.json diff --git a/bindings/darwin-arm64/package.json b/bindings/darwin-arm64/package.json new file mode 100644 index 00000000..f149461c --- /dev/null +++ b/bindings/darwin-arm64/package.json @@ -0,0 +1,25 @@ +{ + "name": "@rspack/resolver-binding-darwin-arm64", + "version": "0.5.3", + "cpu": [ + "arm64" + ], + "main": "resolver.darwin-arm64.node", + "files": [ + "resolver.darwin-arm64.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "darwin" + ] +} diff --git a/bindings/darwin-x64/package.json b/bindings/darwin-x64/package.json new file mode 100644 index 00000000..13614162 --- /dev/null +++ b/bindings/darwin-x64/package.json @@ -0,0 +1,25 @@ +{ + "name": "@rspack/resolver-binding-darwin-x64", + "version": "0.5.3", + "cpu": [ + "x64" + ], + "main": "resolver.darwin-x64.node", + "files": [ + "resolver.darwin-x64.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "darwin" + ] +} diff --git a/bindings/linux-arm64-gnu/package.json b/bindings/linux-arm64-gnu/package.json new file mode 100644 index 00000000..87dca46d --- /dev/null +++ b/bindings/linux-arm64-gnu/package.json @@ -0,0 +1,28 @@ +{ + "name": "@rspack/resolver-binding-linux-arm64-gnu", + "version": "0.5.3", + "cpu": [ + "arm64" + ], + "main": "resolver.linux-arm64-gnu.node", + "files": [ + "resolver.linux-arm64-gnu.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "linux" + ], + "libc": [ + "glibc" + ] +} diff --git a/bindings/linux-arm64-musl/package.json b/bindings/linux-arm64-musl/package.json new file mode 100644 index 00000000..5df3f92f --- /dev/null +++ b/bindings/linux-arm64-musl/package.json @@ -0,0 +1,28 @@ +{ + "name": "@rspack/resolver-binding-linux-arm64-musl", + "version": "0.5.3", + "cpu": [ + "arm64" + ], + "main": "resolver.linux-arm64-musl.node", + "files": [ + "resolver.linux-arm64-musl.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "linux" + ], + "libc": [ + "musl" + ] +} diff --git a/bindings/linux-x64-gnu/package.json b/bindings/linux-x64-gnu/package.json new file mode 100644 index 00000000..3f84bbef --- /dev/null +++ b/bindings/linux-x64-gnu/package.json @@ -0,0 +1,28 @@ +{ + "name": "@rspack/resolver-binding-linux-x64-gnu", + "version": "0.5.3", + "cpu": [ + "x64" + ], + "main": "resolver.linux-x64-gnu.node", + "files": [ + "resolver.linux-x64-gnu.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "linux" + ], + "libc": [ + "glibc" + ] +} diff --git a/bindings/linux-x64-musl/package.json b/bindings/linux-x64-musl/package.json new file mode 100644 index 00000000..125b574d --- /dev/null +++ b/bindings/linux-x64-musl/package.json @@ -0,0 +1,28 @@ +{ + "name": "@rspack/resolver-binding-linux-x64-musl", + "version": "0.5.3", + "cpu": [ + "x64" + ], + "main": "resolver.linux-x64-musl.node", + "files": [ + "resolver.linux-x64-musl.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "linux" + ], + "libc": [ + "musl" + ] +} diff --git a/bindings/wasm32-wasi/package.json b/bindings/wasm32-wasi/package.json new file mode 100644 index 00000000..9c45e0b9 --- /dev/null +++ b/bindings/wasm32-wasi/package.json @@ -0,0 +1,35 @@ +{ + "name": "@rspack/resolver-binding-wasm32-wasi", + "version": "0.5.3", + "cpu": [ + "wasm32" + ], + "main": "resolver.wasi.cjs", + "files": [ + "resolver.wasm32-wasi.wasm", + "resolver.wasi.cjs", + "resolver.wasi-browser.js", + "wasi-worker.mjs", + "wasi-worker-browser.mjs" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "browser": "resolver.wasi-browser.js", + "dependencies": { + "@napi-rs/wasm-runtime": "^1.1.5", + "@emnapi/core": "1.10.0", + "@emnapi/runtime": "1.10.0" + } +} diff --git a/bindings/win32-arm64-msvc/package.json b/bindings/win32-arm64-msvc/package.json new file mode 100644 index 00000000..bad49298 --- /dev/null +++ b/bindings/win32-arm64-msvc/package.json @@ -0,0 +1,25 @@ +{ + "name": "@rspack/resolver-binding-win32-arm64-msvc", + "version": "0.5.3", + "cpu": [ + "arm64" + ], + "main": "resolver.win32-arm64-msvc.node", + "files": [ + "resolver.win32-arm64-msvc.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "win32" + ] +} diff --git a/bindings/win32-ia32-msvc/package.json b/bindings/win32-ia32-msvc/package.json new file mode 100644 index 00000000..5d3bf531 --- /dev/null +++ b/bindings/win32-ia32-msvc/package.json @@ -0,0 +1,25 @@ +{ + "name": "@rspack/resolver-binding-win32-ia32-msvc", + "version": "0.5.3", + "cpu": [ + "ia32" + ], + "main": "resolver.win32-ia32-msvc.node", + "files": [ + "resolver.win32-ia32-msvc.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "win32" + ] +} diff --git a/bindings/win32-x64-msvc/package.json b/bindings/win32-x64-msvc/package.json new file mode 100644 index 00000000..e7d76b72 --- /dev/null +++ b/bindings/win32-x64-msvc/package.json @@ -0,0 +1,25 @@ +{ + "name": "@rspack/resolver-binding-win32-x64-msvc", + "version": "0.5.3", + "cpu": [ + "x64" + ], + "main": "resolver.win32-x64-msvc.node", + "files": [ + "resolver.win32-x64-msvc.node" + ], + "description": "Rspack Resolver Node API", + "homepage": "https://github.com/rstackjs/rspack-resolver", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/rstackjs/rspack-resolver.git" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org/", + "access": "public" + }, + "os": [ + "win32" + ] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b0720fab..d06d19fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,7 +81,7 @@ importers: specifier: 1.10.0 version: 1.10.0 '@napi-rs/wasm-runtime': - specifier: ^1.1.4 + specifier: ^1.1.5 version: 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) bindings/win32-arm64-msvc: {}