Skip to content

Commit 8538e22

Browse files
committed
chore: remove npm-run-all2 and sort-package-json
ref - #3981 (comment) Regarding sort-package-json, it was added in 972c100, but it is sorting scripts too which I don't like. If someone prefers to sort other keys, they can just run it via npx and revert scripts section back
1 parent aa73c00 commit 8538e22

File tree

3 files changed

+13
-138
lines changed

3 files changed

+13
-138
lines changed

Diff for: docs/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"private": true,
44
"type": "module",
55
"scripts": {
6-
"build": "vitepress build",
76
"dev": "vitepress dev",
7+
"build": "vitepress build",
8+
"preview": "vitepress preview",
89
"lunaria:build": "lunaria build",
9-
"lunaria:open": "open-cli .vitepress/dist/_translations/index.html",
10-
"preview": "vitepress preview"
10+
"lunaria:open": "open-cli .vitepress/dist/_translations/index.html"
1111
},
1212
"devDependencies": {
1313
"@lunariajs/core": "^0.1.1",

Diff for: package.json

+10-13
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@
5454
"lib"
5555
],
5656
"scripts": {
57-
"dev": "rimraf dist && run-s dev:shared dev:start",
58-
"dev:start": "run-p dev:client dev:node dev:watch",
59-
"dev:client": "tsc --sourcemap -w -p src/client",
57+
"dev": "rimraf dist && pnpm dev:shared && pnpm dev:start",
58+
"dev:start": "pnpm --stream '/^dev:(client|node|watch)$/'",
59+
"dev:client": "tsc --sourcemap -w --preserveWatchOutput -p src/client",
6060
"dev:node": "DEV=true pnpm build:node -w",
6161
"dev:shared": "node scripts/copyShared",
6262
"dev:watch": "node scripts/watchAndCopy",
63-
"build": "run-s build:prepare build:client build:node",
63+
"build": "pnpm build:prepare && pnpm build:client && pnpm build:node",
6464
"build:prepare": "rimraf dist && node scripts/copyShared",
6565
"build:client": "vue-tsc --noEmit -p src/client && tsc -p src/client && node scripts/copyClient",
6666
"build:node": "tsc -p src/node --noEmit && rollup --config rollup.config.ts --configPlugin esbuild",
67-
"test": "run-p --aggregate-output test:unit test:e2e test:init",
67+
"test": "pnpm --aggregate-output --reporter=append-only '/^test:(unit|e2e|init)$/'",
6868
"test:unit": "vitest run -r __tests__/unit",
6969
"test:unit:watch": "vitest -r __tests__/unit",
70-
"test:e2e": "run-s test:e2e-dev test:e2e-build",
70+
"test:e2e": "pnpm test:e2e-dev && pnpm test:e2e-build",
7171
"test:e2e:site:dev": "pnpm -F=tests-e2e site:dev",
7272
"test:e2e:site:build": "pnpm -F=tests-e2e site:build",
7373
"test:e2e:site:preview": "pnpm -F=tests-e2e site:preview",
@@ -77,26 +77,25 @@
7777
"test:e2e-build:watch": "VITE_TEST_BUILD=1 pnpm test:e2e-dev:watch",
7878
"test:init": "pnpm -F=tests-init test",
7979
"test:init:watch": "pnpm -F=tests-init watch",
80-
"docs": "run-p dev docs:dev",
80+
"docs": "pnpm --stream '/^(docs:)?dev$/'",
8181
"docs:dev": "wait-on -d 100 dist/node/cli.js && pnpm -F=docs dev",
8282
"docs:debug": "NODE_OPTIONS='--inspect-brk' pnpm docs:dev",
83-
"docs:build": "run-s build docs:build:only",
83+
"docs:build": "pnpm build && pnpm docs:build:only",
8484
"docs:build:only": "pnpm -F=docs build",
8585
"docs:preview": "pnpm -F=docs preview",
8686
"docs:lunaria:build": "pnpm -F=docs lunaria:build",
8787
"docs:lunaria:open": "pnpm -F=docs lunaria:open",
8888
"format": "prettier --check --write .",
8989
"format:fail": "prettier --check .",
90-
"check": "run-s format:fail build test",
90+
"check": "pnpm format:fail && pnpm build && pnpm test",
9191
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
9292
"release": "node scripts/release.js"
9393
},
9494
"simple-git-hooks": {
9595
"pre-commit": "pnpm lint-staged"
9696
},
9797
"lint-staged": {
98-
"*": "prettier --write --ignore-unknown",
99-
"package.json": "sort-package-json"
98+
"*": "prettier --write --ignore-unknown"
10099
},
101100
"dependencies": {
102101
"@docsearch/css": "^3.6.0",
@@ -166,7 +165,6 @@
166165
"micromatch": "^4.0.7",
167166
"minimist": "^1.2.8",
168167
"nanoid": "^5.0.7",
169-
"npm-run-all2": "^6.2.0",
170168
"ora": "^8.0.1",
171169
"p-map": "^7.0.2",
172170
"path-to-regexp": "^6.2.2",
@@ -186,7 +184,6 @@
186184
"simple-git-hooks": "^2.11.1",
187185
"sirv": "^2.0.4",
188186
"sitemap": "^8.0.0",
189-
"sort-package-json": "^2.10.0",
190187
"supports-color": "^9.4.0",
191188
"typescript": "^5.5.2",
192189
"vitest": "^1.6.0",

Diff for: pnpm-lock.yaml

-122
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)