From 709beb918f43c77306103bdabe63be6372ba0f90 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 9 Sep 2026 10:19:54 +0200 Subject: [PATCH 1/5] Rename package test-talon-e2e to test-talonjs-e2e --- .github/workflows/test.yml | 6 +++--- packages/{test-talon-e2e => test-talonjs-e2e}/package.json | 2 +- .../scripts/test-quickjs.sh | 0 .../src/constructTestHelpers.ts | 0 .../src/endToEndTestSetUp.ts | 0 .../{test-talon-e2e => test-talonjs-e2e}/src/quickjsTest.ts | 0 .../src/recorded.talonjs.test.ts | 0 .../{test-talon-e2e => test-talonjs-e2e}/src/talonMock.ts | 0 .../src/types/cursorless.ts | 0 .../{test-talon-e2e => test-talonjs-e2e}/src/types/std.d.ts | 0 .../{test-talon-e2e => test-talonjs-e2e}/src/types/talon.ts | 0 packages/{test-talon-e2e => test-talonjs-e2e}/tsconfig.json | 0 pnpm-lock.yaml | 2 +- tsconfig.json | 2 +- 14 files changed, 6 insertions(+), 6 deletions(-) rename packages/{test-talon-e2e => test-talonjs-e2e}/package.json (93%) rename packages/{test-talon-e2e => test-talonjs-e2e}/scripts/test-quickjs.sh (100%) mode change 100755 => 100644 rename packages/{test-talon-e2e => test-talonjs-e2e}/src/constructTestHelpers.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/endToEndTestSetUp.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/quickjsTest.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/recorded.talonjs.test.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/talonMock.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/types/cursorless.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/types/std.d.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/src/types/talon.ts (100%) rename packages/{test-talon-e2e => test-talonjs-e2e}/tsconfig.json (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5afe63ea665..6f44c4727f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -103,16 +103,16 @@ jobs: if: runner.os != 'Linux' - name: Run QuickJS tests (Linux) - run: xvfb-run -a pnpm -F @cursorless/test-talon-e2e test:quickjs + run: xvfb-run -a pnpm -F @cursorless/test-talonjs-e2e test:quickjs if: runner.os == 'Linux' && matrix.app_version == 'stable' - name: Run QuickJS tests (Win) - run: pnpm -F @cursorless/test-talon-e2e test:quickjs + run: pnpm -F @cursorless/test-talonjs-e2e test:quickjs if: runner.os == 'Windows' # QuickJS tests are currently broken on Mac, so we disable them for now. # - name: Run QuickJS tests (Win,Mac) - # run: pnpm -F @cursorless/test-talon-e2e test:quickjs + # run: pnpm -F @cursorless/test-talonjs-e2e test:quickjs # if: runner.os != 'Linux' - name: Create VSCode dist that can be installed locally diff --git a/packages/test-talon-e2e/package.json b/packages/test-talonjs-e2e/package.json similarity index 93% rename from packages/test-talon-e2e/package.json rename to packages/test-talonjs-e2e/package.json index 2ea41459fea..0169a81ed7e 100644 --- a/packages/test-talon-e2e/package.json +++ b/packages/test-talonjs-e2e/package.json @@ -1,5 +1,5 @@ { - "name": "@cursorless/test-talon-e2e", + "name": "@cursorless/test-talonjs-e2e", "version": "1.0.0", "description": "Our Talon everywhere/JS end-to-end tests", "license": "MIT", diff --git a/packages/test-talon-e2e/scripts/test-quickjs.sh b/packages/test-talonjs-e2e/scripts/test-quickjs.sh old mode 100755 new mode 100644 similarity index 100% rename from packages/test-talon-e2e/scripts/test-quickjs.sh rename to packages/test-talonjs-e2e/scripts/test-quickjs.sh diff --git a/packages/test-talon-e2e/src/constructTestHelpers.ts b/packages/test-talonjs-e2e/src/constructTestHelpers.ts similarity index 100% rename from packages/test-talon-e2e/src/constructTestHelpers.ts rename to packages/test-talonjs-e2e/src/constructTestHelpers.ts diff --git a/packages/test-talon-e2e/src/endToEndTestSetUp.ts b/packages/test-talonjs-e2e/src/endToEndTestSetUp.ts similarity index 100% rename from packages/test-talon-e2e/src/endToEndTestSetUp.ts rename to packages/test-talonjs-e2e/src/endToEndTestSetUp.ts diff --git a/packages/test-talon-e2e/src/quickjsTest.ts b/packages/test-talonjs-e2e/src/quickjsTest.ts similarity index 100% rename from packages/test-talon-e2e/src/quickjsTest.ts rename to packages/test-talonjs-e2e/src/quickjsTest.ts diff --git a/packages/test-talon-e2e/src/recorded.talonjs.test.ts b/packages/test-talonjs-e2e/src/recorded.talonjs.test.ts similarity index 100% rename from packages/test-talon-e2e/src/recorded.talonjs.test.ts rename to packages/test-talonjs-e2e/src/recorded.talonjs.test.ts diff --git a/packages/test-talon-e2e/src/talonMock.ts b/packages/test-talonjs-e2e/src/talonMock.ts similarity index 100% rename from packages/test-talon-e2e/src/talonMock.ts rename to packages/test-talonjs-e2e/src/talonMock.ts diff --git a/packages/test-talon-e2e/src/types/cursorless.ts b/packages/test-talonjs-e2e/src/types/cursorless.ts similarity index 100% rename from packages/test-talon-e2e/src/types/cursorless.ts rename to packages/test-talonjs-e2e/src/types/cursorless.ts diff --git a/packages/test-talon-e2e/src/types/std.d.ts b/packages/test-talonjs-e2e/src/types/std.d.ts similarity index 100% rename from packages/test-talon-e2e/src/types/std.d.ts rename to packages/test-talonjs-e2e/src/types/std.d.ts diff --git a/packages/test-talon-e2e/src/types/talon.ts b/packages/test-talonjs-e2e/src/types/talon.ts similarity index 100% rename from packages/test-talon-e2e/src/types/talon.ts rename to packages/test-talonjs-e2e/src/types/talon.ts diff --git a/packages/test-talon-e2e/tsconfig.json b/packages/test-talonjs-e2e/tsconfig.json similarity index 100% rename from packages/test-talon-e2e/tsconfig.json rename to packages/test-talonjs-e2e/tsconfig.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c960d6c00a8..d06f8f20ff4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -685,7 +685,7 @@ importers: specifier: ^4.23.12 version: 4.23.12 - packages/test-talon-e2e: + packages/test-talonjs-e2e: dependencies: '@cursorless/lib-common': specifier: workspace:* diff --git a/tsconfig.json b/tsconfig.json index c002ac6c4f8..9b7b8c47295 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -63,7 +63,7 @@ "path": "./packages/test-runner" }, { - "path": "./packages/test-talon-e2e" + "path": "./packages/test-talonjs-e2e" }, { "path": "./packages/test-vscode-e2e" From 1b129058fb99cd8f4c9841b9596bbc6e0e84d7a9 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 9 Sep 2026 10:20:21 +0200 Subject: [PATCH 2/5] Re-enable QuickJS tests for Mac --- .github/workflows/test.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f44c4727f0..317a1327e10 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -106,14 +106,9 @@ jobs: run: xvfb-run -a pnpm -F @cursorless/test-talonjs-e2e test:quickjs if: runner.os == 'Linux' && matrix.app_version == 'stable' - - name: Run QuickJS tests (Win) + - name: Run QuickJS tests (Win,Mac) run: pnpm -F @cursorless/test-talonjs-e2e test:quickjs - if: runner.os == 'Windows' - - # QuickJS tests are currently broken on Mac, so we disable them for now. - # - name: Run QuickJS tests (Win,Mac) - # run: pnpm -F @cursorless/test-talonjs-e2e test:quickjs - # if: runner.os != 'Linux' + if: runner.os != 'Linux' - name: Create VSCode dist that can be installed locally run: pnpm -F @cursorless/app-vscode populate-dist --local-install From c2d274f628588571774bb0b69697f5ca092388b9 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 9 Sep 2026 10:23:08 +0200 Subject: [PATCH 3/5] Made test-quickjs.sh executable --- packages/test-talonjs-e2e/scripts/test-quickjs.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packages/test-talonjs-e2e/scripts/test-quickjs.sh diff --git a/packages/test-talonjs-e2e/scripts/test-quickjs.sh b/packages/test-talonjs-e2e/scripts/test-quickjs.sh old mode 100644 new mode 100755 From 8e46106d5df2a78734aa96ab8673d1b2f1a3702e Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 9 Sep 2026 10:56:57 +0200 Subject: [PATCH 4/5] Update quickjs version to 2026-06-04 --- packages/test-talonjs-e2e/scripts/test-quickjs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/test-talonjs-e2e/scripts/test-quickjs.sh b/packages/test-talonjs-e2e/scripts/test-quickjs.sh index fd1e3e2afb3..87378be6a0e 100755 --- a/packages/test-talonjs-e2e/scripts/test-quickjs.sh +++ b/packages/test-talonjs-e2e/scripts/test-quickjs.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euox pipefail -QUICKJS_VERSION=2024-01-13 +QUICKJS_VERSION=2026-06-04 esbuild \ src/quickjsTest.ts \ @@ -20,7 +20,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then # Brew doesn't actually publish different versions of the quickjs binary # brew install quickjs@$QUICKJS_VERSION - qjs -I quickjsTest.mjs + qjs -m quickjsTest.mjs exit 0 fi @@ -44,6 +44,6 @@ fi curl -o $QUICKJS_FILE $QUICKJS_URL -unzip $QUICKJS_FILE +unzip -o $QUICKJS_FILE -./qjs -I quickjsTest.mjs +./qjs -m quickjsTest.mjs From dc344a1a134a48eb612fbca9f2c5cebb156f7cf6 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 9 Sep 2026 10:59:47 +0200 Subject: [PATCH 5/5] Update comment --- packages/test-talonjs-e2e/scripts/test-quickjs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/test-talonjs-e2e/scripts/test-quickjs.sh b/packages/test-talonjs-e2e/scripts/test-quickjs.sh index 87378be6a0e..d3f382eb2f5 100755 --- a/packages/test-talonjs-e2e/scripts/test-quickjs.sh +++ b/packages/test-talonjs-e2e/scripts/test-quickjs.sh @@ -18,6 +18,7 @@ cd out if [[ "$OSTYPE" == "darwin"* ]]; then brew install quickjs # Brew doesn't actually publish different versions of the quickjs binary + # https://formulae.brew.sh/formula/quickjs # brew install quickjs@$QUICKJS_VERSION qjs -m quickjsTest.mjs