Update build scripts (#3217)

Author: AndreasArvidsson

.github/actions/setup-node/action.yaml

@@ -0,0 +1,17 @@
+name: Setup node
+
+runs:
+  using: composite
+  steps:
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v6
+      with:
+        node-version-file: .nvmrc
+        cache: pnpm
+
+    - name: Install dependencies
+      shell: bash
+      run: pnpm --color install

.github/workflows/deploy.yaml .github/workflows/deploy.yml.github/workflows/deploy.yaml renamed to .github/workflows/deploy.yml

@@ -23,17 +23,8 @@ jobs:
           # Deploy the exact commit that passed the test workflow.
           ref: ${{ github.event.workflow_run.head_sha }}
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Set up Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm --color install
+        uses: ./.github/actions/setup-node
 
       - name: Compile
         run: pnpm --color compile
@@ -73,17 +64,8 @@ jobs:
           # Deploy the exact commit that passed the test workflow.
           ref: ${{ github.event.workflow_run.head_sha }}
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Set up Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm --color install
+        uses: ./.github/actions/setup-node
 
       - name: Compile
         run: pnpm --color compile

.github/workflows/pre-commit.yml

@@ -27,17 +27,7 @@ jobs:
         with:
           python-version-file: "pyproject.toml"
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm --color install
+      - uses: ./.github/actions/setup-node
 
       - name: Install lua
         uses: leafo/gh-actions-lua@v12

.github/workflows/test-docs.yml

@@ -16,14 +16,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Set up Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
+        uses: ./.github/actions/setup-node
 
       - name: Build website
         run: bash -x scripts/build-and-assemble-website.sh

.github/workflows/test.yml

@@ -11,8 +11,27 @@ on:
     branches: [main]
   workflow_dispatch:
 
+env:
+  CURSORLESS_REPO_ROOT: ${{ github.workspace }}
+  TEMP_DIR: ${{ github.workspace }}/temp
+  NODE_OPTIONS: "--max-old-space-size=4096"
+
 jobs:
-  test:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Node.js
+        uses: ./.github/actions/setup-node
+
+      - name: Lint
+        run: pnpm --color lint
+
+  test-main:
     name: Test
     strategy:
       fail-fast: false
@@ -23,15 +42,10 @@ jobs:
           - os: ubuntu-latest
             app_version: legacy
     runs-on: ${{ matrix.os }}
-
     env:
       APP_VERSION: ${{ matrix.app_version }}
-      NEOVIM_VERSION: ${{ matrix.app_version == 'stable' && 'stable' || 'v0.10.0' }}
       VSCODE_CRASH_DIR: ${{ github.workspace }}/artifacts/dumps
       VSCODE_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
-      CURSORLESS_REPO_ROOT: ${{ github.workspace }}
-      TEMP_DIR: ${{ github.workspace }}/temp
-      NODE_OPTIONS: "--max-old-space-size=4096"
 
     steps:
       - name: Git config
@@ -40,31 +54,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Set up Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: .nvmrc
-          cache: pnpm
+        uses: ./.github/actions/setup-node
 
       - name: Creating log directories
         run: mkdir -p "${{ env.VSCODE_CRASH_DIR }}" "${{ env.VSCODE_LOGS_DIR }}" "${{ env.TEMP_DIR }}"
         shell: bash
 
-      - name: Install dependencies
-        run: pnpm --color install
-
       - name: Compile
         run: pnpm --color compile
 
       - name: Build
         run: pnpm --color --filter '!cursorless-org' --filter '!cursorless-org-*' build
 
-      - name: Lint
-        run: pnpm --color lint
-
       - name: Run unit tests (Linux)
         run: xvfb-run -a pnpm --color test
         if: runner.os == 'Linux'
@@ -87,40 +89,15 @@ jobs:
 
       - name: Run Talon-JS tests (Win,Mac)
         run: pnpm -F @cursorless/test-harness test:talonJs
-        if: runner.os != 'Linux' && matrix.app_version == 'stable'
+        if: runner.os != 'Linux'
 
       - name: Run Cursorless-everywhere-talon tests (Linux)
         run: xvfb-run -a pnpm -F @cursorless/cursorless-everywhere-talon-e2e test:quickjs
         if: runner.os == 'Linux' && matrix.app_version == 'stable'
 
       - name: Run Cursorless-everywhere-talon tests (Win,Mac)
         run: pnpm -F @cursorless/cursorless-everywhere-talon-e2e test:quickjs
-        if: runner.os != 'Linux' && matrix.app_version == 'stable'
-
-      - name: Install neovim dependencies
-        run: bash -x scripts/install-neovim-dependencies.sh
-
-      - name: Setup neovim (Linux)
-        uses: rhysd/action-setup-vim@v1
-        id: vim
-        if: runner.os == 'Linux' && matrix.app_version == 'stable'
-        with:
-          version: ${{ env.NEOVIM_VERSION }}
-          neovim: true
-
-      - name: Run neovim tests (Linux)
-        run: xvfb-run -a pnpm -F @cursorless/test-harness test:neovim
-        if: runner.os == 'Linux' && matrix.app_version == 'stable'
-        env:
-          NEOVIM_PATH: ${{ steps.vim.outputs.executable }}
-
-      - name: Run neovim lua tests (Linux)
-        uses: ./.github/actions/test-neovim-lua/
-        if: runner.os == 'Linux' && matrix.app_version == 'stable'
-
-      - name: Run neovim lua lint (Linux)
-        uses: ./.github/actions/lint-lua-ls/
-        if: runner.os == 'Linux' && matrix.app_version == 'stable'
+        if: runner.os != 'Linux'
 
       - name: Create vscode dist that can be installed locally
         run: pnpm -F @cursorless/cursorless-vscode populate-dist --local-install
@@ -158,3 +135,43 @@ jobs:
           name: dumps-${{ matrix.os }}-${{ matrix.app_version }}
           path: ${{ env.VSCODE_CRASH_DIR }}
         if: failure()
+
+  test-neovim:
+    name: Test Neovim
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Git config
+        run: git config --global core.autocrlf false
+
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Node.js
+        uses: ./.github/actions/setup-node
+
+      - name: Compile
+        run: pnpm --color compile
+
+      - name: Build
+        run: pnpm --color --filter '!cursorless-org' --filter '!cursorless-org-*' build
+
+      - name: Install neovim dependencies
+        run: bash -x scripts/install-neovim-dependencies.sh
+
+      - name: Setup neovim
+        uses: rhysd/action-setup-vim@v1
+        id: vim
+        with:
+          neovim: true
+
+      - name: Run neovim tests
+        run: xvfb-run -a pnpm -F @cursorless/test-harness test:neovim
+        env:
+          NEOVIM_PATH: ${{ steps.vim.outputs.executable }}
+
+      - name: Run neovim lua tests
+        uses: ./.github/actions/test-neovim-lua/
+
+      - name: Run neovim lua lint
+        uses: ./.github/actions/lint-lua-ls/

.meta-updater/main.mjs

@@ -1,3 +1,4 @@
-import { updater } from "../packages/meta-updater/dist/index.cjs";
+// eslint-disable-next-line import/no-relative-packages
+import { updater } from "../packages/meta-updater/src/index.ts";
 
 export default updater;

.pre-commit-config.yaml

@@ -69,15 +69,15 @@ repos:
         name: format-recorded-tests
         files: ^data/fixtures/recorded/.*/[^/]*\.yml$
         language: system
-        entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
+        entry: pnpm transform-recorded-tests
 
   - repo: local
     hooks:
       - id: check-recorded-test-marks
         name: check-recorded-test-marks
         files: ^data/fixtures/recorded/.*/[^/]*\.yml$
         language: system
-        entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
+        entry: pnpm transform-recorded-tests --check-marks
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.15.5

.vscode/settings.json

@@ -5,12 +5,8 @@
   "[python]": {
     "editor.defaultFormatter": "charliermarsh.ruff"
   },
-  "[scm]": {
-    "editor.defaultFormatter": "AndreasArvidsson.andreas-talon",
-    "editor.tabSize": 2
-  },
-  "[talon]": {
-    "editor.defaultFormatter": "wenkokke.talonfmt-vscode"
+  "[talon][talon-list][scm]": {
+    "editor.defaultFormatter": "AndreasArvidsson.andreas-talon"
   },
   "cSpell.words": [
     "Autoformatting",

package.json

@@ -13,25 +13,25 @@
     "build": "pnpm -r build",
     "clean": "pnpm -r clean",
     "compile": "tsc --build && pnpm -r compile:esbuild",
-    "fix:meta": "pnpm run meta-updater:base && pnpm -r exec prettier --write tsconfig.json package.json",
+    "fix:meta": "pnpm run meta-updater && pnpm -r exec prettier --write tsconfig.json package.json",
     "fix:syncpack": "syncpack fix",
     "fix:eslint": "pnpm lint:ts --fix",
     "fix:prettier": "prettier --write --list-different .",
-    "lint:meta": "pnpm run meta-updater:base --test",
+    "lint:meta": "pnpm run meta-updater --test",
     "lint:syncpack": "syncpack lint",
-    "lint:ts": "eslint packages --ext ts,tsx,mts",
+    "lint:ts": "eslint packages",
     "lint:prettier": "prettier --check .",
     "lint": "pnpm run lint:meta && pnpm run lint:syncpack && pnpm run lint:ts",
-    "init-vscode-sandbox": "pnpm --filter=@cursorless/cursorless-vscode init-launch-sandbox",
-    "meta-updater:base": "pnpm --filter=@cursorless/meta-updater build && meta-updater",
+    "init-vscode-sandbox": "pnpm -F=@cursorless/cursorless-vscode init-launch-sandbox",
+    "meta-updater": "env NODE_OPTIONS='--import=tsx --conditions=cursorless:bundler' meta-updater",
     "preinstall": "npx only-allow pnpm",
     "test-compile": "tsc --build",
     "test": "pnpm -r test",
     "test:subset": "pnpm -r test:subset",
     "test:update": "pnpm -r test:update",
     "test:update:subset": "pnpm -r test:update:subset",
     "generate-grammar": "pnpm -r generate-grammar",
-    "transform-recorded-tests": "./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts",
+    "transform-recorded-tests": "pnpm exec ./packages/common/scripts/my-ts-node.js ./packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts",
     "watch": "pnpm run -w --parallel '/^watch:.*/'",
     "watch:esbuild": "pnpm run -r --parallel watch:esbuild",
     "watch:tsc": "tsc --build --watch"
@@ -53,6 +53,7 @@
     "prettier": "^3.8.1",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "syncpack": "^14.0.2",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.56.1"
   },

packages/cheatsheet-local/package.json

@@ -21,10 +21,10 @@
   "scripts": {
     "compile": "tsc --build",
     "watch": "tsc --build --watch",
-    "webpack": "pnpm -w compile && env NODE_OPTIONS=--loader=ts-node/esm webpack --config ./src/webpack.config.ts",
     "build": "pnpm build:prod",
     "build:dev": "pnpm webpack --mode=development",
     "build:prod": "pnpm webpack --mode=production --node-env=production",
+    "webpack": "env NODE_OPTIONS=--loader=ts-node/esm webpack --config ./src/webpack.config.ts",
     "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {