diff --git a/.github/workflows/build.yaml b/.github/workflows/ci.yaml similarity index 68% rename from .github/workflows/build.yaml rename to .github/workflows/ci.yaml index 2cbe230..463aaa8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/ci.yaml @@ -2,17 +2,13 @@ name: ci on: push jobs: - build: + ci: strategy: matrix: os: - macos-latest - ubuntu-latest - windows-latest - buf-bin-setup: - # these strings are referenced in the tests - - buf-on-path - - buf-not-on-path runs-on: ${{ matrix.os }} steps: - name: checkout @@ -23,7 +19,6 @@ jobs: node-version-file: ".nvmrc" cache: npm - uses: bufbuild/buf-action@v1 - if: matrix.buf-bin-setup == 'buf-on-path' with: setup_only: true - name: install-deps @@ -38,14 +33,12 @@ jobs: run: npm run format - name: integration-tests-with-xvfb env: - BUF_INSTALLED: ${{ matrix.buf-bin-setup }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: xvfb-run -a npm run test:integration if: runner.os == 'Linux' - name: integration-tests shell: bash env: - BUF_INSTALLED: ${{ matrix.buf-bin-setup }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: npm run test:integration if: runner.os != 'Linux' @@ -53,18 +46,14 @@ jobs: run: npm run test:playwright # Limiting playwright tests to macOS for now due to issues with xvfb on Linux and # timeouts on windows - # - # NOTE: We disable playwright tests when buf is not installed on the system $PATH - # for now so we don't have the extension attempting to resolve the installation. - # We'll need to find a way to intercept the call from playwright's VS Code extension. - if: runner.os == 'macOS' && matrix.buf-bin-setup == 'buf-on-path' + if: runner.os == 'macOS' - name: check diff run: node scripts/gh-diffcheck.mjs - name: upload-playwright-test-results uses: actions/upload-artifact@v6 if: always() with: - name: test-results-${{ matrix.buf-bin-setup }} + name: test-results path: test-results/ retention-days: 5 if-no-files-found: ignore diff --git a/package-lock.json b/package-lock.json index 7784691..9e50528 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,6 @@ "@vscode/vsce": "^3.7.1", "esbuild": "^0.27.2", "mocha": "^11.7.5", - "msw": "^2.12.7", "npm-run-all": "^4.1.5", "ovsx": "^0.10.8", "typescript": "^5.9.3" @@ -886,154 +885,6 @@ "node": ">=18" } }, - "node_modules/@inquirer/confirm": { - "version": "5.1.13", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.13.tgz", - "integrity": "sha512-EkCtvp67ICIVVzjsquUiVSd+V5HRGOGQfsqA4E4vMWhYnB7InUL0pa0TIWt1i+OfP16Gkds8CdIu6yGZwOM1Yw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/core": "^10.1.14", - "@inquirer/type": "^3.0.7" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/core": { - "version": "10.1.14", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.14.tgz", - "integrity": "sha512-Ma+ZpOJPewtIYl6HZHZckeX1STvDnHTCB2GVINNUlSEn2Am6LddWwfPkIGY0IUFVjUUrr/93XlBwTK6mfLjf0A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@inquirer/figures": "^1.0.12", - "@inquirer/type": "^3.0.7", - "ansi-escapes": "^4.3.2", - "cli-width": "^4.1.0", - "mute-stream": "^2.0.0", - "signal-exit": "^4.1.0", - "wrap-ansi": "^6.2.0", - "yoctocolors-cjs": "^2.1.2" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@inquirer/core/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/@inquirer/core/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" - }, - "node_modules/@inquirer/core/node_modules/mute-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", - "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" - } - }, - "node_modules/@inquirer/core/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@inquirer/core/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@inquirer/core/node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@inquirer/figures": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.12.tgz", - "integrity": "sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - } - }, - "node_modules/@inquirer/type": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.7.tgz", - "integrity": "sha512-PfunHQcjwnju84L+ycmcMKB/pTPIngjUJvfnRhKY6FKPuYXlM4aQCb/nIdTFR6BEhMjFvngzvng/vBAJMZpLSA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@types/node": ">=18" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, "node_modules/@isaacs/balanced-match": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", @@ -1106,23 +957,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@mswjs/interceptors": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.40.0.tgz", - "integrity": "sha512-EFd6cVbHsgLa6wa4RljGj6Wk75qoHxUSyc5asLyyPSyuhIcdS2Q3Phw6ImS1q+CkALthJRShiYfKANcQMuMqsQ==", - "dev": true, - "dependencies": { - "@open-draft/deferred-promise": "^2.2.0", - "@open-draft/logger": "^0.3.0", - "@open-draft/until": "^2.0.0", - "is-node-process": "^1.2.0", - "outvariant": "^1.4.3", - "strict-event-emitter": "^0.5.1" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@napi-rs/wasm-runtime": { "version": "0.2.12", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", @@ -1442,28 +1276,6 @@ "node": ">= 8" } }, - "node_modules/@open-draft/deferred-promise": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz", - "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==", - "dev": true - }, - "node_modules/@open-draft/logger": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz", - "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==", - "dev": true, - "dependencies": { - "is-node-process": "^1.2.0", - "outvariant": "^1.4.0" - } - }, - "node_modules/@open-draft/until": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz", - "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==", - "dev": true - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1869,13 +1681,6 @@ "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==", "dev": true }, - "node_modules/@types/statuses": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.6.tgz", - "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/vscode": { "version": "1.102.0", "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.102.0.tgz", @@ -2225,35 +2030,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.21.3" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ansi-regex": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", @@ -2798,16 +2574,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cli-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", - "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">= 12" - } - }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -2943,15 +2709,6 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, - "node_modules/cookie": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", - "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", - "dev": true, - "engines": { - "node": ">=18" - } - }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -4092,15 +3849,6 @@ "dev": true, "license": "ISC" }, - "node_modules/graphql": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz", - "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" - } - }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -4201,13 +3949,6 @@ "he": "bin/he" } }, - "node_modules/headers-polyfill": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-4.0.3.tgz", - "integrity": "sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==", - "dev": true, - "license": "MIT" - }, "node_modules/hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -4678,12 +4419,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-node-process": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz", - "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==", - "dev": true - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -5655,72 +5390,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/msw": { - "version": "2.12.7", - "resolved": "https://registry.npmjs.org/msw/-/msw-2.12.7.tgz", - "integrity": "sha512-retd5i3xCZDVWMYjHEVuKTmhqY8lSsxujjVrZiGbbdoxxIBg5S7rCuYy/YQpfrTYIxpd/o0Kyb/3H+1udBMoYg==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@inquirer/confirm": "^5.0.0", - "@mswjs/interceptors": "^0.40.0", - "@open-draft/deferred-promise": "^2.2.0", - "@types/statuses": "^2.0.6", - "cookie": "^1.0.2", - "graphql": "^16.12.0", - "headers-polyfill": "^4.0.2", - "is-node-process": "^1.2.0", - "outvariant": "^1.4.3", - "path-to-regexp": "^6.3.0", - "picocolors": "^1.1.1", - "rettime": "^0.7.0", - "statuses": "^2.0.2", - "strict-event-emitter": "^0.5.1", - "tough-cookie": "^6.0.0", - "type-fest": "^5.2.0", - "until-async": "^3.0.2", - "yargs": "^17.7.2" - }, - "bin": { - "msw": "cli/index.js" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/mswjs" - }, - "peerDependencies": { - "typescript": ">= 4.8.x" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/msw/node_modules/path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/msw/node_modules/type-fest": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.2.0.tgz", - "integrity": "sha512-xxCJm+Bckc6kQBknN7i9fnP/xobQRsRQxR01CztFkp/h++yfVxUUcmMgfR2HttJx/dpWjS9ubVuyspJv24Q9DA==", - "dev": true, - "dependencies": { - "tagged-tag": "^1.0.0" - }, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", @@ -6261,12 +5930,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/outvariant": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz", - "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==", - "dev": true - }, "node_modules/ovsx": { "version": "0.10.8", "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.10.8.tgz", @@ -6936,12 +6599,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/rettime": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.7.0.tgz", - "integrity": "sha512-LPRKoHnLKd/r3dVxcwO7vhCW+orkOGj9ViueosEBK6ie89CijnfRlhaDhHq/3Hxu4CkWQtxwlBG0mzTQY6uQjw==", - "dev": true - }, "node_modules/reusify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", @@ -7436,15 +7093,6 @@ "dev": true, "license": "BSD-3-Clause" }, - "node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "dev": true, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/stdin-discarder": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.2.2.tgz", @@ -7481,12 +7129,6 @@ "npm": ">=6" } }, - "node_modules/strict-event-emitter": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz", - "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==", - "dev": true - }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -7825,18 +7467,6 @@ "node": ">=8" } }, - "node_modules/tagged-tag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz", - "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==", - "dev": true, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/tapable": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", @@ -8022,24 +7652,6 @@ "url": "https://bevry.me/fund" } }, - "node_modules/tldts": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.13.tgz", - "integrity": "sha512-z/SgnxiICGb7Gli0z7ci9BZdjy1tQORUbdmzEUA7NbIJKWhdONn78Ji8gV0PAGfHPyEd+I+W2rMzhLjWkv2Olg==", - "dev": true, - "dependencies": { - "tldts-core": "^7.0.13" - }, - "bin": { - "tldts": "bin/cli.js" - } - }, - "node_modules/tldts-core": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.13.tgz", - "integrity": "sha512-Td0LeWLgXJGsikI4mO82fRexgPCEyTcwWiXJERF/GBHX3Dm+HQq/wx4HnYowCbiwQ8d+ENLZc+ktbZw8H+0oEA==", - "dev": true - }, "node_modules/tmp": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", @@ -8061,18 +7673,6 @@ "node": ">=8.0" } }, - "node_modules/tough-cookie": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz", - "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==", - "dev": true, - "dependencies": { - "tldts": "^7.0.5" - }, - "engines": { - "node": ">=16" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -8275,15 +7875,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/until-async": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/until-async/-/until-async-3.0.2.tgz", - "integrity": "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/kettanaito" - } - }, "node_modules/url-join": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", @@ -8788,19 +8379,6 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } - }, - "node_modules/yoctocolors-cjs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz", - "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } } } } diff --git a/package.json b/package.json index d602cc0..02fe575 100644 --- a/package.json +++ b/package.json @@ -246,7 +246,6 @@ "esbuild": "^0.27.2", "mocha": "^11.7.5", "npm-run-all": "^4.1.5", - "msw": "^2.12.7", "ovsx": "^0.10.8", "typescript": "^5.9.3" }, diff --git a/playwright.config.ts b/playwright.config.ts index c0e505c..c3840ab 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -15,7 +15,6 @@ export default defineConfig({ expect: { timeout: 60_000, }, - globalSetup: "./test/playwright/global-setup", projects: [ { name: "VS Code insiders", diff --git a/test/integration/buf-binary.test.ts b/test/integration/buf-binary.test.ts deleted file mode 100644 index b60bd43..0000000 --- a/test/integration/buf-binary.test.ts +++ /dev/null @@ -1,79 +0,0 @@ -import assert from "node:assert"; -import * as cp from "node:child_process"; -import * as os from "node:os"; -import * as path from "node:path"; -import { promisify } from "node:util"; -import { effect } from "@preact/signals-core"; -import * as vscode from "vscode"; -import which from "which"; -import { bufState } from "../../src/state"; -import type { LanguageServerStatus } from "../../src/status"; - -/** - * Wraps {@link cp.exec} into an async call. - */ -const exec = promisify(cp.exec); - -suite("manage buf binary and LSP", () => { - test(`setup buf ${process.env.BUF_INSTALLED}`, async () => { - const languageServerRunning = setupLanguageServerListener( - "LANGUAGE_SERVER_RUNNING" - ); - await vscode.extensions.getExtension("bufbuild.vscode-buf")?.activate(); - await languageServerRunning; - // This value is set in the GitHub Actions testing workflow - if (process.env.BUF_INSTALLED === "buf-on-path") { - // We expected buf to be installed on the system $PATH and for that to be used. - const { stdout, stderr } = await exec("buf --version"); - assert.strictEqual(stderr, ""); - const bufFilename = os.platform() === "win32" ? "buf.exe" : "buf"; - const bufPath = await which(bufFilename, { nothrow: true }); - const installedBufBinaryPath = bufState.getBufBinaryPath(); - assert.ok(installedBufBinaryPath); - assert.strictEqual(bufPath, installedBufBinaryPath); - const bufBinaryVersion = bufState.getBufBinaryVersion(); - assert.ok(bufBinaryVersion); - assert.strictEqual(bufBinaryVersion.compare(stdout), 0); - } else { - // We expect no buf CLI in the $PATH and the installation flow to trigger. - const bufBinaryPath = bufState.getBufBinaryPath(); - assert.ok(bufBinaryPath); - const bufBinaryVersion = bufState.getBufBinaryVersion(); - assert.ok(bufBinaryVersion); - // Check that buf was installed to the extension's global storage - assert.ok( - path.matchesGlob( - bufBinaryPath, - `**/.vscode-test/user-data/User/globalStorage/bufbuild.vscode-buf/v${bufBinaryVersion}/buf*` - ), - `Expected buf binary at ${bufBinaryPath} to match global storage pattern` - ); - } - }); -}); - -/** - * A helper function that returns a Promise listening for the language server status. Once - * the language server is the status we want to listen for, the promise resolves. If the - * language server is in an uninstalled or errored state, the Promise rejects. - */ -function setupLanguageServerListener( - listenFor: LanguageServerStatus -): Promise { - const { promise, resolve, reject } = Promise.withResolvers(); - let dispose: (() => void) | undefined; - dispose = effect(() => { - const languageServerStatus = bufState.getLanguageServerStatus(); - if (languageServerStatus === listenFor) { - resolve(); - dispose?.(); - } - if (languageServerStatus === "LANGUAGE_SERVER_ERRORED") { - reject( - new Error(`language server in failed state: ${languageServerStatus}`) - ); - dispose?.(); - } - }); - return promise; -} diff --git a/test/playwright/global-setup.ts b/test/playwright/global-setup.ts deleted file mode 100644 index 36db141..0000000 --- a/test/playwright/global-setup.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { server } from "../shared/shared"; - -async function globalSetup() { - server.listen(); - return () => server.close(); -} - -export default globalSetup; diff --git a/test/shared/shared.ts b/test/shared/shared.ts deleted file mode 100644 index f0a26b7..0000000 --- a/test/shared/shared.ts +++ /dev/null @@ -1,81 +0,0 @@ -import * as fs from "node:fs"; -import * as os from "node:os"; -import * as path from "node:path"; -import { HttpResponse, http } from "msw"; -import { setupServer } from "msw/node"; - -/** - * The test asset download URL. We use a single test download URL for all assets so that - * tests are consistent across platforms. - * - * githubReleaseURL matches the value in src/github.ts. - */ -const assetDownloadURL = - "https://api.github.com/repos/bufbuild/buf/releases/assets/"; -const downloadBinPath = "test/workspaces/empty-single/node_modules/@bufbuild/"; -const githubReleaseURL = "https://api.github.com/repos/bufbuild/buf/releases/"; - -/** - * msw stub handlers for GitHub releases API. - */ -const handlers = [ - http.get(`${githubReleaseURL}latest`, () => { - return HttpResponse.json({ - name: "v1.54.0", - tag_name: "v1.54.0", - assets: [ - { - name: "buf-Darwin-arm64", - url: `${assetDownloadURL}buf-darwin-arm64`, - }, - { - name: "buf-Darwin-x86_64", - url: `${assetDownloadURL}buf-darwin-x64`, - }, - { - name: "buf-Linux-x86_64", - url: `${assetDownloadURL}buf-linux-x64`, - }, - { - name: "buf-Linux-aarch64", - url: `${assetDownloadURL}buf-linux-aarch64`, - }, - { - name: "buf-Windows-x86_64.exe", - url: `${assetDownloadURL}buf-win32-x64`, - }, - { - name: "buf-Windows-arm64.exe", - url: `${assetDownloadURL}buf-win32-arm64`, - }, - ], - }); - }), - http.get(`${assetDownloadURL}:platformKey`, ({ params }) => { - try { - const bin = fs.readFileSync( - os.platform() === "win32" - ? path.resolve( - __dirname, - `../../../${downloadBinPath}${params.platformKey}/bin/buf.exe` - ) - : `${downloadBinPath}${params.platformKey}/bin/buf` - ); - const stream = new ReadableStream({ - start(controller) { - controller.enqueue(bin); - controller.close(); - }, - }); - return new HttpResponse(stream, { - headers: { - "content-type": "application/octet-stream", - }, - }); - } catch (e) { - return HttpResponse.json({ error: e }, { status: 404 }); - } - }), -]; - -export const server = setupServer(...handlers);