Sort scripts

AndreasArvidsson · AndreasArvidsson · commit a636995e2022 · 2026-03-17T11:12:48.000+01:00
diff --git a/packages/cheatsheet-local/package.json b/packages/cheatsheet-local/package.json
@@ -11,13 +11,13 @@
     ".": "./out/index.js"
   },
   "scripts": {
-    "test": "jest",
     "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "test": "jest",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
     "bundle": "env NODE_OPTIONS=--import=tsx vite build",
     "bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development",
-    "bundle:watch": "env NODE_OPTIONS=--import=tsx vite build --mode development --watch",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "bundle:watch": "env NODE_OPTIONS=--import=tsx vite build --mode development --watch"
   },
   "dependencies": {
     "@cursorless/cheatsheet": "workspace:*",
diff --git a/packages/cheatsheet/package.json b/packages/cheatsheet/package.json
@@ -12,8 +12,9 @@
     "*.css"
   ],
   "scripts": {
-    "test": "jest",
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "test": "jest"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -13,7 +13,8 @@
     "./vite": "./src/tooling/vite.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "itertools": "^2.6.0",
diff --git a/packages/cursorless-cheatsheet/package.json b/packages/cursorless-cheatsheet/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-engine/package.json b/packages/cursorless-engine/package.json
@@ -9,11 +9,12 @@
   },
   "scripts": {
     "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
     "test": "pnpm ensure-grammar-up-to-date",
     "generate-grammar:base": "nearleyc src/customCommandGrammar/grammar.ne",
     "ensure-grammar-up-to-date": "pnpm -s generate-grammar:base | diff -u src/customCommandGrammar/generated/grammar.ts -",
     "generate-grammar": "pnpm generate-grammar:base -o src/customCommandGrammar/generated/grammar.ts",
-    "generate-railroad": "mkdir -p out && nearley-railroad src/customCommandGrammar/grammar.ne -o out/railroad.html"
+    "generate-railroad": "mkdir out && nearley-railroad src/customCommandGrammar/grammar.ne -o out/railroad.html"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-everywhere-talon-core/package.json b/packages/cursorless-everywhere-talon-core/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-everywhere-talon-e2e/package.json b/packages/cursorless-everywhere-talon-e2e/package.json
@@ -8,8 +8,8 @@
   "main": "./out/index.js",
   "scripts": {
     "typecheck": "tsc",
-    "test:quickjs": "bash scripts/test-quickjs.sh",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "test:quickjs": "bash scripts/test-quickjs.sh"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-everywhere-talon/package.json b/packages/cursorless-everywhere-talon/package.json
@@ -7,15 +7,15 @@
   "type": "module",
   "main": "./out/index.js",
   "scripts": {
-    "bundle:dev": "pnpm run bundle:base src/mainDevelopment.ts",
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "dev": "pnpm run bundle:watch",
+    "build": "pnpm run bundle",
     "bundle": "pnpm run bundle:base --minify src/mainProduction.ts",
+    "bundle:dev": "pnpm run bundle:base src/mainDevelopment.ts",
     "bundle:watch": "pnpm run bundle:base --watch src/mainDevelopment.ts",
     "bundle:profile": "pnpm run bundle:base --metafile=meta.json src/mainDevelopment.ts",
-    "bundle:base": "bash scripts/esbuild.sh",
-    "dev": "pnpm run bundle:watch",
-    "build": "pnpm run bundle",
-    "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "bundle:base": "bash scripts/esbuild.sh"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-neovim/package.json b/packages/cursorless-neovim/package.json
@@ -10,16 +10,15 @@
     ".": "./out/index.cjs"
   },
   "scripts": {
-    "build": "pnpm -F @cursorless/test-harness bundle:runner:neovim && pnpm run bundle && pnpm run populate-dist",
-    "dev": "pnpm run bundle:dev && pnpm run populate-dist",
     "typecheck": "tsc",
-    "bundle:base": "bash ./scripts/compile-esbuild.sh",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "dev": "pnpm run bundle:dev && pnpm run populate-dist",
+    "build": "pnpm -F @cursorless/test-harness bundle:runner:neovim && pnpm run bundle && pnpm run populate-dist",
+    "bundle": "pnpm run bundle:base --minify",
     "bundle:dev": "pnpm run bundle:base --sourcemap",
     "bundle:watch": "pnpm run bundle:base --sourcemap --watch",
-    "bundle": "pnpm run bundle:base --minify",
-    "populate-dist": "bash ./scripts/populate-dist.sh",
-    "populate-dist:prod": "bash ./scripts/populate-dist.sh",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "bundle:base": "bash ./scripts/compile-esbuild.sh",
+    "populate-dist": "bash ./scripts/populate-dist.sh"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-org-docs/package.json b/packages/cursorless-org-docs/package.json
@@ -22,18 +22,10 @@
     ]
   },
   "scripts": {
-    "docusaurus": "docusaurus",
-    "dev": "docusaurus start",
-    "start": "docusaurus start",
-    "build": "docusaurus build",
-    "swizzle": "docusaurus swizzle",
-    "deploy": "docusaurus deploy",
-    "clear": "docusaurus clear",
-    "serve": "docusaurus serve",
-    "write-translations": "docusaurus write-translations",
-    "write-heading-ids": "docusaurus write-heading-ids",
     "typecheck": "tsc",
-    "clean": "pnpm clear && rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "docusaurus clear && rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "dev": "docusaurus start",
+    "build": "docusaurus build"
   },
   "dependencies": {
     "@algolia/client-search": "^5.49.2",
diff --git a/packages/cursorless-org/package.json b/packages/cursorless-org/package.json
@@ -12,9 +12,9 @@
   },
   "scripts": {
     "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
-    "build": "env NODE_OPTIONS=--import=tsx vite build",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "build": "env NODE_OPTIONS=--import=tsx vite build"
   },
   "dependencies": {
     "@cursorless/cheatsheet": "workspace:*",
diff --git a/packages/cursorless-tutorial/package.json b/packages/cursorless-tutorial/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-vscode-tutorial-webview/package.json b/packages/cursorless-vscode-tutorial-webview/package.json
@@ -8,11 +8,11 @@
   "main": "./out/index.js",
   "scripts": {
     "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
     "bundle": "env NODE_OPTIONS=--import=tsx vite build",
     "bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development",
-    "bundle:watch": "env NODE_OPTIONS=--import=tsx vite build --mode development --watch",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "bundle:watch": "env NODE_OPTIONS=--import=tsx vite build --mode development --watch"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/cursorless-vscode/package.json b/packages/cursorless-vscode/package.json
@@ -1281,16 +1281,19 @@
     ]
   },
   "scripts": {
-    "build": "pnpm generate-grammar && pnpm -F @cursorless/cheatsheet-local bundle && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle && pnpm run bundle && pnpm run populate-dist",
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "test": "pnpm ensure-grammar-up-to-date",
     "dev": "pnpm generate-grammar && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle:dev && pnpm run bundle:dev && pnpm run populate-dist",
+    "build": "pnpm generate-grammar && pnpm -F @cursorless/cheatsheet-local bundle && pnpm -F @cursorless/cursorless-vscode-tutorial-webview bundle && pnpm run bundle && pnpm run populate-dist",
+    "bundle": "pnpm run bundle:base --minify",
+    "bundle:dev": "pnpm run bundle:base --sourcemap",
+    "bundle:watch": "pnpm run bundle:base --sourcemap --watch",
+    "bundle:meta": "pnpm run bundle:base --metafile=meta.json",
     "bundle:base": "bash ./scripts/compile-esbuild.sh",
     "install-local": "bash ./scripts/install-local.sh",
     "install-from-pr": "bash ./scripts/install-from-pr.sh",
     "uninstall-local": "bash ./scripts/uninstall-local.sh",
-    "bundle:dev": "pnpm run bundle:base --sourcemap",
-    "bundle:watch": "pnpm run bundle:base --sourcemap --watch",
-    "bundle": "pnpm run bundle:base --minify",
-    "bundle:meta": "pnpm run bundle:base --metafile=meta.json",
     "populate-dist": "c-tsx ./src/scripts/populateDist/index.ts",
     "init-launch-sandbox": "c-tsx ./src/scripts/initLaunchSandbox.ts",
     "preprocess-svg-hats": "c-tsx ./src/scripts/preprocessSvgHats.ts",
@@ -1299,10 +1302,7 @@
     "generate-grammar:base": "nearleyc ./src/keyboard/grammar/grammar.ne",
     "ensure-grammar-up-to-date": "pnpm -s generate-grammar:base | diff -u ./src/keyboard/grammar/generated/grammar.ts -",
     "generate-grammar": "pnpm generate-grammar:base -o ./src/keyboard/grammar/generated/grammar.ts",
-    "generate-railroad": "mkdir -p out && nearley-railroad ./src/keyboard/grammar/grammar.ne -o out/railroad.html",
-    "test": "pnpm ensure-grammar-up-to-date",
-    "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "generate-railroad": "mkdir out && nearley-railroad ./src/keyboard/grammar/grammar.ne -o out/railroad.html"
   },
   "extensionDependencies": [
     "pokey.parse-tree"
diff --git a/packages/meta-updater/src/updatePackageJson.ts b/packages/meta-updater/src/updatePackageJson.ts
@@ -85,7 +85,7 @@ async function getScripts(
   name: string | undefined,
   packageDir: string,
   isRoot: boolean,
-  isLib: boolean,
+  _isLib: boolean,
 ) {
   const scripts: PackageJson.Scripts = {
     ...(inputScripts ?? {}),
@@ -97,20 +97,34 @@ async function getScripts(
 
   scripts.typecheck = "tsc";
 
-  if (!isLib) {
-    const cleanDirs = ["./out", "tsconfig.tsbuildinfo", "./dist", "./build"];
-    const clean = `rm -rf ${cleanDirs.join(" ")}`;
-    const cleanScripts =
-      name === "@cursorless/cursorless-org-docs"
-        ? ["pnpm clear", clean]
-        : [clean];
-
-    scripts.clean = cleanScripts.join(" && ");
-  } else {
-    delete scripts.clean;
-  }
+  const cleanDirs = ["./out", "tsconfig.tsbuildinfo", "./dist", "./build"];
+  const clean = `rm -rf ${cleanDirs.join(" ")}`;
+  const cleanScripts =
+    name === "@cursorless/cursorless-org-docs"
+      ? ["docusaurus clear", clean]
+      : [clean];
+
+  scripts.clean = cleanScripts.join(" && ");
+
+  const orderedKeys = [
+    "typecheck",
+    "clean",
+    "test",
+    "pretest",
+    "dev",
+    "build",
+    "bundle",
+  ];
+  const getOrder = (key: string) => {
+    const index = orderedKeys.findIndex((k) => key.startsWith(k));
+    return index === -1 ? Number.POSITIVE_INFINITY : index;
+  };
 
-  return scripts;
+  return Object.fromEntries(
+    Object.entries(scripts).sort(
+      ([keyA], [keyB]) => getOrder(keyA) - getOrder(keyB),
+    ),
+  );
 }
 
 function removeEmptyFields(obj: Record<string, any>) {
diff --git a/packages/neovim-common/package.json b/packages/neovim-common/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/neovim-registry/package.json b/packages/neovim-registry/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "devDependencies": {
     "neovim": "^5.4.0"
diff --git a/packages/node-common/package.json b/packages/node-common/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/sentence-parser/package.json b/packages/sentence-parser/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
diff --git a/packages/test-case-recorder/package.json b/packages/test-case-recorder/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
diff --git a/packages/test-harness/package.json b/packages/test-harness/package.json
@@ -13,23 +13,23 @@
     }
   },
   "scripts": {
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
     "test": "c-tsx ./src/scripts/runUnitTestsOnly.ts",
     "test:subset": "c-tsx ./src/scripts/runUnitTestsOnly.ts --subset",
     "test:update": "c-tsx ./src/scripts/runUnitTestsOnly.ts --update",
     "test:update:subset": "c-tsx ./src/scripts/runUnitTestsOnly.ts --update --subset",
-    "pretest:vscode": "pnpm run bundle:runner:vscode && pnpm run bundle:tests",
     "test:vscode": "c-tsx ./src/scripts/runVscodeTestsCI.ts",
-    "pretest:neovim": "pnpm run bundle:runner:neovim && pnpm run bundle:tests",
     "test:neovim": "c-tsx ./src/scripts/runNeovimTestsCI.ts",
-    "pretest:talonJs": "pnpm run bundle:tests",
     "test:talonJs": "c-tsx ./src/scripts/runTalonJsTests.ts",
+    "pretest:vscode": "pnpm run bundle:runner:vscode && pnpm run bundle:tests",
+    "pretest:neovim": "pnpm run bundle:runner:neovim && pnpm run bundle:tests",
+    "pretest:talonJs": "pnpm run bundle:tests",
     "bundle:base": "bash ./scripts/compile-esbuild.sh",
     "bundle": "pnpm run bundle:runner:vscode && pnpm run bundle:runner:neovim && pnpm run bundle:tests",
     "bundle:runner:vscode": "pnpm run bundle:base ./src/runners/extensionTestsVscode.ts --outfile=dist/extensionTestsVscode.cjs",
     "bundle:runner:neovim": "pnpm run bundle:base ./src/runners/extensionTestsNeovim.ts --outfile=out/runners/extensionTestsNeovim.cjs",
     "bundle:tests": "bash ./scripts/build-tests.sh",
-    "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
     "generate-test-subset-file": "c-tsx ./src/scripts/generateTestSubsetFile.ts --always-open",
     "generate-test-subset-file-strict": "c-tsx ./src/scripts/generateTestSubsetFile.ts --fail-if-not-exists"
   },
diff --git a/packages/vscode-common/package.json b/packages/vscode-common/package.json
@@ -8,7 +8,8 @@
     ".": "./src/index.ts"
   },
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck": "tsc",
+    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*"
