Skip to content

Commit 0fe3eea

Browse files
ahabhgkchenjiahan
andauthored
chore: use pnpm in package.json scripts (#11520)
* chore: use pnpm in package.json scripts * chore: use pnpm in package.json scripts * fix * Update .husky/pre-commit * Apply suggestions from code review --------- Co-authored-by: neverland <[email protected]>
1 parent 76e754a commit 0fe3eea

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

.husky/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
npx lint-staged
1+
pnpx lint-staged

crates/rspack_plugin_javascript/src/parser_plugin/import_meta_plugin.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ impl JavascriptParserPlugin for ImportMetaPlugin {
204204
// import.meta
205205
// warn when access import.meta directly
206206
parser.warning_diagnostics.push(Box::new(create_traceable_error(
207-
"Critical dependency".into(),
208-
"Accessing import.meta directly is unsupported (only property access or destructuring is supported)".into(),
209-
parser.source_file,
210-
span.into()
211-
).with_severity(Severity::Warning)));
207+
"Critical dependency".into(),
208+
"Accessing import.meta directly is unsupported (only property access or destructuring is supported)".into(),
209+
parser.source_file,
210+
span.into(),
211+
).with_severity(Severity::Warning)));
212212

213213
let content = if parser.is_asi_position(span.lo()) {
214214
";({})"

lint-staged.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export default {
22
"*.rs": "rustfmt",
33
"*.{ts,tsx,js,mjs,yaml,yml}":
44
"node ./node_modules/prettier/bin/prettier.cjs --write",
5-
"*.toml": "npx @taplo/cli format",
5+
"*.toml": "pnpx @taplo/cli format",
66
"*.{ts,tsx,js,cts,cjs,mts,mjs}": [
77
"pnpm run lint:js",
88
// ignore staged file list; execute x without extra args

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
"check-dependency-version": "pnpx check-dependency-version-consistency@5 . --ignore-dep chalk --ignore-package webpack-test --ignore-package webpack-examples",
1313
"build:js": "pnpm --filter \"@rspack/core\" build && pnpm --parallel --filter \"@rspack/*\" --filter \"create-rspack\" --filter \"!@rspack/core\" build",
1414
"build:js:canary": "pnpm --filter \"@rspack-canary/core\" build && pnpm --parallel --filter \"@rspack-canary/*\" --filter \"create-rspack-canary\" --filter \"!@rspack-canary/core\" build",
15-
"build:cli:dev": "npm run build:binding:dev && npm run build:js",
16-
"build:cli:dev:wasm": "pnpm --filter @rspack/binding build:dev:wasm && npm run build:js",
17-
"build:cli:dev:browser": "pnpm --filter @rspack/binding build:dev:browser && npm run build:js",
18-
"build:cli:release": "npm run build:binding:release && npm run build:js",
19-
"build:cli:release:all": "pnpm --filter @rspack/binding build:release:all && npm run build:js",
20-
"build:cli:release:arm64": "pnpm --filter @rspack/binding build:release:arm64 && npm run build:js",
21-
"build:cli:release:x64": "pnpm --filter @rspack/binding build:release:x64 && npm run build:js",
22-
"build:cli:release:linux": "pnpm --filter @rspack/binding build:release:linux && npm run build:js",
23-
"build:cli:release:win": "pnpm --filter @rspack/binding build:release:win && npm run build:js",
24-
"build:cli:release:wasm": "pnpm --filter @rspack/binding build:release:wasm && npm run build:js",
25-
"build:cli:release:browser": "pnpm --filter @rspack/binding build:release:browser && npm run build:js",
15+
"build:cli:dev": "pnpm run build:binding:dev && pnpm run build:js",
16+
"build:cli:dev:wasm": "pnpm --filter @rspack/binding build:dev:wasm && pnpm run build:js",
17+
"build:cli:dev:browser": "pnpm --filter @rspack/binding build:dev:browser && pnpm run build:js",
18+
"build:cli:release": "pnpm run build:binding:release && pnpm run build:js",
19+
"build:cli:release:all": "pnpm --filter @rspack/binding build:release:all && pnpm run build:js",
20+
"build:cli:release:arm64": "pnpm --filter @rspack/binding build:release:arm64 && pnpm run build:js",
21+
"build:cli:release:x64": "pnpm --filter @rspack/binding build:release:x64 && pnpm run build:js",
22+
"build:cli:release:linux": "pnpm --filter @rspack/binding build:release:linux && pnpm run build:js",
23+
"build:cli:release:win": "pnpm --filter @rspack/binding build:release:win && pnpm run build:js",
24+
"build:cli:release:wasm": "pnpm --filter @rspack/binding build:release:wasm && pnpm run build:js",
25+
"build:cli:release:browser": "pnpm --filter @rspack/binding build:release:browser && pnpm run build:js",
2626
"test:js": "pnpm -r run test",
2727
"format:rs": "cargo fmt --all",
2828
"format:js": "pnpm run format-ci:js --write",
2929
"format-ci:js": "node ./node_modules/prettier/bin/prettier.cjs \"packages/**/src/**/*.{ts,tsx,mts,cts,js,mjs,cjs,jsx}\" \"crates/rspack_plugin_runtime/**/*.{ts,js}\" \"scripts/**/*.{cjs,mjs,js}\" \"*.mjs\" \"x\" --check",
30-
"format-ci:toml": "npx @taplo/cli format --check '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'",
31-
"format:toml": "npx @taplo/cli format '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'",
30+
"format-ci:toml": "pnpx @taplo/cli format --check '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'",
31+
"format:toml": "pnpx @taplo/cli format '.cargo/*.toml' './crates/**/Cargo.toml' './Cargo.toml'",
3232
"lint:js": "pnpm run lint-ci:js --write",
3333
"lint-ci:js": "biome check --diagnostic-level=warn --no-errors-on-unmatched --max-diagnostics=none --error-on-warnings",
3434
"lint:rs": "node ./scripts/check_rust_dependency.cjs",
@@ -102,4 +102,4 @@
102102
"esbuild"
103103
]
104104
}
105-
}
105+
}

tests/e2e/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.1.8",
55
"scripts": {
66
"test": "playwright test",
7-
"test:CI": "CI=1 npm run test"
7+
"test:CI": "CI=1 pnpm run test"
88
},
99
"devDependencies": {
1010
"@babel/core": "^7.28.0",

x.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ rspackCommand
202202
.action(async ({ debug }) => {
203203
try {
204204
if (!debug) {
205-
await $`npx rspack ${getVariadicArgs()}`;
205+
await $`pnpm rspack ${getVariadicArgs()}`;
206206
return;
207207
}
208208
await launchRspackCli(getVariadicArgs());
@@ -234,7 +234,7 @@ jestCommand
234234
.argument("[args...]", "Arguments pass through to rspack cli")
235235
.action(async ({ debug }) => {
236236
if (!debug) {
237-
await $`npx jest ${getVariadicArgs()}`;
237+
await $`pnpx jest ${getVariadicArgs()}`;
238238
return;
239239
}
240240
await launchJestWithArgs(getVariadicArgs());

0 commit comments

Comments
 (0)