diff --git a/.gitignore b/.gitignore index 887a6f7822..b51fe50bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ # Packages /packages/*/out/ /packages/*/dist/ -/packages/*/build/ /packages/app-web-docs/.docusaurus/ /packages/*/tsconfig.tsbuildinfo /packages/test-runner/testSubsetGrep.properties diff --git a/.prettierignore b/.prettierignore index aeac11a5e3..6173ea66e4 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,7 +6,6 @@ # Packages /packages/*/out/ /packages/*/dist/ -/packages/*/build/ /packages/app-web-docs/.docusaurus/ /packages/app-vscode/src/keyboard/grammar/generated/ /packages/lib-engine/src/customCommandGrammar/generated/ diff --git a/eslint.config.mts b/eslint.config.mts index e882fca86a..3f02db3425 100644 --- a/eslint.config.mts +++ b/eslint.config.mts @@ -22,7 +22,6 @@ const ignoresConfig: ConfigWithExtends = { // Packages "packages/*/out/**", "packages/*/dist/**", - "packages/*/build/**", "packages/app-web-docs/.docusaurus/**", "packages/app-vscode/src/keyboard/grammar/generated/**", "packages/lib-engine/src/customCommandGrammar/generated/**", diff --git a/packages/app-neovim/package.json b/packages/app-neovim/package.json index ea79342765..f3cc3c1466 100644 --- a/packages/app-neovim/package.json +++ b/packages/app-neovim/package.json @@ -7,7 +7,7 @@ "main": "./out/index.cjs", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "dev": "pnpm run compile:dev && pnpm run populate-dist", "build": "pnpm run compile:prod && pnpm run populate-dist", "compile:prod": "pnpm run compile:base --minify", diff --git a/packages/app-talonjs/package.json b/packages/app-talonjs/package.json index 87ee18cbfb..a835e3e329 100644 --- a/packages/app-talonjs/package.json +++ b/packages/app-talonjs/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "dev": "pnpm run compile:watch", "build": "pnpm run compile:prod", "compile:prod": "pnpm run compile:base --minify src/mainProduction.ts", diff --git a/packages/app-vscode/package.json b/packages/app-vscode/package.json index e152532595..0594fffaba 100644 --- a/packages/app-vscode/package.json +++ b/packages/app-vscode/package.json @@ -1282,7 +1282,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "test": "pnpm ensure-grammar-up-to-date", "dev": "pnpm generate-grammar && pnpm run compile:dev && pnpm run bundle:dev && pnpm run populate-dist", "build": "pnpm generate-grammar && pnpm run compile:prod && pnpm run bundle:prod && pnpm run populate-dist", diff --git a/packages/app-web-docs/README.md b/packages/app-web-docs/README.md index 3a1c61713c..b75dfda2a7 100644 --- a/packages/app-web-docs/README.md +++ b/packages/app-web-docs/README.md @@ -24,7 +24,7 @@ This command starts a local development server and opens up a browser window. Mo pnpm build ``` -This command generates static content into the `build` directory and can be served using any static contents hosting service. +This command generates static content into the `out` directory and can be served using any static contents hosting service. ### Deploy diff --git a/packages/app-web-docs/package.json b/packages/app-web-docs/package.json index 9f16847950..01ce75d413 100644 --- a/packages/app-web-docs/package.json +++ b/packages/app-web-docs/package.json @@ -18,9 +18,9 @@ }, "scripts": { "typecheck": "tsc", - "clean": "docusaurus clear && rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "docusaurus clear && rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "dev": "docusaurus start", - "build": "docusaurus build" + "build": "docusaurus build --out-dir out" }, "dependencies": { "@algolia/client-search": "^5.49.2", diff --git a/packages/app-web/package.json b/packages/app-web/package.json index c84b28a4d3..f020207585 100644 --- a/packages/app-web/package.json +++ b/packages/app-web/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "dev": "env NODE_OPTIONS=--import=tsx vite serve", "build": "env NODE_OPTIONS=--import=tsx vite build" }, diff --git a/packages/lib-cheatsheet-local/package.json b/packages/lib-cheatsheet-local/package.json index 4bb2c5c080..7f1d6ac688 100644 --- a/packages/lib-cheatsheet-local/package.json +++ b/packages/lib-cheatsheet-local/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "test": "jest", "dev": "env NODE_OPTIONS=--import=tsx vite serve", "bundle:prod": "env NODE_OPTIONS=--import=tsx vite build", diff --git a/packages/lib-cheatsheet/package.json b/packages/lib-cheatsheet/package.json index b1c54bb164..aa6e8baf1d 100644 --- a/packages/lib-cheatsheet/package.json +++ b/packages/lib-cheatsheet/package.json @@ -13,7 +13,7 @@ ], "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "test": "jest" }, "dependencies": { diff --git a/packages/lib-common/package.json b/packages/lib-common/package.json index aff7a1eb3e..8af4c0a6ed 100644 --- a/packages/lib-common/package.json +++ b/packages/lib-common/package.json @@ -14,7 +14,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "itertools": "^2.6.0", diff --git a/packages/lib-engine/package.json b/packages/lib-engine/package.json index 797023f58b..e050a70258 100644 --- a/packages/lib-engine/package.json +++ b/packages/lib-engine/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "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 -", diff --git a/packages/lib-neovim-common/package.json b/packages/lib-neovim-common/package.json index 72a4e8547d..5bc1b752ec 100644 --- a/packages/lib-neovim-common/package.json +++ b/packages/lib-neovim-common/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/lib-neovim-registry/package.json b/packages/lib-neovim-registry/package.json index c70f11f983..265783150f 100644 --- a/packages/lib-neovim-registry/package.json +++ b/packages/lib-neovim-registry/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "devDependencies": { "neovim": "^5.4.0" diff --git a/packages/lib-node-common/package.json b/packages/lib-node-common/package.json index 15f2ede924..6895c6a979 100644 --- a/packages/lib-node-common/package.json +++ b/packages/lib-node-common/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/lib-sentence-parser/package.json b/packages/lib-sentence-parser/package.json index 8ccbae587b..c8857327e8 100644 --- a/packages/lib-sentence-parser/package.json +++ b/packages/lib-sentence-parser/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "devDependencies": { "@types/mocha": "^10.0.10", diff --git a/packages/lib-talonjs-core/package.json b/packages/lib-talonjs-core/package.json index 0317e419eb..9c09e82129 100644 --- a/packages/lib-talonjs-core/package.json +++ b/packages/lib-talonjs-core/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/lib-test-case-recorder/package.json b/packages/lib-test-case-recorder/package.json index 261954a875..d9292b63ab 100644 --- a/packages/lib-test-case-recorder/package.json +++ b/packages/lib-test-case-recorder/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/lib-tutorial/package.json b/packages/lib-tutorial/package.json index c7d83c40b1..39934e3e6c 100644 --- a/packages/lib-tutorial/package.json +++ b/packages/lib-tutorial/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/lib-vscode-common/package.json b/packages/lib-vscode-common/package.json index b33e927ebe..53dcbb2647 100644 --- a/packages/lib-vscode-common/package.json +++ b/packages/lib-vscode-common/package.json @@ -9,7 +9,7 @@ }, "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*" diff --git a/packages/lib-vscode-tutorial-webview/package.json b/packages/lib-vscode-tutorial-webview/package.json index ddd43ddb74..65aac06ed8 100644 --- a/packages/lib-vscode-tutorial-webview/package.json +++ b/packages/lib-vscode-tutorial-webview/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "dev": "env NODE_OPTIONS=--import=tsx vite serve", "bundle:prod": "env NODE_OPTIONS=--import=tsx vite build", "bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development", diff --git a/packages/test-neovim-e2e/package.json b/packages/test-neovim-e2e/package.json index 8e2dc8fef1..4443b33cc9 100644 --- a/packages/test-neovim-e2e/package.json +++ b/packages/test-neovim-e2e/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/test-runner/package.json b/packages/test-runner/package.json index 50b2cbd5a0..927b4495ca 100644 --- a/packages/test-runner/package.json +++ b/packages/test-runner/package.json @@ -8,7 +8,7 @@ "main": "./out/extensionTestsNeovim.cjs", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "test": "c-tsx ./src/scripts/runUnitTests.ts", "test:subset": "c-tsx ./src/scripts/runUnitTests.ts --subset", "test:update": "c-tsx ./src/scripts/runUnitTests.ts --update", diff --git a/packages/test-talon-e2e/package.json b/packages/test-talon-e2e/package.json index 2d27f44354..0915b46a9c 100644 --- a/packages/test-talon-e2e/package.json +++ b/packages/test-talon-e2e/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build", + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo", "test:quickjs": "bash ./scripts/test-quickjs.sh" }, "dependencies": { diff --git a/packages/test-vscode-e2e/package.json b/packages/test-vscode-e2e/package.json index 668130b03e..edf871b0e3 100644 --- a/packages/test-vscode-e2e/package.json +++ b/packages/test-vscode-e2e/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "dependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/tool-meta-updater/package.json b/packages/tool-meta-updater/package.json index 9ae6ef97f8..75b6e2ff93 100644 --- a/packages/tool-meta-updater/package.json +++ b/packages/tool-meta-updater/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "typecheck": "tsc", - "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build" + "clean": "rm -rf ./out ./dist ./tsconfig.tsbuildinfo" }, "devDependencies": { "@cursorless/lib-common": "workspace:*", diff --git a/packages/tool-meta-updater/src/updatePackageJson.ts b/packages/tool-meta-updater/src/updatePackageJson.ts index a1d3dc64f3..67553a6e62 100644 --- a/packages/tool-meta-updater/src/updatePackageJson.ts +++ b/packages/tool-meta-updater/src/updatePackageJson.ts @@ -99,7 +99,7 @@ async function getScripts( scripts.typecheck = "tsc"; - const cleanDirs = ["./out", "./tsconfig.tsbuildinfo", "./dist", "./build"]; + const cleanDirs = ["./out", "./dist", "./tsconfig.tsbuildinfo"]; const clean = `rm -rf ${cleanDirs.join(" ")}`; const cleanScripts = name === "@cursorless/app-web-docs" ? ["docusaurus clear", clean] : [clean]; diff --git a/scripts/build-and-assemble-website.sh b/scripts/build-and-assemble-website.sh index f933fed30b..f4bbeb593f 100755 --- a/scripts/build-and-assemble-website.sh +++ b/scripts/build-and-assemble-website.sh @@ -23,6 +23,6 @@ mkdir -p "$root_dir" mkdir -p "$docs_dir" cp -r packages/app-web/out/* "$root_dir" -cp -r packages/app-web-docs/build/* "$docs_dir" +cp -r packages/app-web-docs/out/* "$docs_dir" cp packages/app-vscode/out/railroad.html "$root_dir/keyboard-modal-railroad.html" cp packages/lib-engine/out/railroad.html "$root_dir/custom-command-railroad.html"