Merge remote-tracking branch 'origin/main' into pr/textmate

.changeset/olive-melons-add.md

@@ -0,0 +1,5 @@
+---
+"vscode-apollo": patch
+---
+
+remove unused direct dependency on `lodash.merge`

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 executors:
   node:
     docker:
-      - image: cimg/node:22.9.0
+      - image: cimg/node:22.12.0
     working_directory: ~/vscode-graphql
 
 commands:

.github/workflows/E2E.yml

@@ -7,29 +7,66 @@ on:
 jobs:
   e2e:
     name: Run E2E tests
-    runs-on: ubuntu-latest
+    runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
         version: ["1.90.0", "stable", "insiders"]
+        os: [ubuntu-latest]
+        include:
+          - version: "stable"
+            os: "windows-latest"
     steps:
       - run: sudo apt update && sudo apt install -y libasound2t64 libgbm1 libgtk-3-0 libnss3 xvfb expect
+        if: runner.os == 'Linux'
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           cache: "npm"
       - run: npm install
-      - run: npm run build:production
       - run: echo 'APOLLO_KEY="service:bob-123:489fhseo4"' > ./sampleWorkspace/spotifyGraph/.env
-      - run: |
+        shell: bash
+      - name: Install & Configure Rover (Linux)
+        run: |
           expect <<EOF
           spawn ./node_modules/.bin/rover config auth --profile VSCode-E2E
           expect "Copy the key and paste it into the prompt below."
           send -- "test\n"
           expect eof
           EOF
-      - run: xvfb-run -a npm run test:extension
+        if: runner.os == 'Linux'
+      - name: Install Rover (Windows)
+        run: ./node_modules/.bin/rover.cmd --version
+        if: runner.os == 'Windows'
+      - name: Configure Rover (Windows)
+        run: |
+          [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms")
+          Start-Process -FilePath ./node_modules/.bin/rover.cmd -ArgumentList "config","auth","--profile","VSCode-E2E"
+
+          Start-Sleep -m 1000
+
+          [System.Windows.Forms.SendKeys]::SendWait("test")
+          [System.Windows.Forms.SendKeys]::SendWait("{ENTER}")
+        if: runner.os == 'Windows'
+        shell: powershell
+      - name: Adjust configuration (Windows)
+        run: |
+          sed -i -e 's/\(bin:.*\)/\1.exe/' sampleWorkspace/rover/apollo.config.yaml
+          cat sampleWorkspace/rover/apollo.config.yaml
+          # for some reason, windows seems to ignore the jest.e2e.config.js file
+          echo "module.exports = require('./jest.e2e.config')" > jest.config.ts
+        shell: bash
+        if: runner.os == 'Windows'
+      - run: npm run build:production
+      - name: "Run Extension E2E tests (Linux)"
+        run: xvfb-run -a npm run test:extension
+        env:
+          VSCODE_VERSION: "${{ matrix.version }}"
+        if: runner.os == 'Linux'
+      - name: "Run Extension E2E tests (Windows)"
+        run: npm run test:extension
         env:
           VSCODE_VERSION: "${{ matrix.version }}"
+        if: runner.os == 'Windows'
   test:
     name: Run other tests
     runs-on: ubuntu-latest

.gitignore

@@ -18,3 +18,5 @@ vscode-apollo-*.vsix
 # files generated from tests
 __tmp__*
 .vscode-test
+.yalc
+yalc.lock

.nvmrc

@@ -1 +1 @@
-v20
+22

.prettierignore

@@ -0,0 +1,3 @@
+src/language-server/graphqlTypes.ts
+src/language-server/__tests__/fixtures/documents/commentWithTemplate.ts
+README.md

.vscodeignore

@@ -25,3 +25,6 @@ sampleWorkspace
 renovate.json
 images/**/*.gif
 images/marketplace
+.yalc
+yalc.lock
+start-ac.mjs

CHANGELOG.md

@@ -1,5 +1,39 @@
 # CHANGELOG
 
+## 2.5.2
+
+### Patch Changes
+
+- [#248](https://github.com/apollographql/vscode-graphql/pull/248) [`93ba6ebb`](https://github.com/apollographql/vscode-graphql/commit/93ba6ebb272d9146a1ead99f28db41cb00e69394) Thanks [@phryneas](https://github.com/phryneas)! - DevTools: Fix outdated import name in ClientNotFoundModal
+
+## 2.5.1
+
+### Patch Changes
+
+- [#243](https://github.com/apollographql/vscode-graphql/pull/243) [`694807c4`](https://github.com/apollographql/vscode-graphql/commit/694807c462f5595c1f4e37ab10ca1fa5d692a4ee) Thanks [@phryneas](https://github.com/phryneas)! - [Windows, LSP]: Prevent a console window from opening for the Rover LSP process
+
+## 2.5.0
+
+### Minor Changes
+
+- [#188](https://github.com/apollographql/vscode-graphql/pull/188) [`595784f0`](https://github.com/apollographql/vscode-graphql/commit/595784f057de18d987768fa1aaa8c37a5fa802c7) Thanks [@phryneas](https://github.com/phryneas)! - Adds experimental integration of the Apollo Client DevTools
+
+## 2.4.0
+
+### Minor Changes
+
+- [#236](https://github.com/apollographql/vscode-graphql/pull/236) [`9a4403db`](https://github.com/apollographql/vscode-graphql/commit/9a4403db7b8f9cb03638d83a7e3c29dd3c3077b7) Thanks [@pubmodmatt](https://github.com/pubmodmatt)! - Add support for GraphQL in Notebook cells
+
+### Patch Changes
+
+- [#240](https://github.com/apollographql/vscode-graphql/pull/240) [`3dfd9ac0`](https://github.com/apollographql/vscode-graphql/commit/3dfd9ac08a20ff92cafb398f1a8c71e5f7d03519) Thanks [@phryneas](https://github.com/phryneas)! - Fix a bug handling windows path separators in `FileSet` instances.
+
+## 2.3.6
+
+### Patch Changes
+
+- [#216](https://github.com/apollographql/vscode-graphql/pull/216) [`1add31e0`](https://github.com/apollographql/vscode-graphql/commit/1add31e0e9bc2da92ea7c3a1c65206cc5d95bb68) Thanks [@phryneas](https://github.com/phryneas)! - Add JSON schema for `supergraph.yaml`.
+
 ## 2.3.5
 
 ### Patch Changes

README.md

@@ -5,7 +5,7 @@
 </p>
 <h1>Apollo GraphQL for VS Code</h1>
 
-[![Visual Studio Marketplace Version (including pre-releases)](https://img.shields.io/visual-studio-marketplace/v/apollographql.vscode-apollo)](https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo) [![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/apollographql.vscode-apollo)](https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo) [![Build Status](https://circleci.com/gh/apollographql/vscode-graphql.svg?style=svg)](https://circleci.com/gh/apollographql/vscode-graphql) [![Join the community](https://img.shields.io/discourse/status?label=Join%20the%20community&server=https%3A%2F%2Fcommunity.apollographql.com)](https://community.apollographql.com) [![Join our Discord server](https://img.shields.io/discord/1022972389463687228.svg?color=7389D8&labelColor=6A7EC2&logo=discord&logoColor=ffffff&style=flat-square)](https://discord.gg/graphos)
+[![Visual Studio Marketplace Version (including pre-releases)](https://img.shields.io/visual-studio-marketplace/v/apollographql.vscode-apollo)](https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo) [![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/apollographql.vscode-apollo)](https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo) [![Build Status](https://circleci.com/gh/apollographql/vscode-graphql.svg?style=svg)](https://circleci.com/gh/apollographql/vscode-graphql) [![Join the community](https://img.shields.io/discourse/status?label=Join%20the%20community&server=https%3A%2F%2Fcommunity.apollographql.com)](https://community.apollographql.com)
 
 </div>