chore: remove npm-run-all2 and sort-package-json

ref - https://github.com/vuejs/vitepress/pull/3981#discussion_r1650834240 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
5 months ago · 8538e22f2c
parent aa73c00c25
commit 8538e22f2c
3 changed files with 13 additions and 138 deletions
--- a/docs/package.json
+++ b/docs/package.json
@ -3,11 +3,11 @@
  "private": true,
  "type": "module",
  "scripts": {
-    "build": "vitepress build",
    "dev": "vitepress dev",
+    "build": "vitepress build",
+    "preview": "vitepress preview",
    "lunaria:build": "lunaria build",
-    "lunaria:open": "open-cli .vitepress/dist/_translations/index.html",
-    "preview": "vitepress preview"
+    "lunaria:open": "open-cli .vitepress/dist/_translations/index.html"
  },
  "devDependencies": {
    "@lunariajs/core": "^0.1.1",
--- a/package.json
+++ b/package.json
@ -54,20 +54,20 @@
    "lib"
  ],
  "scripts": {
-    "dev": "rimraf dist && run-s dev:shared dev:start",
-    "dev:start": "run-p dev:client dev:node dev:watch",
-    "dev:client": "tsc --sourcemap -w -p src/client",
+    "dev": "rimraf dist && pnpm dev:shared && pnpm dev:start",
+    "dev:start": "pnpm --stream '/^dev:(client|node|watch)$/'",
+    "dev:client": "tsc --sourcemap -w --preserveWatchOutput -p src/client",
    "dev:node": "DEV=true pnpm build:node -w",
    "dev:shared": "node scripts/copyShared",
    "dev:watch": "node scripts/watchAndCopy",
-    "build": "run-s build:prepare build:client build:node",
+    "build": "pnpm build:prepare && pnpm build:client && pnpm build:node",
    "build:prepare": "rimraf dist && node scripts/copyShared",
    "build:client": "vue-tsc --noEmit -p src/client && tsc -p src/client && node scripts/copyClient",
    "build:node": "tsc -p src/node --noEmit && rollup --config rollup.config.ts --configPlugin esbuild",
-    "test": "run-p --aggregate-output test:unit test:e2e test:init",
+    "test": "pnpm --aggregate-output --reporter=append-only '/^test:(unit|e2e|init)$/'",
    "test:unit": "vitest run -r __tests__/unit",
    "test:unit:watch": "vitest -r __tests__/unit",
-    "test:e2e": "run-s test:e2e-dev test:e2e-build",
+    "test:e2e": "pnpm test:e2e-dev && pnpm test:e2e-build",
    "test:e2e:site:dev": "pnpm -F=tests-e2e site:dev",
    "test:e2e:site:build": "pnpm -F=tests-e2e site:build",
    "test:e2e:site:preview": "pnpm -F=tests-e2e site:preview",
@ -77,17 +77,17 @@
    "test:e2e-build:watch": "VITE_TEST_BUILD=1 pnpm test:e2e-dev:watch",
    "test:init": "pnpm -F=tests-init test",
    "test:init:watch": "pnpm -F=tests-init watch",
-    "docs": "run-p dev docs:dev",
+    "docs": "pnpm --stream '/^(docs:)?dev$/'",
    "docs:dev": "wait-on -d 100 dist/node/cli.js && pnpm -F=docs dev",
    "docs:debug": "NODE_OPTIONS='--inspect-brk' pnpm docs:dev",
-    "docs:build": "run-s build docs:build:only",
+    "docs:build": "pnpm build && pnpm docs:build:only",
    "docs:build:only": "pnpm -F=docs build",
    "docs:preview": "pnpm -F=docs preview",
    "docs:lunaria:build": "pnpm -F=docs lunaria:build",
    "docs:lunaria:open": "pnpm -F=docs lunaria:open",
    "format": "prettier --check --write .",
    "format:fail": "prettier --check .",
-    "check": "run-s format:fail build test",
+    "check": "pnpm format:fail && pnpm build && pnpm test",
    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
    "release": "node scripts/release.js"
  },
@ -95,8 +95,7 @@
    "pre-commit": "pnpm lint-staged"
  },
  "lint-staged": {
-    "*": "prettier --write --ignore-unknown",
-    "package.json": "sort-package-json"
+    "*": "prettier --write --ignore-unknown"
  },
  "dependencies": {
    "@docsearch/css": "^3.6.0",
@ -166,7 +165,6 @@
    "micromatch": "^4.0.7",
    "minimist": "^1.2.8",
    "nanoid": "^5.0.7",
-    "npm-run-all2": "^6.2.0",
    "ora": "^8.0.1",
    "p-map": "^7.0.2",
    "path-to-regexp": "^6.2.2",
@ -186,7 +184,6 @@
    "simple-git-hooks": "^2.11.1",
    "sirv": "^2.0.4",
    "sitemap": "^8.0.0",
-    "sort-package-json": "^2.10.0",
    "supports-color": "^9.4.0",
    "typescript": "^5.5.2",
    "vitest": "^1.6.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -212,9 +212,6 @@ importers:
      nanoid:
        specifier: ^5.0.7
        version: 5.0.7
-      npm-run-all2:
-        specifier: ^6.2.0
-        version: 6.2.0
      ora:
        specifier: ^8.0.1
        version: 8.0.1
@ -272,9 +269,6 @@ importers:
      sitemap:
        specifier: ^8.0.0
        version: 8.0.0
-      sort-package-json:
-        specifier: ^2.10.0
-        version: 2.10.0
      supports-color:
        specifier: ^9.4.0
        version: 9.4.0
@ -1357,22 +1351,10 @@ packages:
    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
    engines: {node: '>=0.4.0'}

-  detect-indent@7.0.1:
-    resolution: {integrity: sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==}
-    engines: {node: '>=12.20'}
-
-  detect-newline@4.0.1:
-    resolution: {integrity: sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
  diff-sequences@29.6.3:
    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}

-  dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
-
  dom-serializer@1.4.1:
    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}

@ -1540,9 +1522,6 @@ packages:
  get-tsconfig@4.7.5:
    resolution: {integrity: sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==}

-  git-hooks-list@3.1.0:
-    resolution: {integrity: sha512-LF8VeHeR7v+wAbXqfgRlTSX/1BJR9Q1vEMR8JAz1cEg6GX07+zyj3sAdDvYjj/xnlIfVuGgj4qBei1K3hKH+PA==}
-
  git-raw-commits@5.0.0:
    resolution: {integrity: sha512-I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg==}
    engines: {node: '>=18'}
@ -1562,10 +1541,6 @@ packages:
    engines: {node: '>=16 || 14 >=14.18'}
    hasBin: true

-  globby@13.2.2:
-    resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
  graceful-fs@4.2.11:
    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}

@ -1614,10 +1589,6 @@ packages:
  ieee754@1.2.1:
    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}

-  ignore@5.3.1:
-    resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
-    engines: {node: '>= 4'}
-
  index-to-position@0.1.2:
    resolution: {integrity: sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==}
    engines: {node: '>=18'}
@ -1741,10 +1712,6 @@ packages:
    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
    hasBin: true

-  json-parse-even-better-errors@3.0.2:
-    resolution: {integrity: sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
  jsonfile@6.1.0:
    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}

@ -1845,10 +1812,6 @@ packages:
  mdurl@2.0.0:
    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}

-  memorystream@0.3.1:
-    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
-    engines: {node: '>= 0.10.0'}
-
  mensch@0.3.4:
    resolution: {integrity: sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==}

@ -1958,15 +1921,6 @@ packages:
    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
    engines: {node: '>=0.10.0'}

-  npm-normalize-package-bin@3.0.1:
-    resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  npm-run-all2@6.2.0:
-    resolution: {integrity: sha512-wA7yVIkthe6qJBfiJ2g6aweaaRlw72itsFGF6HuwCHKwtwAx/4BY1vVpk6bw6lS8RLMsexoasOkd0aYOmsFG7Q==}
-    engines: {node: ^14.18.0 || >=16.0.0, npm: '>= 8'}
-    hasBin: true
-
  npm-run-path@5.3.0:
    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@ -2041,10 +1995,6 @@ packages:
  path-to-regexp@6.2.2:
    resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}

-  path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
-
  pathe@1.1.2:
    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}

@ -2137,10 +2087,6 @@ packages:
  react-is@18.3.1:
    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}

-  read-package-json-fast@3.0.2:
-    resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
  read-package-up@11.0.0:
    resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==}
    engines: {node: '>=18'}
@ -2240,9 +2186,6 @@ packages:
    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
    engines: {node: '>=8'}

-  shell-quote@1.8.1:
-    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
-
  shiki@1.9.0:
    resolution: {integrity: sha512-i6//Lqgn7+7nZA0qVjoYH0085YdNk4MC+tJV4bo+HgjgRMJ0JmkLZzFAuvVioJqLkcGDK5GAMpghZEZkCnwxpQ==}

@ -2290,13 +2233,6 @@ packages:
  slick@1.12.2:
    resolution: {integrity: sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==}

-  sort-object-keys@1.1.3:
-    resolution: {integrity: sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==}
-
-  sort-package-json@2.10.0:
-    resolution: {integrity: sha512-MYecfvObMwJjjJskhxYfuOADkXp1ZMMnCFC8yhp+9HDsk7HhR336hd7eiBs96lTXfiqmUNI+WQCeCMRBhl251g==}
-    hasBin: true
-
  source-map-js@1.2.0:
    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
    engines: {node: '>=0.10.0'}
@ -3717,16 +3653,8 @@ snapshots:

  delayed-stream@1.0.0: {}

-  detect-indent@7.0.1: {}
-
-  detect-newline@4.0.1: {}
-
  diff-sequences@29.6.3: {}

-  dir-glob@3.0.1:
-    dependencies:
-      path-type: 4.0.0
-
  dom-serializer@1.4.1:
    dependencies:
      domelementtype: 2.3.0
@ -3917,8 +3845,6 @@ snapshots:
    dependencies:
      resolve-pkg-maps: 1.0.0

-  git-hooks-list@3.1.0: {}
-
  git-raw-commits@5.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0):
    dependencies:
      '@conventional-changelog/git-client': 1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0)
@ -3948,14 +3874,6 @@ snapshots:
      package-json-from-dist: 1.0.0
      path-scurry: 1.11.1

-  globby@13.2.2:
-    dependencies:
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      ignore: 5.3.1
-      merge2: 1.4.1
-      slash: 4.0.0
-
  graceful-fs@4.2.11: {}

  gray-matter@4.0.3:
@ -4008,8 +3926,6 @@ snapshots:

  ieee754@1.2.1: {}

-  ignore@5.3.1: {}
-
  index-to-position@0.1.2: {}

  inherits@2.0.4: {}
@ -4103,8 +4019,6 @@ snapshots:
      argparse: 1.0.10
      esprima: 4.0.1

-  json-parse-even-better-errors@3.0.2: {}
-
  jsonfile@6.1.0:
    dependencies:
      universalify: 2.0.1
@ -4236,8 +4150,6 @@ snapshots:

  mdurl@2.0.0: {}

-  memorystream@0.3.1: {}
-
  mensch@0.3.4: {}

  meow@12.1.1: {}
@ -4313,18 +4225,6 @@ snapshots:

  normalize-path@3.0.0: {}

-  npm-normalize-package-bin@3.0.1: {}
-
-  npm-run-all2@6.2.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      cross-spawn: 7.0.3
-      memorystream: 0.3.1
-      minimatch: 9.0.4
-      pidtree: 0.6.0
-      read-package-json-fast: 3.0.2
-      shell-quote: 1.8.1
-
  npm-run-path@5.3.0:
    dependencies:
      path-key: 4.0.0
@ -4405,8 +4305,6 @@ snapshots:

  path-to-regexp@6.2.2: {}

-  path-type@4.0.0: {}
-
  pathe@1.1.2: {}

  pathval@1.1.1: {}
@ -4481,11 +4379,6 @@ snapshots:

  react-is@18.3.1: {}

-  read-package-json-fast@3.0.2:
-    dependencies:
-      json-parse-even-better-errors: 3.0.2
-      npm-normalize-package-bin: 3.0.1
-
  read-package-up@11.0.0:
    dependencies:
      find-up-simple: 1.0.0
@ -4605,8 +4498,6 @@ snapshots:

  shebang-regex@3.0.0: {}

-  shell-quote@1.8.1: {}
-
  shiki@1.9.0:
    dependencies:
      '@shikijs/core': 1.9.0
@ -4656,19 +4547,6 @@ snapshots:

  slick@1.12.2: {}

-  sort-object-keys@1.1.3: {}
-
-  sort-package-json@2.10.0:
-    dependencies:
-      detect-indent: 7.0.1
-      detect-newline: 4.0.1
-      get-stdin: 9.0.0
-      git-hooks-list: 3.1.0
-      globby: 13.2.2
-      is-plain-obj: 4.1.0
-      semver: 7.6.2
-      sort-object-keys: 1.1.3
-
  source-map-js@1.2.0: {}

  source-map@0.6.1: {}