diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 718ca4d..33620b7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,12 +4,10 @@ name: Publish # the tag with SHA256SUMS signed by this workflow and pushed with them to the public package # ghcr.io/spin-stack/vscode-spinbox-release, which `spin vscode install` reads while this # repository's releases are a 404 to it (job release), then published to the Visual -# Studio Marketplace and to Open VSX (job publish), as a pre-release when the tag holds -pre. The -# release comes first and on its own: it exists, and is installable, whether or not a registry is -# set up yet or answers. Both registries trust this workflow in the publish environment by OIDC -# (docs/publishing.md), so no token is kept: the Marketplace retires personal access tokens on -# 2026-12-01. OVSX_PAT is only for Open VSX's first publish, before its trusted publisher can be -# registered; once it is, the secret is deleted and ovsx exchanges the job's ID token instead. +# Studio Marketplace (job publish), as a pre-release when the tag holds -pre. The release comes +# first and on its own: it exists, and is installable, whether or not the Marketplace is set up +# yet or answers. The Marketplace trusts this workflow in the publish environment by OIDC +# (docs/publishing.md), so no token is kept: it retires personal access tokens on 2026-12-01. on: push: @@ -64,7 +62,7 @@ jobs: - run: go tool task publish:ghcr env: GH_TOKEN: ${{ github.token }} - # The registries publish these very bytes, the ones SHA256SUMS lists, not a second package. + # The Marketplace publishes these very bytes, the ones SHA256SUMS lists, not a second package. - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2 with: name: spinbox-vsix @@ -79,7 +77,7 @@ jobs: environment: publish permissions: contents: read - # The token each registry exchanges for a short-lived publishing credential. + # The token the Marketplace exchanges for a short-lived publishing credential. id-token: write steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -98,6 +96,3 @@ jobs: with: name: spinbox-vsix - run: go tool task publish:marketplace - - run: go tool task publish:openvsx - env: - OVSX_PAT: ${{ secrets.OVSX_PAT }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2fd8d8b..ba5ef23 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ A tag `v*` pushed to this repository runs `.github/workflows/publish.yml`. It pa platform once (`task package:all`), makes the tag's GitHub release (`task publish:github`), pushes the same files to the public package `ghcr.io/spin-stack/vscode-spinbox-release` (`task publish:ghcr`), and then publishes the same VSIXs to the Visual Studio Marketplace -(`vsce`) and to Open VSX (`ovsx`). The tag is `v` followed by `package.json`'s `version`. +(`vsce`). The tag is `v` followed by `package.json`'s `version`. Nobody pushes that tag for a release. A push to main that changes `package.json` runs `.github/workflows/tag.yml` (`task release:tag`): when no tag has the version it holds, it tags @@ -60,8 +60,8 @@ that commit `v`, or `v-pre` for an odd minor (the Marketplace' pre-release), as the release app, since a tag pushed with the run's own token would start no workflow. So merging a bump releases it, and so does merging a version set by hand. The tag workflow needs `RELEASE_APP_KEY` too. -The GitHub release comes first, in a job of its own, so it exists whether or not a registry is set -up or answers. It holds: +The GitHub release comes first, in a job of its own, so it exists whether or not the Marketplace is +set up or answers. It holds: | File | What | |---|---| @@ -89,7 +89,7 @@ a tag moved to another artifact can only point at another release this workflow release notes say, and then `code --install-extension spinbox-.vsix`. The package is made private by its first push, and nothing installs from it until someone makes -it public, once: [docs/publishing.md](docs/publishing.md#6-ghcr-make-the-package-public). +it public, once: [docs/publishing.md](docs/publishing.md#4-ghcr-make-the-package-public). A tag with `-pre` after it (`v0.3.0-pre`) publishes that version as a pre-release: the Marketplace takes no semver pre-release versions, and its convention is an odd minor for pre-releases. @@ -98,9 +98,8 @@ pre-release versions, and its convention is an odd minor for pre-releases. git tag v0.3.0-pre && git push origin v0.3.0-pre # package.json says "version": "0.3.0" ``` -Both registries trust the workflow by OIDC in the GitHub environment `publish`, so it keeps no -token. A run that failed halfway is run again whole: both registries skip a version they already -have. +The Marketplace trusts the workflow by OIDC in the GitHub environment `publish`, so it keeps no +token. A run that failed halfway is run again whole: the Marketplace skips a version it already +has. -How to create the two accounts, the publisher and the namespace, and the order to do it in, is -[docs/publishing.md](docs/publishing.md). +How to create the publisher, and the order to do it in, is [docs/publishing.md](docs/publishing.md). diff --git a/README.md b/README.md index fed355a..ab5d09c 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,9 @@ one in a new window, without leaving the editor. ## Requirements -- VS Code 1.146 or newer, or an editor built on it that installs from Open VSX (VSCodium, - Cursor, ...). -- A Remote-SSH extension: Microsoft's `ms-vscode-remote.remote-ssh` in VS Code, or - `jeanp413.open-remote-ssh` elsewhere. When none is installed, Spinbox offers to install the one - your editor's marketplace carries. +- Microsoft VS Code 1.146 or newer. +- Microsoft's Remote-SSH, `ms-vscode-remote.remote-ssh`. When it is not installed, Spinbox offers + to install it. - A Spinbox account, with an SSH key of this machine added to it. If none is, Spinbox says so and offers to add one. diff --git a/Taskfile.yml b/Taskfile.yml index 6b80e26..2a7955a 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -87,14 +87,13 @@ tasks: rm -rf bin publish: - desc: Package every platform, attach each VSIX to the tag's GitHub release, and publish each to the Visual Studio Marketplace and to Open VSX - what the Publish workflow runs on a tag v*, step by step. It authenticates by the workflow's OIDC token (docs/publishing.md), so it runs only in that workflow. + desc: Package every platform, attach each VSIX to the tag's GitHub release, and publish each to the Visual Studio Marketplace - what the Publish workflow runs on a tag v*, step by step. It authenticates by the workflow's OIDC token (docs/publishing.md), so it runs only in that workflow. cmds: - task: publish:check - task: package:all - task: publish:github - task: publish:ghcr - task: publish:marketplace - - task: publish:openvsx publish:github: desc: >- @@ -148,7 +147,7 @@ tasks: TAG: '{{.TAG}}' silent: true cmds: - # Without id-token: write, or outside Actions, both registries would only say they refused. + # Without id-token: write, or outside Actions, the Marketplace would only say it refused. - cmd: | if [ -z "${ACTIONS_ID_TOKEN_REQUEST_URL:-}" ]; then echo "publish: no OIDC token: it runs in the Publish workflow, whose job has id-token: write (docs/publishing.md)" >&2 @@ -164,15 +163,9 @@ tasks: publish:marketplace: desc: Publish every VSIX in the repository's root to the Visual Studio Marketplace, as the publisher's trusted publishing policy for this workflow. cmds: - # --skip-duplicate: a run that failed on Open VSX is run again whole, and what the Marketplace already has is no error. + # --skip-duplicate: a run that failed after it is run again whole, and what the Marketplace already has is no error. - pnpm exec vsce publish --oidc --skip-duplicate {{.PRE_RELEASE}} --packagePath *.vsix - publish:openvsx: - desc: Publish every VSIX in the repository's root to Open VSX - with OVSX_PAT for the first publish, by the namespace's trusted publisher once one is registered. - cmds: - # With no OVSX_PAT, ovsx exchanges the job's ID token itself (trusted publishing). - - pnpm exec ovsx publish --skip-duplicate {{.PRE_RELEASE}} --packagePath *.vsix - spin:newer: desc: Whether GIVEN, a spin release, is newer than versions.yaml's spin, as release= - the Bump spin workflow's first step (versions newer). cmds: diff --git a/docs/publishing.md b/docs/publishing.md index 9a40420..829b9bd 100644 --- a/docs/publishing.md +++ b/docs/publishing.md @@ -1,12 +1,8 @@ # Publishing: the accounts, once -Spinbox is published to two registries: the **Visual Studio Marketplace**, which VS Code reads, and -**Open VSX**, which VSCodium, Cursor and other editors read. Both trust this repository's Publish -workflow by OIDC (*trusted publishing*), so no token is kept in GitHub. - -The Marketplace retires personal access tokens on **2026-12-01**. Open VSX needs one token only for -the very first publish, because it registers a trusted publisher only for an extension that already -exists. +Spinbox is published to the **Visual Studio Marketplace**, which VS Code reads. It trusts this +repository's Publish workflow by OIDC (*trusted publishing*), so no token is kept in GitHub. The +Marketplace retires personal access tokens on **2026-12-01**. What a person does, once, in this order: @@ -14,10 +10,8 @@ What a person does, once, in this order: |---|---|---|---| | 1 | GitHub | The `publish` environment in this repository | 2 min | | 2 | Visual Studio Marketplace | The publisher `spin-stack`, and its trusted publishing policy | 10 min | -| 3 | Open VSX | An Eclipse account, the Publisher Agreement, the namespace `spin-stack`, a token | 15 min | -| 4 | Here | The first release, a pre-release | 15 min | -| 5 | Open VSX | Claim the namespace and register the trusted publisher; delete the token | days (a person at Eclipse reviews the claim) | -| 6 | GitHub | Make the package `vscode-spinbox-release` public, after the first release pushed it | 2 min | +| 3 | Here | The first release, a pre-release | 15 min | +| 4 | GitHub | Make the package `vscode-spinbox-release` public, after the first release pushed it | 2 min | ## 1. GitHub: the `publish` environment @@ -25,7 +19,7 @@ What a person does, once, in this order: 2. Under **Deployment branches and tags**, choose **Selected branches and tags**, then **Add deployment branch or tag rule**, with *Ref type* **Tag** and the pattern `v*`. - Only a tag `v*` can run in it. - - Both registries' policies name this environment, so no other ref can publish. + - The Marketplace's policy names this environment, so no other ref can publish. 3. Optional: add yourself under **Required reviewers**, so a person approves each publish. ## 2. Visual Studio Marketplace @@ -58,34 +52,7 @@ organization when publishing is by trusted publishing. Later, once the publisher has had an extension listed for 6 months, it can verify the domain (publisher → **Details → Verified domain**, a DNS TXT record). Nothing needs it now. -## 3. Open VSX - -You need the GitHub account you will log in to open-vsx.org with. - -1. **Create an Eclipse account** at . - - Fill in the **GitHub Username** field with exactly that GitHub account. - - Open VSX matches the two accounts by this field. -2. **Log in to ** with that GitHub account: the account icon, top right. -3. **Sign the Publisher Agreement.** - 1. Open the avatar menu → **Settings**, then select **Log in with Eclipse** and authorize. - 2. Select **Show Publisher Agreement**, read it to the end, and select **Agree**. -4. **Create a token for the first publish.** - 1. Open **Settings → Access Tokens** () and select - **Generate New Token**. - 2. Describe it `vscode-spinbox first publish`, then select **Generate Token**. - 3. Copy it now: it is shown once. -5. **Create the namespace** with that token. Its name must match `publisher` in `package.json`, - including case: - - ```sh - pnpm exec ovsx create-namespace spin-stack -p - ``` - -6. **Hand the token to the first publish.** - 1. In this repository, open **Settings → Environments → publish → Add environment secret**. - 2. Name it `OVSX_PAT` and paste the token as its value. - -## 4. The first release +## 3. The first release 1. **Make sure the VSIX carries a current CLI.** `versions.yaml`'s `spin` entry names a spin release that has the four CLIs (linux-amd64, linux-arm64, darwin-amd64, darwin-arm64). @@ -105,52 +72,22 @@ You need the GitHub account you will log in to open-vsx.org with. 3. **Watch the run.** Actions → **Publish**, approving it if you set a reviewer. - Its first job, **GitHub release**, needs no account: it attaches the VSIXs, `SHA256SUMS` and - their signature to the tag's release before either registry is asked, so the release is - there to install from even when a registry refuses. The same job pushes those files to - `ghcr.io/spin-stack/vscode-spinbox-release`, which the first push creates private (step 6). - - A run that fails halfway is run again whole: both registries skip a version they already - have. + their signature to the tag's release before the Marketplace is asked, so the release is + there to install from even when the Marketplace refuses. The same job pushes those files to + `ghcr.io/spin-stack/vscode-spinbox-release`, which the first push creates private (step 4). + - A run that fails halfway is run again whole: the Marketplace skips a version it already + has. - Its first step fails, saying why, if the job has no OIDC token. - - Each registry refuses with its own message if the publisher, namespace or policy is not set - up. -4. **Check both listings.** - - - - - -## 5. Open VSX: from a token to trusted publishing - -1. **Claim the namespace.** - 1. Open an issue at asking to - own `spin-stack`. - 2. Once granted, the namespace is *verified*. - 3. Add other people in **Settings → Namespaces**: an *Owner* manages members, a *Contributor* - only publishes. - - A trusted publisher needs an owner; a contributor is not enough. -2. **Register the trusted publisher.** - 1. Open **Settings → Trusted Publishers** - () and select the namespace - `spin-stack`. - 2. Select the GitHub provider and fill in: - - | Field | Value | - |---|---| - | Organization or User name | `spin-stack` | - | Repository name | `vscode-spinbox` | - | Workflow filename | `publish.yml` | - | Environment name | `publish` | - - 3. If the dialog offers no GitHub provider, keep the token and look again later. -3. **Drop the token.** Delete the environment secret `OVSX_PAT`, and revoke the token in - **Settings → Access Tokens**. With no token, `ovsx` exchanges the job's ID token by itself. + - The Marketplace refuses with its own message if the publisher or policy is not set up. +4. **Check the listing:** -## 6. ghcr: make the package public +## 4. ghcr: make the package public `spin vscode install` pulls the extension anonymously from `ghcr.io/spin-stack/vscode-spinbox-release`. GitHub creates a package private on its first push, and a package linked to a repository takes that repository's access permissions but not its visibility; nor is there a REST endpoint that changes it. So, once, after -the first run of Publish has pushed the package (step 4): +the first run of Publish has pushed the package (step 3): 1. You need the admin role on the package: an owner of `spin-stack` has it on every package of the organization. @@ -170,8 +107,8 @@ the first run of Publish has pushed the package (step 4): answers `{"token":...}`; while the package is private it answers `DENIED`. -A public package cannot be made private again. That is what is wanted: everything in it is in -the public registries too, and what the CLI trusts is the signature, not the package. +A public package cannot be made private again. That is what is wanted: everything in it is on +the Marketplace too, and what the CLI trusts is the signature, not the package. While the package is private, or before the first push, `spin vscode install` fails with `no_extension_release`, saying the package is missing or not public. @@ -179,7 +116,4 @@ While the package is private, or before the first push, `spin vscode install` fa ## Sources - [Publishing Extensions](https://code.visualstudio.com/api/working-with-extensions/publishing-extension), VS Code: the publisher, trusted publishing, the PAT retirement, platform-specific and pre-release versions. -- [Publishing Extensions](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions), Open VSX wiki: the Eclipse account, the agreement, tokens, `create-namespace`. -- [Namespace Access](https://github.com/eclipse/openvsx/wiki/Namespace-Access), Open VSX wiki: claiming a namespace, members. -- [Trusted Publishing](https://github.com/eclipse-openvsx/openvsx/wiki/Trusted-Publishing), Open VSX wiki: the trusted publisher, private repositories. - [Configuring a package's access control and visibility](https://docs.github.com/en/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility), GitHub: private on first publish, visibility not inherited, who may change it, public cannot go back. diff --git a/hack/spinpropose/main.go b/hack/spinpropose/main.go index c1c3efb..9122a94 100644 --- a/hack/spinpropose/main.go +++ b/hack/spinpropose/main.go @@ -176,7 +176,7 @@ func body(release, run, version, tag string, targets []string) string { "Left to whoever merges it, as versions.yaml's note says: the CLI's contract against `src/cli/contract.ts`, " + "and the extension tried against an installation of " + release + ".\n\n" + "Merging it releases the extension as " + version + ": `.github/workflows/tag.yml` tags main `" + tag + "`, " + - "and that tag publishes it to the GitHub release, ghcr, the Marketplace and Open VSX.\n\n" + + "and that tag publishes it to the GitHub release, ghcr and the Marketplace.\n\n" + "spin-stack/shipset dispatches this for each spin release (`.github/workflows/bump-spin.yml`); " + "a newer one rewrites this branch and this pull request, commits added here included.\n" } diff --git a/package.json b/package.json index 195b28c..9e7c6a5 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,6 @@ "@vscode/test-electron": "3.1.0", "@vscode/vsce": "4.1.0", "esbuild": "0.28.2", - "ovsx": "1.3.0", "typescript": "7.0.2", "vitest": "5.0.5" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d150449..d1304b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,9 +26,6 @@ importers: esbuild: specifier: 0.28.2 version: 0.28.2 - ovsx: - specifier: 1.3.0 - version: 1.3.0(@types/node@22.20.5) typescript: specifier: 7.0.2 version: 7.0.2 @@ -311,140 +308,6 @@ packages: cpu: [x64] os: [win32] - '@inquirer/ansi@1.0.2': - resolution: {integrity: sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==} - engines: {node: '>=18'} - - '@inquirer/checkbox@4.3.2': - resolution: {integrity: sha512-VXukHf0RR1doGe6Sm4F0Em7SWYLTHSsbGfJdS9Ja2bX5/D5uwVOEjr07cncLROdBvmnvCATYEWlHqYmXv2IlQA==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/confirm@5.1.21': - resolution: {integrity: sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/core@10.3.2': - resolution: {integrity: sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/editor@4.2.23': - resolution: {integrity: sha512-aLSROkEwirotxZ1pBaP8tugXRFCxW94gwrQLxXfrZsKkfjOYC1aRvAZuhpJOb5cu4IBTJdsCigUlf2iCOu4ZDQ==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/expand@4.0.23': - resolution: {integrity: sha512-nRzdOyFYnpeYTTR2qFwEVmIWypzdAx/sIkCMeTNTcflFOovfqUk+HcFhQQVBftAh9gmGrpFj6QcGEqrDMDOiew==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/external-editor@1.0.3': - resolution: {integrity: sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/figures@1.0.15': - resolution: {integrity: sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==} - engines: {node: '>=18'} - - '@inquirer/input@4.3.1': - resolution: {integrity: sha512-kN0pAM4yPrLjJ1XJBjDxyfDduXOuQHrBB8aLDMueuwUGn+vNpF7Gq7TvyVxx8u4SHlFFj4trmj+a2cbpG4Jn1g==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/number@3.0.23': - resolution: {integrity: sha512-5Smv0OK7K0KUzUfYUXDXQc9jrf8OHo4ktlEayFlelCjwMXz0299Y8OrI+lj7i4gCBY15UObk76q0QtxjzFcFcg==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/password@4.0.23': - resolution: {integrity: sha512-zREJHjhT5vJBMZX/IUbyI9zVtVfOLiTO66MrF/3GFZYZ7T4YILW5MSkEYHceSii/KtRk+4i3RE7E1CUXA2jHcA==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/prompts@7.10.1': - resolution: {integrity: sha512-Dx/y9bCQcXLI5ooQ5KyvA4FTgeo2jYj/7plWfV5Ak5wDPKQZgudKez2ixyfz7tKXzcJciTxqLeK7R9HItwiByg==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/rawlist@4.1.11': - resolution: {integrity: sha512-+LLQB8XGr3I5LZN/GuAHo+GpDJegQwuPARLChlMICNdwW7OwV2izlCSCxN6cqpL0sMXmbKbFcItJgdQq5EBXTw==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/search@3.2.2': - resolution: {integrity: sha512-p2bvRfENXCZdWF/U2BXvnSI9h+tuA8iNqtUKb9UWbmLYCRQxd8WkvwWvYn+3NgYaNwdUkHytJMGG4MMLucI1kA==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/select@4.4.2': - resolution: {integrity: sha512-l4xMuJo55MAe+N7Qr4rX90vypFwCajSakx59qe/tMaC1aEHWLyw68wF4o0A4SLAY4E0nd+Vt+EyskeDIqu1M6w==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - - '@inquirer/type@3.0.10': - resolution: {integrity: sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==} - engines: {node: '>=18'} - peerDependencies: - '@types/node': '>=18' - peerDependenciesMeta: - '@types/node': - optional: true - '@jridgewell/resolve-uri@3.1.2': resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} @@ -536,92 +399,6 @@ packages: resolution: {integrity: sha512-WrOw/bcXm0f9qHkumlT1QlArXSTWqaY9sunsDpOk+yCCorCKMxvWT/a3xko4EYHVdeZoh00yI2TydXn6eyICDA==} engines: {node: '>= 10'} - '@node-rs/crc32-android-arm-eabi@1.10.8': - resolution: {integrity: sha512-Ed2P9uQAOlOSveuPKSlmCctcZ73+9VIBTD84F8MjfKU26q33Y0hYlcl9vlzfc9UQX7LLMGEZhOuU1xxYtx49tg==} - engines: {node: '>= 10'} - cpu: [arm] - os: [android] - - '@node-rs/crc32-android-arm64@1.10.8': - resolution: {integrity: sha512-gvEOdU8tkSwK2McdlMeXDoyqtvJFPYShNopJtGaGMNoltN5EzFOsM/7XKF3rk9JLQ9GnZHQrCxur0Cksonow2A==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [android] - - '@node-rs/crc32-darwin-arm64@1.10.8': - resolution: {integrity: sha512-ylDspj/s3i+FCdTGoLZtOBsbR2PvAsI5taJDE5Pl7kDgeKX7IywdAYQtkh2orvTs0RqCjcnIBxrCDI/O/r+z1g==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - - '@node-rs/crc32-darwin-x64@1.10.8': - resolution: {integrity: sha512-DVTORLWomcx7F0CxQxlfBszAcMh8IkNGx/hgYHQ4iDnuf/uVjhs7l1hoVBghPymdFxP129+I/+b1WoQBbTJzaQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - - '@node-rs/crc32-freebsd-x64@1.10.8': - resolution: {integrity: sha512-ZzuW7RS9VFy7zD64YUFI2dK6tJrlAFfe1NBuNx/ouKZ6SK+NHW5F8hxZNrZCkv2XB7QyZk9wZ53oJ20PKylQTw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [freebsd] - - '@node-rs/crc32-linux-arm-gnueabihf@1.10.8': - resolution: {integrity: sha512-5/2kW7V4KMV3o37ApvcnF4Pk11luzLnd38kQZowVCw5D/xGlCByEQOODfJHX9pv0C+4hp+8Dosul06RODjPEUw==} - engines: {node: '>= 10'} - cpu: [arm] - os: [linux] - - '@node-rs/crc32-linux-arm64-gnu@1.10.8': - resolution: {integrity: sha512-Vr1P3+WF+RsUVI8CNLiunl1vuzdpgTR1sf9PxgQFr3o//hh2KdqJeU4zZsFVTn+GbGZtqvRoba0wi8nKMzRLeg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@node-rs/crc32-linux-arm64-musl@1.10.8': - resolution: {integrity: sha512-eS8YXANJLBqdOzf5jCNVEXiDI4wjXVqQybaJextJJINvHhnhhOXPar8402GMagewOxGxYsy4C69G8rBIzqL4cg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@node-rs/crc32-linux-x64-gnu@1.10.8': - resolution: {integrity: sha512-DFd0eV47MAykz4PQDcBSlEvY3CtXqPt2gkBpvPngCpOUoIJgEk9tKtPjEgUwLatMkvsy4fEvAg7gckGickOyEw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@node-rs/crc32-linux-x64-musl@1.10.8': - resolution: {integrity: sha512-U7fP8FjDQuOb61YoT8EoWDIJ9x40ZrCzM6OcAH1wqYiu9Z94U14S+i8KwTC7YorotGtICdYZ/APn1eI8vNne5w==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - libc: [musl] - - '@node-rs/crc32-win32-arm64-msvc@1.10.8': - resolution: {integrity: sha512-VJezyT9OWnMPnArDR5ok0ARLemiL83LLNYh4MC++oHoLegqzyBllqNlO8fVp2PmczGkn+rfKkZbtG4w3MQ6BbQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - - '@node-rs/crc32-win32-ia32-msvc@1.10.8': - resolution: {integrity: sha512-01HooQK7WiG07/vvp0XzRnqSC5cvXvQ1MsQwlH9wwMWZ9qqHRO1j08cSeSt7DM4eALNisfX83bjqqrHzSKI9Iw==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - - '@node-rs/crc32-win32-x64-msvc@1.10.8': - resolution: {integrity: sha512-4O6G7yme7s98LUGwiqW7q2QqYmWD2IRQvV+q7+S4vjkUWiXUMbP8QEPYP9cF2WEQSdXCkyDEqDW10zeUdniPRA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - - '@node-rs/crc32@1.10.8': - resolution: {integrity: sha512-gOYKFwkojSdWrSmreCcGocRcAXSpRkNZYxv6nscmtddSWBKVGypdMbfLxu5qgmymdaCNApajuwZblYEfs7HswA==} - engines: {node: '>= 10'} - '@oxc-project/types@0.156.0': resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} @@ -961,18 +738,10 @@ packages: resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==} engines: {node: '>= 14'} - ansi-regex@5.0.1: - resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} - engines: {node: '>=8'} - ansi-regex@6.5.0: resolution: {integrity: sha512-zhvbbbdt1kbw7EJ9OQoxmQcuaNR9P5kTj7e/YdmOSU10aHWbycofJxA6jKfoEy3vlLdctOF9ZHaxLtmSm998wQ==} engines: {node: '>=12'} - ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} - assertion-error@2.0.1: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} @@ -1021,12 +790,6 @@ packages: resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - chardet@2.2.0: - resolution: {integrity: sha512-rddelWYNPRrXq6PtNEN2S3f6t9ILzvqaN5pVgi4kqt9jHQaXIial9PznB5iSPVlQSLNaaH22ItWz3EJtQ10+OA==} - - ci-info@2.0.0: - resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==} - cli-cursor@5.0.0: resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} engines: {node: '>=18'} @@ -1035,37 +798,17 @@ packages: resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==} engines: {node: '>=6'} - cli-width@4.1.0: - resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} - engines: {node: '>= 12'} - cockatiel@3.2.1: resolution: {integrity: sha512-gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q==} engines: {node: '>=16'} - color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} - - color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - commander@12.1.0: resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} engines: {node: '>=18'} - commander@14.0.3: - resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==} - engines: {node: '>=20'} - core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - cross-keychain@1.1.0: - resolution: {integrity: sha512-244DWNdGepLKD5vEn3reZqwzZFiE/LD4U+XV9IaXQbtIXKvQkf0VkRaOj/9vPYauPdR12PSGB3U0cE7jJi3WTQ==} - engines: {node: '>=18'} - hasBin: true - debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} engines: {node: '>=6.0'} @@ -1083,18 +826,10 @@ packages: resolution: {integrity: sha512-m1pAzaJgZ/gssEqlOhJkPJp8Xly7QyW6xcrkUa2KKcDeDSEMP7X8xipU3snUcfisTQx0w1AGae+9UtJSfVnXGw==} engines: {node: '>=18'} - define-data-property@1.1.4: - resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} - engines: {node: '>= 0.4'} - define-lazy-prop@3.0.0: resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} engines: {node: '>=12'} - define-properties@1.2.1: - resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} - engines: {node: '>= 0.4'} - detect-libc@2.1.2: resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} engines: {node: '>=8'} @@ -1113,9 +848,6 @@ packages: emoji-regex@10.6.0: resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==} - emoji-regex@8.0.0: - resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - entities@9.0.0: resolution: {integrity: sha512-oJFNDJg3kTPwAD1cNn2+WmUq4wFoo09npc3Ydf1D7ED4smRiWrsKnaLxykrTWgyGEcusc87P5dxlAleol9kpkg==} engines: {node: '>=20.19.0'} @@ -1176,10 +908,6 @@ packages: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} - globalthis@1.0.4: - resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==} - engines: {node: '>= 0.4'} - gopd@1.2.0: resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} engines: {node: '>= 0.4'} @@ -1187,9 +915,6 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - has-symbols@1.1.0: resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} engines: {node: '>= 0.4'} @@ -1210,29 +935,17 @@ packages: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} - iconv-lite@0.7.3: - resolution: {integrity: sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==} - engines: {node: '>=0.10.0'} - immediate@3.0.6: resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - is-ci@2.0.0: - resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==} - hasBin: true - is-docker@3.0.0: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true - is-fullwidth-code-point@3.0.0: - resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} - engines: {node: '>=8'} - is-in-ssh@1.0.0: resolution: {integrity: sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==} engines: {node: '>=20'} @@ -1246,10 +959,6 @@ packages: resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==} engines: {node: '>=12'} - is-it-type@5.1.3: - resolution: {integrity: sha512-AX2uU0HW+TxagTgQXOJY7+2fbFHemC7YFBwN1XqD8qQMKdtfbOC8OC3fUb4s5NU59a3662Dzwto8tWDdZYRXxg==} - engines: {node: '>=12'} - is-unicode-supported@1.3.0: resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==} engines: {node: '>=12'} @@ -1403,10 +1112,6 @@ packages: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} - meow@14.1.0: - resolution: {integrity: sha512-EDYo6VlmtnumlcBCbh1gLJ//9jvM/ndXHfVXIFrZVr6fGcwTUyCTFNTLCKuY3ffbK8L/+3Mzqnd58RojiZqHVw==} - engines: {node: '>=20'} - mime@1.6.0: resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} engines: {node: '>=4'} @@ -1426,10 +1131,6 @@ packages: mute-stream@0.0.8: resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} - mute-stream@2.0.0: - resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==} - engines: {node: ^18.17.0 || >=20.5.0} - nanoid@3.3.20: resolution: {integrity: sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -1439,10 +1140,6 @@ packages: resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} engines: {node: '>= 0.4'} - object-keys@1.1.1: - resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} - engines: {node: '>= 0.4'} - obug@3.0.0: resolution: {integrity: sha512-5vvB5+W7ePv+p3uqxi+RcW1XAzLW0/hxt3/4X4Lc4qHudzOhmBiBwOY6DRob4WnanAEGvNcLjF+KNOufrUoEQw==} engines: {node: '>=12.20.0'} @@ -1459,11 +1156,6 @@ packages: resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==} engines: {node: '>=18'} - ovsx@1.3.0: - resolution: {integrity: sha512-U5B1YCo+6knEipsEF9O+iO+uwK+vTm8qNQyvc5zzE/2P6Zfzjhw4Xj4UJ7WZ1aU/kVGI70FuUWxv/GVXK5JmXw==} - engines: {node: '>=22.0.0'} - hasBin: true - pako@1.0.11: resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} @@ -1528,9 +1220,6 @@ packages: safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - safer-buffer@2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - sax@1.6.1: resolution: {integrity: sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==} engines: {node: '>=11.0.0'} @@ -1566,10 +1255,6 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - simple-invariant@2.0.1: - resolution: {integrity: sha512-1sbhsxqI+I2tqlmjbz99GXNmZtr6tKIyEgGGnJw/MKGblalqk/XoOYYFJlBzTKZCxx8kLaD3FD5s9BEEjx5Pyg==} - engines: {node: '>=10'} - source-map-js@1.2.2: resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} engines: {node: '>=0.10.0'} @@ -1581,10 +1266,6 @@ packages: resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==} engines: {node: '>=18'} - string-width@4.2.3: - resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} - engines: {node: '>=8'} - string-width@7.2.0: resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} engines: {node: '>=18'} @@ -1592,10 +1273,6 @@ packages: string_decoder@1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} - strip-ansi@6.0.1: - resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} - engines: {node: '>=8'} - strip-ansi@7.2.0: resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==} engines: {node: '>=12'} @@ -1739,10 +1416,6 @@ packages: engines: {node: '>=20.11'} hasBin: true - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - wsl-utils@1.0.1: resolution: {integrity: sha512-c16PKLIRxBYpR3jSWsdS7SFp0COm5SOQdiFjY818dYFHJbMGuLBszpF07LBWmOS1uzrHa9VGdynsEgoeKy0oOQ==} engines: {node: '>=20'} @@ -1758,10 +1431,6 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yauzl-promise@4.0.0: - resolution: {integrity: sha512-/HCXpyHXJQQHvFq9noqrjfa/WpQC2XYs3vI7tBiAi4QiIU1knvYhZGaO1QPjwIVMdqflxbmwgMXtYeaRiAE0CA==} - engines: {node: '>=16'} - yauzl@3.4.0: resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} engines: {node: '>=12'} @@ -1769,10 +1438,6 @@ packages: yazl@2.5.1: resolution: {integrity: sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==} - yoctocolors-cjs@2.1.3: - resolution: {integrity: sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==} - engines: {node: '>=18'} - snapshots: '@azure/abort-controller@2.2.0': @@ -1981,131 +1646,6 @@ snapshots: '@esbuild/win32-x64@0.28.2': optional: true - '@inquirer/ansi@1.0.2': {} - - '@inquirer/checkbox@4.3.2(@types/node@22.20.5)': - dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.20.5) - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/confirm@5.1.21(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/core@10.3.2(@types/node@22.20.5)': - dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.20.5) - cli-width: 4.1.0 - mute-stream: 2.0.0 - signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/editor@4.2.23(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/external-editor': 1.0.3(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/expand@4.0.23(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/external-editor@1.0.3(@types/node@22.20.5)': - dependencies: - chardet: 2.2.0 - iconv-lite: 0.7.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/figures@1.0.15': {} - - '@inquirer/input@4.3.1(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/number@3.0.23(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/password@4.0.23(@types/node@22.20.5)': - dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/prompts@7.10.1(@types/node@22.20.5)': - dependencies: - '@inquirer/checkbox': 4.3.2(@types/node@22.20.5) - '@inquirer/confirm': 5.1.21(@types/node@22.20.5) - '@inquirer/editor': 4.2.23(@types/node@22.20.5) - '@inquirer/expand': 4.0.23(@types/node@22.20.5) - '@inquirer/input': 4.3.1(@types/node@22.20.5) - '@inquirer/number': 3.0.23(@types/node@22.20.5) - '@inquirer/password': 4.0.23(@types/node@22.20.5) - '@inquirer/rawlist': 4.1.11(@types/node@22.20.5) - '@inquirer/search': 3.2.2(@types/node@22.20.5) - '@inquirer/select': 4.4.2(@types/node@22.20.5) - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/rawlist@4.1.11(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/type': 3.0.10(@types/node@22.20.5) - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/search@3.2.2(@types/node@22.20.5)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.20.5) - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/select@4.4.2(@types/node@22.20.5)': - dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/core': 10.3.2(@types/node@22.20.5) - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.20.5) - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.5 - - '@inquirer/type@3.0.10(@types/node@22.20.5)': - optionalDependencies: - '@types/node': 22.20.5 - '@jridgewell/resolve-uri@3.1.2': {} '@jridgewell/sourcemap-codec@1.6.0': {} @@ -2166,61 +1706,6 @@ snapshots: '@napi-rs/keyring-win32-ia32-msvc': 1.3.0 '@napi-rs/keyring-win32-x64-msvc': 1.3.0 - '@node-rs/crc32-android-arm-eabi@1.10.8': - optional: true - - '@node-rs/crc32-android-arm64@1.10.8': - optional: true - - '@node-rs/crc32-darwin-arm64@1.10.8': - optional: true - - '@node-rs/crc32-darwin-x64@1.10.8': - optional: true - - '@node-rs/crc32-freebsd-x64@1.10.8': - optional: true - - '@node-rs/crc32-linux-arm-gnueabihf@1.10.8': - optional: true - - '@node-rs/crc32-linux-arm64-gnu@1.10.8': - optional: true - - '@node-rs/crc32-linux-arm64-musl@1.10.8': - optional: true - - '@node-rs/crc32-linux-x64-gnu@1.10.8': - optional: true - - '@node-rs/crc32-linux-x64-musl@1.10.8': - optional: true - - '@node-rs/crc32-win32-arm64-msvc@1.10.8': - optional: true - - '@node-rs/crc32-win32-ia32-msvc@1.10.8': - optional: true - - '@node-rs/crc32-win32-x64-msvc@1.10.8': - optional: true - - '@node-rs/crc32@1.10.8': - optionalDependencies: - '@node-rs/crc32-android-arm-eabi': 1.10.8 - '@node-rs/crc32-android-arm64': 1.10.8 - '@node-rs/crc32-darwin-arm64': 1.10.8 - '@node-rs/crc32-darwin-x64': 1.10.8 - '@node-rs/crc32-freebsd-x64': 1.10.8 - '@node-rs/crc32-linux-arm-gnueabihf': 1.10.8 - '@node-rs/crc32-linux-arm64-gnu': 1.10.8 - '@node-rs/crc32-linux-arm64-musl': 1.10.8 - '@node-rs/crc32-linux-x64-gnu': 1.10.8 - '@node-rs/crc32-linux-x64-musl': 1.10.8 - '@node-rs/crc32-win32-arm64-msvc': 1.10.8 - '@node-rs/crc32-win32-ia32-msvc': 1.10.8 - '@node-rs/crc32-win32-x64-msvc': 1.10.8 - '@oxc-project/types@0.156.0': {} '@rolldown/binding-android-arm-eabi@1.2.16': @@ -2470,14 +1955,8 @@ snapshots: agent-base@7.1.4: {} - ansi-regex@5.0.1: {} - ansi-regex@6.5.0: {} - ansi-styles@4.3.0: - dependencies: - color-convert: 2.0.1 - assertion-error@2.0.1: {} azure-devops-node-api@12.5.0: @@ -2519,41 +1998,18 @@ snapshots: chalk@5.6.2: {} - chardet@2.2.0: {} - - ci-info@2.0.0: {} - cli-cursor@5.0.0: dependencies: restore-cursor: 5.1.0 cli-spinners@2.9.2: {} - cli-width@4.1.0: {} - cockatiel@3.2.1: {} - color-convert@2.0.1: - dependencies: - color-name: 1.1.4 - - color-name@1.1.4: {} - commander@12.1.0: {} - commander@14.0.3: {} - core-util-is@1.0.3: {} - cross-keychain@1.1.0(@types/node@22.20.5): - dependencies: - '@inquirer/prompts': 7.10.1(@types/node@22.20.5) - meow: 14.1.0 - optionalDependencies: - '@napi-rs/keyring': 1.3.0 - transitivePeerDependencies: - - '@types/node' - debug@4.4.3: dependencies: ms: 2.1.3 @@ -2565,20 +2021,8 @@ snapshots: bundle-name: 4.1.1 default-browser-id: 5.0.1 - define-data-property@1.1.4: - dependencies: - es-define-property: 1.0.1 - es-errors: 1.3.0 - gopd: 1.2.0 - define-lazy-prop@3.0.0: {} - define-properties@1.2.1: - dependencies: - define-data-property: 1.1.4 - has-property-descriptors: 1.0.2 - object-keys: 1.1.1 - detect-libc@2.1.2: {} dunder-proto@1.0.1: @@ -2597,8 +2041,6 @@ snapshots: emoji-regex@10.6.0: {} - emoji-regex@8.0.0: {} - entities@9.0.0: {} es-define-property@1.0.1: {} @@ -2675,19 +2117,10 @@ snapshots: dunder-proto: 1.0.1 es-object-atoms: 1.1.2 - globalthis@1.0.4: - dependencies: - define-properties: 1.2.1 - gopd: 1.2.0 - gopd@1.2.0: {} graceful-fs@4.2.11: {} - has-property-descriptors@1.0.2: - dependencies: - es-define-property: 1.0.1 - has-symbols@1.1.0: {} hasown@2.0.4: @@ -2712,22 +2145,12 @@ snapshots: transitivePeerDependencies: - supports-color - iconv-lite@0.7.3: - dependencies: - safer-buffer: 2.1.2 - immediate@3.0.6: {} inherits@2.0.4: {} - is-ci@2.0.0: - dependencies: - ci-info: 2.0.0 - is-docker@3.0.0: {} - is-fullwidth-code-point@3.0.0: {} - is-in-ssh@1.0.0: {} is-inside-container@1.0.0: @@ -2736,10 +2159,6 @@ snapshots: is-interactive@2.0.0: {} - is-it-type@5.1.3: - dependencies: - globalthis: 1.0.4 - is-unicode-supported@1.3.0: {} is-unicode-supported@2.1.0: {} @@ -2873,8 +2292,6 @@ snapshots: math-intrinsics@1.1.0: {} - meow@14.1.0: {} - mime@1.6.0: {} mimic-function@5.0.1: {} @@ -2887,14 +2304,10 @@ snapshots: mute-stream@0.0.8: {} - mute-stream@2.0.0: {} - nanoid@3.3.20: {} object-inspect@1.13.4: {} - object-keys@1.1.1: {} - obug@3.0.0: {} onetime@7.0.0: @@ -2922,19 +2335,6 @@ snapshots: string-width: 7.2.0 strip-ansi: 7.2.0 - ovsx@1.3.0(@types/node@22.20.5): - dependencies: - '@inquirer/prompts': 7.10.1(@types/node@22.20.5) - '@vscode/vsce': 4.1.0 - commander: 14.0.3 - cross-keychain: 1.1.0(@types/node@22.20.5) - is-ci: 2.0.0 - semver: 7.8.6 - yauzl-promise: 4.0.0 - transitivePeerDependencies: - - '@types/node' - - supports-color - pako@1.0.11: {} parse5@8.1.0: @@ -3016,8 +2416,6 @@ snapshots: safe-buffer@5.2.1: {} - safer-buffer@2.1.2: {} - sax@1.6.1: {} semver@7.8.6: {} @@ -3056,20 +2454,12 @@ snapshots: signal-exit@4.1.0: {} - simple-invariant@2.0.1: {} - source-map-js@1.2.2: {} std-env@4.3.0: {} stdin-discarder@0.2.2: {} - string-width@4.2.3: - dependencies: - emoji-regex: 8.0.0 - is-fullwidth-code-point: 3.0.0 - strip-ansi: 6.0.1 - string-width@7.2.0: dependencies: emoji-regex: 10.6.0 @@ -3080,10 +2470,6 @@ snapshots: dependencies: safe-buffer: 5.1.2 - strip-ansi@6.0.1: - dependencies: - ansi-regex: 5.0.1 - strip-ansi@7.2.0: dependencies: ansi-regex: 6.5.0 @@ -3183,12 +2569,6 @@ snapshots: why-is-node-running@3.2.1: {} - wrap-ansi@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - wsl-utils@1.0.1: dependencies: is-wsl: 3.1.1 @@ -3203,12 +2583,6 @@ snapshots: yallist@4.0.0: {} - yauzl-promise@4.0.0: - dependencies: - '@node-rs/crc32': 1.10.8 - is-it-type: 5.1.3 - simple-invariant: 2.0.1 - yauzl@3.4.0: dependencies: pend: 1.2.0 @@ -3216,5 +2590,3 @@ snapshots: yazl@2.5.1: dependencies: buffer-crc32: 0.2.13 - - yoctocolors-cjs@2.1.3: {} diff --git a/src/remote/extension.ts b/src/remote/extension.ts index fd533c7..b84ebca 100644 --- a/src/remote/extension.ts +++ b/src/remote/extension.ts @@ -1,32 +1,17 @@ import * as vscode from "vscode" // Without the resolver (resolver.ts), Spinbox opens a workspace through a -// vscode-remote://ssh-remote+ URI, which only a Remote-SSH extension answers. Microsoft's is on the Visual Studio Marketplace alone; every other editor -// (VSCodium, Cursor, ...) installs from Open VSX, where open-remote-ssh is the one there is. +// vscode-remote://ssh-remote+ URI, which Microsoft's Remote-SSH answers. export const MICROSOFT_REMOTE_SSH = "ms-vscode-remote.remote-ssh" -export const OPEN_REMOTE_SSH = "jeanp413.open-remote-ssh" -export const REMOTE_EXTENSIONS = [MICROSOFT_REMOTE_SSH, OPEN_REMOTE_SSH] as const // How long to wait for the extension host to load the extension after the install returns. export const INSTALL_WAIT_MS = 60_000 -export function installedRemoteExtension(): string | undefined { - return REMOTE_EXTENSIONS.find((id) => vscode.extensions.getExtension(id) !== undefined) -} - -// The Visual Studio Marketplace serves only Microsoft's builds, whose appName starts with -// "Visual Studio Code" (Insiders included); the extension API does not name the gallery. -export function remoteExtensionForEditor(): string { - return vscode.env.appName.startsWith("Visual Studio Code") - ? MICROSOFT_REMOTE_SSH - : OPEN_REMOTE_SSH -} - -// ensureRemoteExtension answers whether a Remote-SSH extension is installed, offering to install -// the one this editor's marketplace carries when none is. false means the open cannot go on. +// ensureRemoteExtension answers whether Remote-SSH is installed, offering to install it when it is +// not. false means the open cannot go on. export async function ensureRemoteExtension(): Promise { - if (installedRemoteExtension() !== undefined) return true - const id = remoteExtensionForEditor() + const id = MICROSOFT_REMOTE_SSH + if (vscode.extensions.getExtension(id) !== undefined) return true const install = `Install ${id}` const choice = await vscode.window.showWarningMessage( `Spinbox opens workspaces over Remote-SSH, which needs the ${id} extension.`, diff --git a/test/unit/remote.test.ts b/test/unit/remote.test.ts index fcaf845..bb20d6e 100644 --- a/test/unit/remote.test.ts +++ b/test/unit/remote.test.ts @@ -7,7 +7,6 @@ const vscode = vi.hoisted(() => { return { installed, changeListeners, - env: { appName: "Visual Studio Code" }, extensions: { getExtension: (id: string) => (installed.has(id) ? { id } : undefined), onDidChange: (fn: () => void) => { @@ -32,7 +31,6 @@ import { ensureRemoteExtension, INSTALL_WAIT_MS, MICROSOFT_REMOTE_SSH, - OPEN_REMOTE_SSH, } from "../../src/remote/extension" // installLater has the install command return before the extension host loads the extension, @@ -49,7 +47,6 @@ function installLater(): void { beforeEach(() => { vscode.installed.clear() vscode.changeListeners.clear() - vscode.env.appName = "Visual Studio Code" vscode.window.showWarningMessage.mockReset() vscode.window.showErrorMessage.mockReset() vscode.commands.executeCommand.mockReset() @@ -57,24 +54,17 @@ beforeEach(() => { }) describe("ensureRemoteExtension", () => { - it.each([MICROSOFT_REMOTE_SSH, OPEN_REMOTE_SSH])( - "goes on without asking when %s is installed", - async (id) => { - vscode.installed.add(id) - vscode.env.appName = id === OPEN_REMOTE_SSH ? "VSCodium" : "Visual Studio Code" - expect(await ensureRemoteExtension()).toBe(true) - expect(vscode.window.showWarningMessage).not.toHaveBeenCalled() - expect(vscode.commands.executeCommand).not.toHaveBeenCalled() - }, - ) + it("goes on without asking when Remote-SSH is installed", async () => { + vscode.installed.add(MICROSOFT_REMOTE_SSH) + expect(await ensureRemoteExtension()).toBe(true) + expect(vscode.window.showWarningMessage).not.toHaveBeenCalled() + expect(vscode.commands.executeCommand).not.toHaveBeenCalled() + }) - it.each([ - ["Visual Studio Code", MICROSOFT_REMOTE_SSH], - ["Visual Studio Code - Insiders", MICROSOFT_REMOTE_SSH], - ["VSCodium", OPEN_REMOTE_SSH], - ["Cursor", OPEN_REMOTE_SSH], - ])("with none installed, %s offers %s and waits until it loads", async (appName, id) => { - vscode.env.appName = appName + // Another Remote-SSH extension answers nothing Spinbox relies on. + it("offers Remote-SSH, and waits until it loads, when another extension is all there is", async () => { + const id = MICROSOFT_REMOTE_SSH + vscode.installed.add("jeanp413.open-remote-ssh") vscode.window.showWarningMessage.mockImplementation(async (_m, ...items) => items[0]) installLater() expect(await ensureRemoteExtension()).toBe(true) diff --git a/test/unit/resolver.test.ts b/test/unit/resolver.test.ts index 2304623..2b642af 100644 --- a/test/unit/resolver.test.ts +++ b/test/unit/resolver.test.ts @@ -6,7 +6,6 @@ const vscode = vi.hoisted(() => { const installed = new Map Promise }>() return { installed, - env: { appName: "Visual Studio Code" }, extensions: { getExtension: (id: string) => installed.get(id), onDidChange: () => ({ dispose: () => {} }),