vscode-apollo 2.5.5 → 2.5.6

package/.github/workflows/E2E.yml

@@ -25,7 +25,17 @@ jobs:
       - run: npm install
       - run: echo 'APOLLO_KEY="service:bob-123:489fhseo4"' > ./sampleWorkspace/spotifyGraph/.env
         shell: bash
+
+      # Print rover version per OS
       - name: Install & Configure Rover (Linux)
+        run: ./node_modules/.bin/rover --version
+        if: runner.os == 'Linux'
+      - name: Install Rover (Windows)
+        run: ./node_modules/.bin/rover.cmd --version
+        if: runner.os == 'Windows'
+
+      # auth rover per OS
+      - name: Configure Rover (Linux)
         run: |
           expect <<EOF
           spawn ./node_modules/.bin/rover config auth --profile VSCode-E2E
@@ -34,9 +44,6 @@ jobs:
           expect eof
           EOF
         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")
@@ -48,6 +55,15 @@ jobs:
           [System.Windows.Forms.SendKeys]::SendWait("{ENTER}")
         if: runner.os == 'Windows'
         shell: powershell
+
+      # Print profiles per OS
+      - name: Print Rover profiles (Linux)
+        run: ./node_modules/.bin/rover config list
+        if: runner.os == 'Linux'
+      - name: Print Rover profiles (Windows)
+        run: ./node_modules/.bin/rover.cmd config list
+        if: runner.os == 'Windows'
+
       - name: Adjust configuration (Windows)
         run: |
           sed -i -e 's/\(bin:.*\)/\1.exe/' sampleWorkspace/rover/apollo.config.yaml
@@ -56,7 +72,10 @@ jobs:
           echo "module.exports = require('./jest.e2e.config')" > jest.config.ts
         shell: bash
         if: runner.os == 'Windows'
+
       - run: npm run build:production
+
+      # Run test per OS
       - name: "Run Extension E2E tests (Linux)"
         run: xvfb-run -a npm run test:extension
         env:

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.5.6
+
+### Patch Changes
+
+- [#290](https://github.com/apollographql/vscode-graphql/pull/290) [`84d0503`](https://github.com/apollographql/vscode-graphql/commit/84d05030c253c0b8c3c26dc273527a33ac5e7129) Thanks [@Jephuff](https://github.com/Jephuff)! - Fix subgraph detection on windows
+
+- [#282](https://github.com/apollographql/vscode-graphql/pull/282) [`52017e3`](https://github.com/apollographql/vscode-graphql/commit/52017e3479cfe8c07d19fa52c2ebe10f65de766c) Thanks [@pubmodmatt](https://github.com/pubmodmatt)! - Improve syntax highlighting for GraphQL block strings
+
 ## 2.5.5
 
 ### Patch Changes

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-apollo",
   "displayName": "Apollo GraphQL",
   "description": "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -67,7 +67,7 @@
     "zod-validation-error": "3.4.0"
   },
   "devDependencies": {
-    "@apollo/rover": "0.27.0-preview.0",
+    "@apollo/rover": "0.27.0",
     "@changesets/changelog-github": "0.5.0",
     "@changesets/cli": "2.27.10",
     "@graphql-codegen/cli": "5.0.2",
@@ -83,7 +83,7 @@
     "@vscode/test-cli": "0.0.10",
     "@vscode/test-electron": "2.4.1",
     "@wry/trie": "0.5.0",
-    "esbuild": "0.23.0",
+    "esbuild": "0.25.0",
     "eslint": "8.52.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",

package/sampleWorkspace/rover/apollo.config.yaml

@@ -1,3 +1,3 @@
 rover:
   profile: VSCode-E2E
-  bin: ../../node_modules/@apollo/rover/binary/rover-0.27.0-alpha.0
+  bin: ../../node_modules/@apollo/rover/binary/rover-0.27.0

package/sampleWorkspace/rover/supergraph.yaml

@@ -0,0 +1,4 @@
+subgraphs:
+  subgraph:
+    schema:
+      file: src/test.graphql

package/src/language-server/__e2e__/configFileTypes.e2e.ts

@@ -21,14 +21,14 @@ test.each([
 ] as const)("%s with `type: '%s'`", async (project, moduleType) => {
   await writeFile(
     resolveRelativeToSampleWorkspace(`configFileTypes/${project}/package.json`),
-    JSON.stringify(
+    `${JSON.stringify(
       {
         name: "test",
         type: moduleType,
       },
       undefined,
       2,
-    ),
+    )}\n`,
     "utf-8",
   );
   await reloadService();

package/src/language-server/__e2e__/rover.e2e.ts

@@ -1,9 +1,3 @@
-import { test as origTest } from "@jest/globals";
-import { load } from "js-yaml";
-import { readFileSync } from "node:fs";
-import { execFileSync } from "node:child_process";
-import { join } from "node:path";
-import { ParsedApolloConfigFormat } from "../config";
 import { TextEditor } from "vscode";
 import {
   closeAllEditors,
@@ -16,36 +10,6 @@ import {
   getDefinitions,
 } from "./utils";
 
-// we want to skip these tests unless the user running them has a rover config profile named "VSCode-E2E"
-let test = origTest.skip;
-try {
-  const roverProjectDir = join(__dirname, "../../../sampleWorkspace/rover");
-  const config = load(
-    readFileSync(join(roverProjectDir, "apollo.config.yaml"), "utf-8"),
-  ) as ParsedApolloConfigFormat;
-  const roverBin = join(roverProjectDir, config.rover!.bin);
-  const result = execFileSync(roverBin, [
-    "config",
-    "list",
-    "--format=json",
-  ]).toString("utf8");
-  const parsed = JSON.parse(result);
-  if (parsed.data.profiles.includes("VSCode-E2E")) {
-    test = origTest;
-  }
-} catch (e) {}
-if (test === origTest.skip) {
-  console.info(
-    "Skipping rover E2E tests: no profile with the name 'VSCode-E2E'\n" +
-      "You can create one by running `rover config auth --profile VSCode-E2E`",
-  );
-}
-
-if (process.platform === "win32") {
-  console.info("Skipping rover E2E tests in Windows");
-  test = origTest.skip;
-}
-
 let editor: TextEditor;
 let getPosition: GetPositionFn;
 beforeAll(async () => {
@@ -73,47 +37,71 @@ test("completion", async () => {
 [
   {
     "detail": undefined,
+    "label": "@authenticated",
+  },
+  {
+    "detail": "",
     "label": "@deprecated",
   },
   {
-    "detail": undefined,
+    "detail": "",
     "label": "@external",
   },
   {
     "detail": undefined,
-    "label": "@federation__authenticated",
+    "label": "@inaccessible",
   },
   {
-    "detail": undefined,
-    "label": "@federation__inaccessible",
+    "detail": "",
+    "label": "@override(…)",
   },
   {
     "detail": undefined,
-    "label": "@federation__policy(…)",
+    "label": "@policy(…)",
   },
   {
     "detail": undefined,
-    "label": "@federation__provides(…)",
+    "label": "@provides(…)",
   },
   {
-    "detail": undefined,
-    "label": "@federation__requiresScopes(…)",
+    "detail": "",
+    "label": "@requires(…)",
   },
   {
     "detail": undefined,
-    "label": "@federation__tag(…)",
+    "label": "@requiresScopes(…)",
   },
   {
-    "detail": undefined,
-    "label": "@override(…)",
+    "detail": "",
+    "label": "@shareable",
   },
   {
     "detail": undefined,
-    "label": "@requires(…)",
+    "label": "@tag(…)",
+  },
+  {
+    "detail": "",
+    "label": "@federation__authenticated",
+  },
+  {
+    "detail": "",
+    "label": "@federation__inaccessible",
+  },
+  {
+    "detail": "",
+    "label": "@federation__policy(…)",
+  },
+  {
+    "detail": "",
+    "label": "@federation__provides(…)",
+  },
+  {
+    "detail": "",
+    "label": "@federation__requiresScopes(…)",
   },
   {
     "detail": undefined,
-    "label": "@shareable",
+    "label": "@federation__tag(…)",
   },
 ]
 `);

package/src/language-server/config/config.ts

@@ -322,8 +322,10 @@ export abstract class ApolloConfig {
   get configDirURI() {
     // if the filepath has a _file_ in it, then we get its dir
     return this.configURI &&
-      this.configURI.fsPath.match(/\.(ts|js|cjs|mjs|yaml|yml|json)$/i)
-      ? URI.parse(dirname(this.configURI.fsPath))
+      this.configURI.path.match(/\.(ts|js|cjs|mjs|yaml|yml|json)$/i)
+      ? URI.from(this.configURI).with({
+          path: dirname(this.configURI.path),
+        })
       : this.configURI;
   }
 

package/syntaxes/graphql.json

@@ -485,6 +485,19 @@
         "1": { "name": "constant.language.null.graphql" }
       }
     },
+    "graphql-block-string-value": {
+      "contentName": "string.quoted.triple.block.graphql",
+      "begin": "\\s*+((\"\"\"))",
+      "end": "\\s*+((\"\"\"))",
+      "beginCaptures": {
+        "1": { "name": "string.quoted.triple.block.graphql" },
+        "2": { "name": "punctuation.definition.string.begin.graphql" }
+      },
+      "endCaptures": {
+        "1": { "name": "string.quoted.triple.block.graphql" },
+        "2": { "name": "punctuation.definition.string.end.graphql" }
+      }
+    },
     "graphql-string-value": {
       "contentName": "string.quoted.double.graphql",
       "begin": "\\s*+((\"))",
@@ -553,6 +566,7 @@
       "patterns": [
         { "include": "#graphql-variable-name" },
         { "include": "#graphql-float-value" },
+        { "include": "#graphql-block-string-value" },
         { "include": "#graphql-string-value" },
         { "include": "#graphql-boolean-value" },
         { "include": "#graphql-null-value" },