From 64b439e70ab1ae9b494a97f742b554b69957dc01 Mon Sep 17 00:00:00 2001 From: Eduardo Russo Date: Sat, 17 Oct 2026 18:06:17 +0100 Subject: [PATCH] chore: smith 1.10.1, and the e2e suites declare the playwright they import - office-reader, captcha-tesseract and studio-desktop import playwright in their e2e suites but only reached it by npm hoisting core's dependency; each declares it now, so the playwright convention finds them without the flavour markers - install.sh writes the Windows PATH itself since smith 1.10.1 (monosmith #290): the workflows' cygpath workaround goes - the hand-added e2e-browsers dependencies stay: 1.10.1 still drops a plugin's dependency under a depends_on override (reported on monosmith #283) Refs #313 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01TjR6eM2tUwU3NGnKXsmEap --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/desktop-package.yml | 8 ++------ .github/workflows/e2e.yml | 8 ++------ .github/workflows/vscode-e2e.yml | 8 ++------ .github/workflows/vscode-package.yml | 8 ++------ .github/workflows/vscode-publish.yml | 8 ++------ apps/studio-desktop/package.json | 4 ++-- package-lock.json | 23 +++++++++++++++-------- packages/captcha-tesseract/package.json | 6 ++---- packages/office-reader/package.json | 6 ++---- 11 files changed, 33 insertions(+), 50 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 16a3a94b..2378c978 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -11,5 +11,5 @@ "version": "3.12" } }, - "postCreateCommand": "curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- \"1.10.0\" && \"$HOME/.local/bin/smith\" ci setup" + "postCreateCommand": "curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- \"1.10.1\" && \"$HOME/.local/bin/smith\" ci setup" } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98d7f3ba..3f113bed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: Install smith run: curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" env: - SMITH_VERSION: 1.10.0 + SMITH_VERSION: 1.10.1 GITHUB_TOKEN: ${{ github.token }} # smith:slot before-setup # The lockfile is written by npm 12: npm 11 prunes the nested @emnapi entries of the diff --git a/.github/workflows/desktop-package.yml b/.github/workflows/desktop-package.yml index 949692d5..de0e64b4 100644 --- a/.github/workflows/desktop-package.yml +++ b/.github/workflows/desktop-package.yml @@ -31,13 +31,9 @@ jobs: # The npm scripts run smith (MonoSmith); the same installer the generated ci.yml uses. - name: Install smith shell: bash - run: | - curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" - # install.sh adds its folder to PATH in Git Bash form, which cmd and PowerShell cannot use - # (monosmith-app/monosmith#290): add the Windows form too. - if [ "$RUNNER_OS" = Windows ]; then cygpath -w "$HOME/.local/bin" >> "$GITHUB_PATH"; fi + run: curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" env: - SMITH_VERSION: 1.10.0 + SMITH_VERSION: 1.10.1 GITHUB_TOKEN: ${{ github.token }} - run: npm ci - name: Installer diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 65e10cf0..f724783c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -22,13 +22,9 @@ jobs: # The npm scripts run smith (MonoSmith); the same installer the generated ci.yml uses. - name: Install smith shell: bash - run: | - curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" - # install.sh adds its folder to PATH in Git Bash form, which cmd and PowerShell cannot use - # (monosmith-app/monosmith#290): add the Windows form too. - if [ "$RUNNER_OS" = Windows ]; then cygpath -w "$HOME/.local/bin" >> "$GITHUB_PATH"; fi + run: curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" env: - SMITH_VERSION: 1.10.0 + SMITH_VERSION: 1.10.1 GITHUB_TOKEN: ${{ github.token }} - run: npm ci - run: npm run core:e2e diff --git a/.github/workflows/vscode-e2e.yml b/.github/workflows/vscode-e2e.yml index a6ff5f60..f4b4323b 100644 --- a/.github/workflows/vscode-e2e.yml +++ b/.github/workflows/vscode-e2e.yml @@ -25,13 +25,9 @@ jobs: # The npm scripts run smith (MonoSmith); the same installer the generated ci.yml uses. - name: Install smith shell: bash - run: | - curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" - # install.sh adds its folder to PATH in Git Bash form, which cmd and PowerShell cannot use - # (monosmith-app/monosmith#290): add the Windows form too. - if [ "$RUNNER_OS" = Windows ]; then cygpath -w "$HOME/.local/bin" >> "$GITHUB_PATH"; fi + run: curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" env: - SMITH_VERSION: 1.10.0 + SMITH_VERSION: 1.10.1 GITHUB_TOKEN: ${{ github.token }} - run: npm ci # The libraries an Electron editor needs on a bare runner. diff --git a/.github/workflows/vscode-package.yml b/.github/workflows/vscode-package.yml index cb7010d9..e709d43d 100644 --- a/.github/workflows/vscode-package.yml +++ b/.github/workflows/vscode-package.yml @@ -29,13 +29,9 @@ jobs: # The npm scripts run smith (MonoSmith); the same installer the generated ci.yml uses. - name: Install smith shell: bash - run: | - curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" - # install.sh adds its folder to PATH in Git Bash form, which cmd and PowerShell cannot use - # (monosmith-app/monosmith#290): add the Windows form too. - if [ "$RUNNER_OS" = Windows ]; then cygpath -w "$HOME/.local/bin" >> "$GITHUB_PATH"; fi + run: curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" env: - SMITH_VERSION: 1.10.0 + SMITH_VERSION: 1.10.1 GITHUB_TOKEN: ${{ github.token }} - run: npm ci - name: Package the extension diff --git a/.github/workflows/vscode-publish.yml b/.github/workflows/vscode-publish.yml index 9c19823c..6af923b7 100644 --- a/.github/workflows/vscode-publish.yml +++ b/.github/workflows/vscode-publish.yml @@ -88,13 +88,9 @@ jobs: # The npm scripts run smith (MonoSmith); the same installer the generated ci.yml uses. - name: Install smith shell: bash - run: | - curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" - # install.sh adds its folder to PATH in Git Bash form, which cmd and PowerShell cannot use - # (monosmith-app/monosmith#290): add the Windows form too. - if [ "$RUNNER_OS" = Windows ]; then cygpath -w "$HOME/.local/bin" >> "$GITHUB_PATH"; fi + run: curl -fsSL https://raw.githubusercontent.com/monosmith-app/monosmith/main/install.sh | sh -s -- "$SMITH_VERSION" env: - SMITH_VERSION: 1.10.0 + SMITH_VERSION: 1.10.1 GITHUB_TOKEN: ${{ github.token }} - run: npm ci - name: Package the extension diff --git a/apps/studio-desktop/package.json b/apps/studio-desktop/package.json index 4ad8a6b8..3ac3b2f9 100644 --- a/apps/studio-desktop/package.json +++ b/apps/studio-desktop/package.json @@ -11,7 +11,8 @@ "description": "OpenCraw Studio as a desktop app: an Electron window around the local Studio server.", "devDependencies": { "electron": "^44.7.0", - "electron-builder": "^26.15.3" + "electron-builder": "^26.15.3", + "playwright": "^1.64.1" }, "scripts": { "build": "esbuild src/main.ts --bundle --packages=external --platform=node --format=esm --outdir=dist --sourcemap && node -e \"const fs=require('node:fs'),p=require('node:path');for(const[i,g,o,w]of[['src/desktop-bridge','preload.cjs','dist',0]])for(const f of fs.globSync(g,{cwd:i})){const s=p.join(i,f),d=p.join(o,f);if(fs.statSync(s).isDirectory()){if(w)fs.cpSync(s,d,{recursive:true})}else{fs.mkdirSync(p.dirname(d),{recursive:true});fs.copyFileSync(s,d)}}\"", @@ -25,7 +26,6 @@ }, "smith": { "playwright": { - "flavour": "library", "display": true } } diff --git a/package-lock.json b/package-lock.json index 6a4c6e7f..b5de4115 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,7 +79,8 @@ }, "devDependencies": { "electron": "^44.7.0", - "electron-builder": "^26.15.3" + "electron-builder": "^26.15.3", + "playwright": "^1.64.1" } }, "apps/studio-ui": { @@ -31513,12 +31514,12 @@ } }, "node_modules/playwright": { - "version": "1.63.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.63.0.tgz", - "integrity": "sha512-+7ziBLidS4NaNCdt57SUDT+wYmmd5fmiQejUic/kb+YsYSCPyOOE9sebzMjNmQrsnNpDJqd4WHvV/8lfKfUDUg==", + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.64.1.tgz", + "integrity": "sha512-HCrVhHr5QQuwYoswEUGTb7gGp522yflbv/ST8nF4sFWGuLjQCt17Q/EubpGGSNKYn1tsTCPZxqHhHCfVURu7UA==", "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.63.0" + "playwright-core": "1.64.1" }, "bin": { "playwright": "cli.js" @@ -31528,9 +31529,9 @@ } }, "node_modules/playwright-core": { - "version": "1.63.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.63.0.tgz", - "integrity": "sha512-rYCsBF/M5HjUch52bbtVONEFjv6Xu8sm8h72dNlR5bzIE1fvC/bxgspzkjSfU+MweEMmPM8KJebG6nnyxo5mCg==", + "version": "1.64.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.64.1.tgz", + "integrity": "sha512-BC4s8y6SEVA6Q1rSxZTto8hI1KUI3xXlHGZgvGqP4IqPdI/a6FX9H29IDNz7vKo9l21b6LfYosScPL6M3xxyDQ==", "license": "Apache-2.0", "bin": { "playwright-core": "cli.js" @@ -36694,6 +36695,9 @@ "pngjs": "^7.0.0", "tesseract.js": "^7.0.0" }, + "devDependencies": { + "playwright": "^1.64.1" + }, "engines": { "node": ">=20" } @@ -36787,6 +36791,9 @@ "fflate": "^0.8.3", "htmlparser2": "^10.1.0" }, + "devDependencies": { + "playwright": "^1.64.1" + }, "engines": { "node": ">=20" } diff --git a/packages/captcha-tesseract/package.json b/packages/captcha-tesseract/package.json index 6fe6f445..fd94ef05 100644 --- a/packages/captcha-tesseract/package.json +++ b/packages/captcha-tesseract/package.json @@ -53,9 +53,7 @@ "test": "jest", "typecheck": "tsc --build tsconfig.json --emitDeclarationOnly" }, - "smith": { - "playwright": { - "flavour": "library" - } + "devDependencies": { + "playwright": "^1.64.1" } } diff --git a/packages/office-reader/package.json b/packages/office-reader/package.json index c9335d86..c39e9d7f 100644 --- a/packages/office-reader/package.json +++ b/packages/office-reader/package.json @@ -89,9 +89,7 @@ "test": "jest", "typecheck": "tsc --build tsconfig.json --emitDeclarationOnly" }, - "smith": { - "playwright": { - "flavour": "library" - } + "devDependencies": { + "playwright": "^1.64.1" } }