vscode-apollo 2.3.1 → 2.3.3

package/.circleci/config.yml

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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 2.3.3
+
+### Patch Changes
+
+- [#191](https://github.com/apollographql/vscode-graphql/pull/191) [`2e56f42d`](https://github.com/apollographql/vscode-graphql/commit/2e56f42d172a7ec8afd003f056aeabac9eab1789) Thanks [@svc-secops](https://github.com/svc-secops)! - Chores: update various dependencies (#181, #191, #217, #218)
+
+## 2.3.2
+
+### Patch Changes
+
+- [#211](https://github.com/apollographql/vscode-graphql/pull/211) [`9aa1fc1b`](https://github.com/apollographql/vscode-graphql/commit/9aa1fc1b9b419a5e72216f032e64aa5f86f15b59) Thanks [@phryneas](https://github.com/phryneas)! - Avoid detection if .js config file is ESM or CommonJs, just try both.
+
 ## 2.3.1
 
 ### 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.3.1",
+  "version": "2.3.3",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
@@ -37,9 +37,9 @@
     "vscode": "^1.90.0"
   },
   "dependencies": {
-    "@apollo/client": "3.11.4",
-    "@apollo/subgraph": "2.8.4",
-    "@graphql-tools/schema": "10.0.5",
+    "@apollo/client": "3.11.8",
+    "@apollo/subgraph": "2.9.1",
+    "@graphql-tools/schema": "10.0.6",
     "@wry/equality": "0.5.7",
     "cosmiconfig": "9.0.0",
     "dotenv": "16.4.5",
@@ -55,6 +55,7 @@
     "lz-string": "1.5.0",
     "minimatch": "10.0.1",
     "moment": "2.30.1",
+    "semver": "7.6.3",
     "undici": "6.19.8",
     "vscode-languageclient": "9.0.1",
     "vscode-languageserver": "9.0.1",
@@ -62,7 +63,7 @@
     "vscode-uri": "3.0.8",
     "which": "4.0.0",
     "zod": "3.23.8",
-    "zod-validation-error": "3.3.1"
+    "zod-validation-error": "3.4.0"
   },
   "devDependencies": {
     "@apollo/rover": "0.27.0-alpha.0",
@@ -70,7 +71,7 @@
     "@changesets/cli": "2.26.2",
     "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/typescript-operations": "^4.2.3",
-    "@types/jest": "29.5.12",
+    "@types/jest": "29.5.13",
     "@types/lodash.debounce": "4.0.9",
     "@types/lodash.merge": "4.6.9",
     "@types/lodash.throttle": "^4.1.9",
@@ -89,7 +90,7 @@
     "import-fresh": "^3.3.0",
     "jest": "29.7.0",
     "jest-environment-node": "29.7.0",
-    "memfs": "4.11.1",
+    "memfs": "4.11.2",
     "npm-run-all": "^4.1.5",
     "prettier": "3.0.3",
     "rimraf": "6.0.1",

package/sampleWorkspace/configFileTypes/cjsConfig/apollo.config.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+  client: {
+    service: {
+      name: "cjsConfig",
+      localSchemaFile: "./starwarsSchema.graphql",
+    },
+  },
+};

package/sampleWorkspace/configFileTypes/cjsConfig/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "type": "module"
+}

package/sampleWorkspace/configFileTypes/cjsConfig/src/test.js

@@ -0,0 +1,8 @@
+import gql from "graphql-tag";
+gql`
+  query Test {
+    droid(id: "2000") {
+      name
+    }
+  }
+`;

package/sampleWorkspace/configFileTypes/jsConfigWithCJS/apollo.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  client: {
+    service: {
+      name: "jsConfigWithCJS",
+      localSchemaFile: "./starwarsSchema.graphql",
+    },
+  },
+};

package/sampleWorkspace/configFileTypes/jsConfigWithCJS/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "type": "module"
+}

package/sampleWorkspace/configFileTypes/jsConfigWithCJS/src/test.js

@@ -0,0 +1,8 @@
+import gql from "graphql-tag";
+gql`
+  query Test {
+    droid(id: "2000") {
+      name
+    }
+  }
+`;

package/sampleWorkspace/configFileTypes/jsConfigWithESM/apollo.config.js

@@ -0,0 +1,8 @@
+export default {
+  client: {
+    service: {
+      name: "jsConfigWithESM",
+      localSchemaFile: "./starwarsSchema.graphql",
+    },
+  },
+};

package/sampleWorkspace/configFileTypes/jsConfigWithESM/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "type": "commonjs"
+}

package/sampleWorkspace/configFileTypes/jsConfigWithESM/src/test.js

@@ -0,0 +1,8 @@
+import gql from "graphql-tag";
+gql`
+  query Test {
+    droid(id: "2000") {
+      name
+    }
+  }
+`;

package/sampleWorkspace/configFileTypes/mjsConfig/apollo.config.mjs

@@ -0,0 +1,8 @@
+export default {
+  client: {
+    service: {
+      name: "mjsConfig",
+      localSchemaFile: "./starwarsSchema.graphql",
+    },
+  },
+};

package/sampleWorkspace/configFileTypes/mjsConfig/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "type": "commonjs"
+}

package/sampleWorkspace/configFileTypes/mjsConfig/src/test.js

@@ -0,0 +1,8 @@
+import gql from "graphql-tag";
+gql`
+  query Test {
+    droid(id: "2000") {
+      name
+    }
+  }
+`;

package/sampleWorkspace/configFileTypes/tsConfigWithCJS/apollo.config.ts

@@ -0,0 +1,8 @@
+module.exports = {
+  client: {
+    service: {
+      name: "tsConfigWithCJS",
+      localSchemaFile: "./starwarsSchema.graphql",
+    },
+  },
+};

package/sampleWorkspace/configFileTypes/tsConfigWithCJS/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "type": "module"
+}

package/sampleWorkspace/configFileTypes/tsConfigWithCJS/src/test.js

@@ -0,0 +1,8 @@
+import gql from "graphql-tag";
+gql`
+  query Test {
+    droid(id: "2000") {
+      name
+    }
+  }
+`;

package/sampleWorkspace/configFileTypes/tsConfigWithESM/apollo.config.ts

@@ -0,0 +1,8 @@
+export default {
+  client: {
+    service: {
+      name: "tsConfigWithESM",
+      localSchemaFile: "./starwarsSchema.graphql",
+    },
+  },
+};

package/sampleWorkspace/configFileTypes/tsConfigWithESM/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "type": "commonjs"
+}

package/sampleWorkspace/configFileTypes/tsConfigWithESM/src/test.js

@@ -0,0 +1,8 @@
+import gql from "graphql-tag";
+gql`
+  query Test {
+    droid(id: "2000") {
+      name
+    }
+  }
+`;

package/sampleWorkspace/sampleWorkspace.code-workspace

@@ -18,6 +18,9 @@
     {
       "path": "rover"
     },
+    {
+      "path": "configFileTypes"
+    },
     {
       "path": "../src/language-server/__tests__/fixtures/documents"
     }

package/schemas/apollo.config.schema.json

@@ -4,14 +4,31 @@
       "$ref": "#/definitions/baseConfig"
     },
     {
-      "type": "object",
-      "properties": {
-        "client": {
-          "$ref": "#/definitions/clientConfig"
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
+            "client": {
+              "$ref": "#/definitions/clientConfig"
+            }
+          },
+          "required": [
+            "client"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "rover": {
+              "$ref": "#/definitions/roverConfig"
+            }
+          },
+          "required": [
+            "rover"
+          ],
+          "additionalProperties": false
         }
-      },
-      "required": [
-        "client"
       ]
     }
   ],
@@ -146,6 +163,36 @@
       "additionalProperties": false,
       "description": "Configuration for a Client project."
     },
+    "roverConfig": {
+      "type": "object",
+      "properties": {
+        "bin": {
+          "type": "string",
+          "description": "The path to your Rover binary. If omitted, will look in PATH."
+        },
+        "profile": {
+          "type": "string",
+          "description": "The name of the profile to use."
+        },
+        "supergraphConfig": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "description": "The path to your `supergraph.yaml` file. \nDefaults to a `supergraph.yaml` in the folder of your `apollo.config.json`, if there is one."
+        },
+        "extraArgs": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": [],
+          "description": "Extra arguments to pass to the Rover CLI."
+        }
+      },
+      "additionalProperties": false,
+      "description": "Configuration for a federated project."
+    },
     "engineConfig": {
       "type": "object",
       "properties": {
@@ -173,6 +220,9 @@
         "client": {
           "description": "Configuration for a Client project."
         },
+        "rover": {
+          "description": "Configuration for a federated project."
+        },
         "service": {
           "description": "This option is no longer supported, please remove it from your configuration file."
         }

package/src/__e2e__/runTests.js

@@ -18,7 +18,6 @@ async function main() {
     const TEST_PORT = 7096;
     process.env.APOLLO_ENGINE_ENDPOINT = "http://localhost:7096/apollo";
     process.env.MOCK_SERVER_PORT = String(TEST_PORT);
-    process.env.APOLLO_FEATURE_FLAGS = "rover";
     disposables.push(
       ...(await Promise.all([
         runMockServer(TEST_PORT, false, loadDefaultMocks),

package/src/build.js

@@ -68,7 +68,7 @@ const buildJsonSchemaPlugin = {
       const {
         configSchema,
         clientConfig,
-        // roverConfig,
+        roverConfig,
         engineConfig,
         baseConfig,
         // @ts-ignore
@@ -78,7 +78,7 @@ const buildJsonSchemaPlugin = {
         errorMessages: true,
         definitions: {
           clientConfig,
-          //roverConfig,
+          roverConfig,
           engineConfig,
           baseConfig,
         },

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

@@ -0,0 +1,37 @@
+import { writeFile } from "fs/promises";
+import {
+  reloadService,
+  waitForLSP,
+  resolveRelativeToSampleWorkspace,
+} from "./utils";
+
+test.each([
+  ["cjsConfig", "commonjs"],
+  ["cjsConfig", "module"],
+  ["mjsConfig", "module"],
+  ["mjsConfig", "commonjs"],
+  ["jsConfigWithCJS", "commonjs"],
+  ["jsConfigWithCJS", "module"],
+  ["jsConfigWithESM", "module"],
+  ["jsConfigWithESM", "commonjs"],
+  ["tsConfigWithCJS", "commonjs"],
+  ["tsConfigWithCJS", "module"],
+  ["tsConfigWithESM", "module"],
+  ["tsConfigWithESM", "commonjs"],
+] as const)("%s with `type: '%s'`", async (project, moduleType) => {
+  await writeFile(
+    resolveRelativeToSampleWorkspace(`configFileTypes/${project}/package.json`),
+    JSON.stringify(
+      {
+        name: "test",
+        type: moduleType,
+      },
+      undefined,
+      2,
+    ),
+    "utf-8",
+  );
+  await reloadService();
+  const stats = await waitForLSP(`configFileTypes/${project}/src/test.js`);
+  expect(stats.serviceId).toBe(project);
+});

package/src/language-server/__e2e__/utils.ts

@@ -7,6 +7,7 @@ import { VSCodeGraphQLExtension } from "src/extension";
 function resolve(file: string) {
   return join(__dirname, "..", "..", "..", "sampleWorkspace", file);
 }
+export { resolve as resolveRelativeToSampleWorkspace };
 
 export type GetPositionFn = ReturnType<typeof getPositionForEditor>;
 export function getPositionForEditor(editor: vscode.TextEditor) {
@@ -65,7 +66,7 @@ export function waitForLSP(file: string) {
       uri.toString(),
     );
     expect(stats.loaded).toBe(true);
-    return stats;
+    return stats as ProjectStats & { loaded: true };
   });
 }
 

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

@@ -1,24 +1,8 @@
-let { loadConfig } = require("../");
-let { ClientConfig, RoverConfig } = require("../config");
+import { loadConfig } from "../";
+import { ClientConfig, RoverConfig } from "../config";
 import * as path from "path";
 import * as fs from "fs";
 
-async function withFeatureFlags(flags: string, fn: () => void) {
-  const FF = process.env.APOLLO_FEATURE_FLAGS;
-  try {
-    process.env.APOLLO_FEATURE_FLAGS = flags;
-    jest.resetModules();
-    ({ loadConfig } = require("../"));
-    ({ ClientConfig, RoverConfig } = require("../config"));
-    return await fn();
-  } finally {
-    process.env.APOLLO_FEATURE_FLAGS = FF;
-    jest.resetModules();
-    ({ loadConfig } = require("../"));
-    ({ ClientConfig, RoverConfig } = require("../config"));
-  }
-}
-
 const makeNestedDir = (dir: string) => {
   if (fs.existsSync(dir)) return;
 
@@ -109,25 +93,24 @@ Object {
 `);
     });
 
-    it("loads with rover defaults from different dir", () =>
-      withFeatureFlags("rover", async () => {
-        writeFilesToDir(dir, {
-          "apollo.config.js": `
+    it("loads with rover defaults from different dir", async () => {
+      writeFilesToDir(dir, {
+        "apollo.config.js": `
           module.exports = {
             rover: {
             }
           }
         `,
+      });
+      fs.mkdirSync(`${dir}/bin`);
+      fs.writeFileSync(`${dir}/bin/rover`, "", { mode: 0o755 });
+      let oldPath = process.env.PATH;
+      process.env.PATH = `${dir}/bin:${oldPath}`;
+      try {
+        const config = await loadConfig({
+          configPath: dirPath,
         });
-        fs.mkdirSync(`${dir}/bin`);
-        fs.writeFileSync(`${dir}/bin/rover`, "", { mode: 0o755 });
-        let oldPath = process.env.PATH;
-        process.env.PATH = `${dir}/bin:${oldPath}`;
-        try {
-          const config = await loadConfig({
-            configPath: dirPath,
-          });
-          expect(config?.rawConfig).toMatchInlineSnapshot(`
+        expect(config?.rawConfig).toMatchInlineSnapshot(`
 Object {
   "engine": Object {
     "endpoint": "https://graphql.api.apollographql.com/api/graphql",
@@ -138,10 +121,10 @@ Object {
   },
 }
 `);
-        } finally {
-          process.env.PATH = oldPath;
-        }
-      }));
+      } finally {
+        process.env.PATH = oldPath;
+      }
+    });
 
     it("[deprecated] loads config from package.json", async () => {
       writeFilesToDir(dir, {
@@ -280,7 +263,6 @@ client:
 
       await loadConfig({
         configPath: dirPath,
-        requireConfig: true, // this is what we're testing
       });
 
       expect(spy).toHaveBeenCalledWith(
@@ -299,7 +281,7 @@ client:
       }).catch((e: any) => e);
 
       expect(error.message).toMatch(
-        /Config needs to contain a 'client' field./i,
+        /Config needs to contain either 'client' or 'rover' fields/i,
       );
     });
   });
@@ -374,18 +356,17 @@ client:
       expect(config).toBeInstanceOf(ClientConfig);
     });
 
-    it("infers rover projects from config", () =>
-      withFeatureFlags("rover", async () => {
-        writeFilesToDir(dir, {
-          "apollo.config.js": `module.exports = { rover: { bin: "/usr/bin/env" } }`,
-        });
+    it("infers rover projects from config", async () => {
+      writeFilesToDir(dir, {
+        "apollo.config.js": `module.exports = { rover: { bin: "/usr/bin/env" } }`,
+      });
 
-        const config = await loadConfig({
-          configPath: dirPath,
-        });
+      const config = await loadConfig({
+        configPath: dirPath,
+      });
 
-        expect(config).toBeInstanceOf(RoverConfig);
-      }));
+      expect(config).toBeInstanceOf(RoverConfig);
+    });
   });
 
   describe("service name", () => {

package/src/language-server/config/cache-busting-resolver.js

@@ -24,20 +24,12 @@ async function resolve(specifier, context, nextResolve) {
   if (context.importAttributes.as !== "cachebust") {
     return nextResolve(specifier, context);
   }
-  if (context.importAttributes.format) {
-    // no need to resolve at all, we have all necessary information
-    return {
-      url: bustFileName(specifier),
-      format: context.importAttributes.format,
-      importAttributes: context.importAttributes,
-      shortCircuit: true,
-    };
-  }
-  const result = await nextResolve(specifier, context);
+  // no need to resolve at all, we have all necessary information
   return {
-    ...result,
-    url: bustFileName(result.url),
+    url: bustFileName(specifier),
+    format: context.importAttributes.format,
     importAttributes: context.importAttributes,
+    shortCircuit: true,
   };
 }
 

package/src/language-server/config/cache-busting-resolver.types.ts

@@ -4,7 +4,7 @@ export type ImportAttributes =
   | {
       as: "cachebust";
       contents: string;
-      format?: Format;
+      format: Format;
     }
   | { as?: undefined };
 

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

@@ -9,10 +9,9 @@ import which from "which";
 import { accessSync, constants as fsConstants, statSync } from "node:fs";
 import { AsyncLocalStorage } from "async_hooks";
 import { existsSync } from "fs";
-
-const ROVER_AVAILABLE = (process.env.APOLLO_FEATURE_FLAGS || "")
-  .split(",")
-  .includes("rover");
+import { spawn } from "node:child_process";
+import { text } from "node:stream/consumers";
+import semver from "semver";
 
 function ignoredFieldWarning(
   getMessage = (path: string) =>
@@ -143,49 +142,53 @@ export const clientConfig = z
   .describe("Configuration for a Client project.");
 export type ClientConfigFormat = z.infer<typeof clientConfig>;
 
-export const roverConfig = z.object({
-  bin: z
-    .preprocess(
-      (val) => val || which.sync("rover", { nothrow: true }) || undefined,
-      z.string({
-        message:
-          "Rover binary not found. Please either install it system-wide in PATH, or provide the `bin` option. Also ensure that the binary is executable.",
-      }),
-    )
-    .refine(
-      (bin) => {
-        try {
-          // is executable?
-          accessSync(bin, fsConstants.X_OK);
-          // is a file and not a directory?
-          return statSync(bin).isFile();
-        } catch {
-          return false;
-        }
-      },
-      {
-        message:
-          "Rover binary is not marked as an executable. If you are using OS X or Linux, ensure to set the executable bit.",
-      },
-    )
-    .describe("The path to your Rover binary. If omitted, will look in PATH."),
-  profile: z.string().optional().describe("The name of the profile to use."),
-  supergraphConfig: z
-    .preprocess((value) => {
-      if (value !== undefined) return value;
-      const configPath = contextStore.getStore()?.configPath!;
-      const supergraphConfig = join(configPath, "supergraph.yaml");
-      return existsSync(supergraphConfig) ? supergraphConfig : undefined;
-    }, z.string().nullable().optional())
-    .describe(
-      "The path to your `supergraph.yaml` file. \n" +
-        "Defaults to a `supergraph.yaml` in the folder of your `apollo.config.js`, if there is one.",
-    ),
-  extraArgs: z
-    .array(z.string())
-    .default([])
-    .describe("Extra arguments to pass to the Rover CLI."),
-});
+export const roverConfig = z
+  .object({
+    bin: z
+      .preprocess(
+        (val) => val || which.sync("rover", { nothrow: true }) || undefined,
+        z.string({
+          message:
+            "Rover binary not found. Please either install it system-wide in PATH, or provide the `bin` option. Also ensure that the binary is executable.",
+        }),
+      )
+      .refine(
+        (bin) => {
+          try {
+            // is executable?
+            accessSync(bin, fsConstants.X_OK);
+            // is a file and not a directory?
+            return statSync(bin).isFile();
+          } catch {
+            return false;
+          }
+        },
+        {
+          message:
+            "Rover binary is not marked as an executable. If you are using OS X or Linux, ensure to set the executable bit.",
+        },
+      )
+      .describe(
+        "The path to your Rover binary. If omitted, will look in PATH.",
+      ),
+    profile: z.string().optional().describe("The name of the profile to use."),
+    supergraphConfig: z
+      .preprocess((value) => {
+        if (value !== undefined) return value;
+        const configPath = contextStore.getStore()?.configPath || ".";
+        const supergraphConfig = join(configPath, "supergraph.yaml");
+        return existsSync(supergraphConfig) ? supergraphConfig : undefined;
+      }, z.string().nullable().optional())
+      .describe(
+        "The path to your `supergraph.yaml` file. \n" +
+          "Defaults to a `supergraph.yaml` in the folder of your `apollo.config.json`, if there is one.",
+      ),
+    extraArgs: z
+      .array(z.string())
+      .default([])
+      .describe("Extra arguments to pass to the Rover CLI."),
+  })
+  .describe("Configuration for a federated project.");
 type RoverConfigFormat = z.infer<typeof roverConfig>;
 
 export const engineConfig = z
@@ -212,12 +215,7 @@ export type EngineConfig = z.infer<typeof engineConfig>;
 export const baseConfig = z.object({
   engine: engineConfig.default({}),
   client: z.unknown().optional().describe(clientConfig.description!),
-  ...ifRoverAvailable(
-    {
-      rover: z.unknown().optional(),
-    },
-    {},
-  ),
+  rover: z.unknown().optional().describe(roverConfig.description!),
   service: ignoredFieldWarning(
     (path) =>
       `Service-type projects are no longer supported. Please remove the "${path}" field from your configuration file.`,
@@ -234,56 +232,36 @@ export type FullRoverConfigFormat = Extract<
   { rover: {} }
 >;
 
-/** Helper function for TypeScript - we just want the first type to make it into the types, not the "no feature flag" fallback */
-function ifRoverAvailable<T>(yes: T, no: any): T {
-  return ROVER_AVAILABLE ? yes : no;
-}
-
 export const configSchema = baseConfig
   .superRefine((val, ctx) => {
-    if (ROVER_AVAILABLE) {
-      if ("client" in val && "rover" in val) {
-        ctx.addIssue({
-          code: "custom",
-          message: "Config cannot contain both 'client' and 'rover' fields",
-          fatal: true,
-        });
-      }
-      if (!("client" in val) && !("rover" in val)) {
-        ctx.addIssue({
-          code: "custom",
-          message: "Config needs to contain either 'client' or 'rover' fields",
-          fatal: true,
-        });
-      }
-    } else {
-      if (!("client" in val)) {
-        ctx.addIssue({
-          code: "custom",
-          message: "Config needs to contain a 'client' field.",
-          fatal: true,
-        });
-      }
+    if ("client" in val && "rover" in val) {
+      ctx.addIssue({
+        code: "custom",
+        message: "Config cannot contain both 'client' and 'rover' fields",
+        fatal: true,
+      });
+    }
+    if (!("client" in val) && !("rover" in val)) {
+      ctx.addIssue({
+        code: "custom",
+        message: "Config needs to contain either 'client' or 'rover' fields",
+        fatal: true,
+      });
     }
   })
   .and(
-    ifRoverAvailable(
-      z.union([
-        z
-          .object({
-            client: clientConfig,
-          })
-          .transform((val): typeof val & { rover?: never } => val),
-        z
-          .object({
-            rover: roverConfig,
-          })
-          .transform((val): typeof val & { client?: never } => val),
-      ]),
-      z.object({
-        client: clientConfig,
-      }),
-    ),
+    z.union([
+      z
+        .object({
+          client: clientConfig,
+        })
+        .transform((val): typeof val & { rover?: never } => val),
+      z
+        .object({
+          rover: roverConfig,
+        })
+        .transform((val): typeof val & { client?: never } => val),
+    ]),
   );
 export type RawApolloConfigFormat = z.input<typeof configSchema>;
 export type ParsedApolloConfigFormat = z.output<typeof configSchema>;
@@ -371,6 +349,11 @@ export abstract class ApolloConfig {
     if (this._graphId) return this._graphId;
     return getGraphIdFromConfig(this.rawConfig);
   }
+
+  /**
+   * execute some additional asynchronous verification steps that cannot be part of the sync parsing part
+   */
+  async verify() {}
 }
 
 export class ClientConfig extends ApolloConfig {
@@ -395,4 +378,45 @@ export class RoverConfig extends ApolloConfig {
     super(rawConfig, configURI);
     this.rover = rawConfig.rover;
   }
+
+  /**
+   * execute some additional asynchronous verification steps that cannot be part of the sync parsing part
+   */
+  async verify() {
+    try {
+      const child = spawn(this.rover.bin, ["-V"], {
+        stdio: ["pipe", "pipe", "ignore"],
+      });
+      const output = await text(child.stdout);
+      const versionPrefix = "Rover ";
+      if (output.startsWith(versionPrefix)) {
+        const version = output.slice(versionPrefix.length).trim();
+        if (!semver.valid(version)) {
+          // not a valid version, we accept this and will try anyways
+          return;
+        }
+        if (semver.gte(version, "0.27.0-alpha.0")) {
+          // this is a supported version
+          return;
+        }
+        const error = new Error(
+          `Rover version ${version} is not supported by the extension. Please upgrade to at least 0.27.0.`,
+        );
+        // @ts-expect-error would require a target of ES2022 in tsconfig
+        error.cause = "ROVER_TOO_OLD";
+        throw error;
+      }
+      // we can't find out the version, but we'll try anyways
+    } catch (error) {
+      if (
+        error &&
+        error instanceof Error &&
+        // @ts-expect-error would require a target of ES2022 in tsconfig
+        error.cause === "ROVER_TOO_OLD"
+      ) {
+        throw error;
+      }
+      // we ignore all other errors and will handle that when we actually spawn the rover binary
+    }
+  }
 }

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

@@ -121,9 +121,11 @@ export async function loadConfig({
 
   let { config, filepath } = loadedConfig;
 
-  return parseApolloConfig(config, URI.file(resolve(filepath)), {
+  const finalConfig = parseApolloConfig(config, URI.file(resolve(filepath)), {
     apiKey,
     serviceName: nameFromKey,
     configPath: dirname(filepath),
   });
+  await finalConfig.verify();
+  return finalConfig;
 }

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

@@ -1,5 +1,5 @@
 import { Loader } from "cosmiconfig";
-import { dirname } from "node:path";
+import { dirname, extname } from "node:path";
 import typescript from "typescript";
 import { pathToFileURL } from "node:url";
 import { register } from "node:module";
@@ -59,19 +59,7 @@ async function load(
     error.message = `TypeScript Error in ${filepath}:\n${error.message}`;
     throw error;
   }
-  // eslint-disable-next-line @typescript-eslint/return-await
-  const imported = await import(
-    filepath,
-    //@ts-ignore
-    {
-      with: {
-        as: "cachebust",
-        contents: transpiledContent,
-        format: type,
-      } satisfies ImportAttributes,
-    }
-  );
-  return imported.default;
+  return loadCachebustedJs(filepath, transpiledContent, type);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -92,15 +80,44 @@ function resolveTsConfig(directory: string): any {
 }
 
 export const loadJs: Loader = async function loadJs(filepath, contents) {
+  const extension = extname(filepath);
+  if (extension === ".mjs") {
+    return loadCachebustedJs(filepath, contents, "module");
+  }
+  if (extension === ".cjs") {
+    return loadCachebustedJs(filepath, contents, "commonjs");
+  }
+  try {
+    return await loadCachebustedJs(filepath, contents, "module");
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      // [ERROR] ReferenceError: module is not defined in ES module scope
+      error.message.includes("module is not defined")
+    ) {
+      return loadCachebustedJs(filepath, contents, "commonjs");
+    } else {
+      throw error;
+    }
+  }
+};
+
+async function loadCachebustedJs(
+  filename: string,
+  contents: string,
+  type: "module" | "commonjs",
+) {
   return (
     await import(
-      filepath, // @ts-ignore
+      filename,
+      // @ts-ignore
       {
         with: {
           as: "cachebust",
           contents,
+          format: type,
         } satisfies ImportAttributes,
       }
     )
   ).default;
-};
+}

package/src/language-server/project/rover/DocumentSynchronization.ts

@@ -23,7 +23,7 @@ import {
   rangeInContainingDocument,
 } from "../../utilities/source";
 import { URI } from "vscode-uri";
-import { DEBUG } from "./project";
+import { Debug } from "../../utilities";
 
 export interface FilePart {
   fractionalIndex: string;
@@ -285,7 +285,7 @@ export class DocumentSynchronization {
   }
 
   handlePartDiagnostics(params: PublishDiagnosticsParams) {
-    DEBUG && console.log("Received diagnostics", params);
+    Debug.traceVerbose("Received diagnostics", params);
     const uriDetails = splitUri(params.uri);
     const found = this.knownFiles.get(uriDetails.uri);
     if (!found || found.source === "lsp") {

package/src/language-server/project/rover/project.ts

@@ -36,8 +36,8 @@ import { VSCodeConnection } from "../../server";
 import { getLanguageIdForExtension } from "../../utilities/languageIdForExtension";
 import { extname } from "node:path";
 import type { FileExtension } from "../../../tools/utilities/languageInformation";
-
-export const DEBUG = true;
+import { Debug } from "../../utilities";
+import { TraceLevel } from "src/language-server/utilities/debug";
 
 export function isRoverConfig(config: ApolloConfig): config is RoverConfig {
   return config instanceof RoverConfig;
@@ -115,11 +115,14 @@ export class RoverProject extends GraphQLProject {
     params?: P,
   ): Promise<void> {
     const connection = await this.getConnection();
-    DEBUG &&
-      console.log("sending notification %o", {
+    Debug.traceMessage(
+      "[Rover] Sending notification: " + type.method,
+      "[Rover] Sending notification %o",
+      {
         type: type.method,
         params,
-      });
+      },
+    );
     try {
       return await connection.sendNotification(type, params);
     } catch (error) {
@@ -136,10 +139,20 @@ export class RoverProject extends GraphQLProject {
     token?: CancellationToken,
   ): Promise<R> {
     const connection = await this.getConnection();
-    DEBUG && console.log("sending request %o", { type: type.method, params });
+    Debug.traceMessage(
+      "[Rover] Sending request: " + type.method,
+      "[Rover] Sending request %o",
+      { type: type.method, params },
+    );
     try {
       const result = await connection.sendRequest(type, params, token);
-      DEBUG && console.log({ result });
+      Debug.traceMessage(
+        "[Rover] Received response: " + type.method,
+        "[Rover] Received response %s\nResult: %o",
+        type.method,
+
+        result,
+      );
       return result;
     } catch (error) {
       if (error instanceof Error) {
@@ -166,27 +179,35 @@ export class RoverProject extends GraphQLProject {
     if (this.config.rover.supergraphConfig) {
       args.push("--supergraph-config", this.config.rover.supergraphConfig);
     }
+    if (Debug.traceLevel >= TraceLevel.verbose) {
+      args.push("--log", "debug");
+    }
     args.push(...this.config.rover.extraArgs);
 
-    DEBUG &&
-      console.log(`starting ${this.config.rover.bin} '${args.join("' '")}'`);
+    Debug.traceVerbose(
+      `starting ${this.config.rover.bin} '${args.join("' '")}'`,
+    );
     const child = cp.spawn(this.config.rover.bin, args, {
-      env: DEBUG ? { RUST_BACKTRACE: "1" } : {},
-      stdio: ["pipe", "pipe", DEBUG ? "inherit" : "ignore"],
+      env: { NO_COLOR: "1" },
+      stdio: [
+        "pipe",
+        "pipe",
+        Debug.traceLevel >= TraceLevel.verbose ? "inherit" : "ignore",
+      ],
     });
     this.child = child;
     const reader = new StreamMessageReader(child.stdout);
     const writer = new StreamMessageWriter(child.stdin);
     const connection = createProtocolConnection(reader, writer);
     connection.onClose(() => {
-      DEBUG && console.log("Connection closed");
+      Debug.traceMessage("[Rover] Connection closed");
       child.kill();
       source.cancel();
       this._connection = undefined;
     });
 
     connection.onError((err) => {
-      console.error({ err });
+      Debug.error("%o", { err });
     });
 
     connection.onNotification(
@@ -195,11 +216,14 @@ export class RoverProject extends GraphQLProject {
     );
 
     connection.onUnhandledNotification((notification) => {
-      DEBUG && console.info("unhandled notification from LSP", notification);
+      Debug.traceVerbose(
+        "[Rover] unhandled notification from LSP",
+        notification,
+      );
     });
 
     connection.listen();
-    DEBUG && console.log("Initializing connection");
+    Debug.traceMessage("[Rover] Initializing connection");
 
     const source = new CancellationTokenSource();
     try {
@@ -213,7 +237,11 @@ export class RoverProject extends GraphQLProject {
         source.token,
       );
       this.roverCapabilities = status.capabilities;
-      DEBUG && console.log("Connection initialized", status);
+      Debug.traceMessage(
+        "[Rover] Connection initialized",
+        "[Rover] Connection initialized %o",
+        status,
+      );
 
       await this.connectionStorage.run(
         connection,
@@ -222,7 +250,7 @@ export class RoverProject extends GraphQLProject {
 
       return connection;
     } catch (error) {
-      console.error("Connection failed to initialize", error);
+      Debug.error("Connection with Rover failed to initialize", error);
       throw error;
     }
   }
@@ -295,7 +323,7 @@ export class RoverProject extends GraphQLProject {
     if (isRequestType(SemanticTokensRequest.type, type, params)) {
       return this.documents.getFullSemanticTokens(params, token);
     } else {
-      DEBUG && console.info("unhandled request from VSCode", { type, params });
+      Debug.traceVerbose("unhandled request from VSCode", { type, params });
       return undefined;
     }
   };
@@ -304,8 +332,7 @@ export class RoverProject extends GraphQLProject {
     type,
     params,
   ) => {
-    DEBUG &&
-      console.info("unhandled notification from VSCode", { type, params });
+    Debug.traceVerbose("unhandled notification from VSCode", { type, params });
   };
 
   async onVSCodeConnectionInitialized(connection: VSCodeConnection) {

package/src/language-server/server.ts

@@ -7,6 +7,7 @@ import {
   TextDocumentSyncKind,
   SymbolInformation,
   FileEvent,
+  SetTraceNotification,
 } from "vscode-languageserver/node";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { type QuickPickItem } from "vscode";
@@ -92,11 +93,16 @@ workspace.onConfigFilesFound(async (params) => {
   );
 });
 
+connection.onNotification(SetTraceNotification.type, ({ value }) => {
+  Debug.traceLevel = value;
+});
+
 connection.onInitialize(
-  async ({ capabilities, workspaceFolders, initializationOptions }) => {
+  async ({ capabilities, workspaceFolders, initializationOptions, trace }) => {
     const { languageIdExtensionMap } =
       initializationOptions as InitializationOptions;
     setLanguageIdExtensionMap(languageIdExtensionMap);
+    Debug.traceLevel = trace;
 
     hasWorkspaceFolderCapability = !!(
       capabilities.workspace && capabilities.workspace.workspaceFolders

package/src/language-server/utilities/debug.ts

@@ -1,5 +1,6 @@
 import { LanguageServerNotifications as Notifications } from "../../messages";
-import { Connection } from "vscode-languageserver/node";
+import { Connection, TraceValues } from "vscode-languageserver/node";
+import { format } from "util";
 
 /**
  * for errors (and other logs in debug mode) we want to print
@@ -15,9 +16,27 @@ const createAndTrimStackTrace = () => {
     : stack;
 };
 
-type Logger = (message?: any) => void;
+type Logger = (message?: any, minLevel?: TraceLevel) => void;
+export enum TraceLevel {
+  "off" = 0,
+  "messages" = 1,
+  "verbose" = 2,
+}
 
 export class Debug {
+  private static _traceLevel: TraceLevel = TraceLevel.off;
+  public static get traceLevel(): TraceLevel {
+    return Debug._traceLevel;
+  }
+  public static set traceLevel(value: TraceValues | undefined) {
+    if (value === "compact") {
+      // we do not handle "compact" and it's not possible to set in settings, but it doesn't hurt to at least map
+      // it to another value
+      this._traceLevel = TraceLevel.messages;
+    } else {
+      this._traceLevel = TraceLevel[value || "off"];
+    }
+  }
   private static connection?: Connection;
   private static infoLogger: Logger = (message) =>
     console.log("[INFO] " + message);
@@ -67,17 +86,39 @@ export class Debug {
     if (error) Debug.errorLogger = error;
   }
 
-  public static info(message: string) {
-    Debug.infoLogger(message);
+  public static info(message: string, ...param: any[]) {
+    Debug.infoLogger(format(message, ...param));
   }
 
-  public static error(message: string) {
+  public static error(message: string, ...param: any[]) {
     const stack = createAndTrimStackTrace();
-    Debug.errorLogger(`${message}\n${stack}`);
+    Debug.errorLogger(`${format(message, ...param)}\n${stack}`);
+  }
+
+  public static warning(message: string, ...param: any[]) {
+    Debug.warningLogger(format(message, ...param));
+  }
+
+  public static traceMessage(
+    short: string,
+    verbose = short,
+    ...verboseParams: any[]
+  ) {
+    if (Debug.traceLevel >= TraceLevel.verbose) {
+      // directly logging to `console` because
+      // we don't want to send yet another notification that will be traced
+      console.info(verbose, ...verboseParams);
+    } else if (Debug.traceLevel >= TraceLevel.messages) {
+      console.info(short);
+    }
   }
 
-  public static warning(message: string) {
-    Debug.warningLogger(message);
+  public static traceVerbose(message: string, ...params: any[]) {
+    if (Debug.traceLevel >= TraceLevel.verbose) {
+      // directly logging to `console` because
+      // we don't want to send yet another notification that will be traced
+      console.info(message, ...params);
+    }
   }
 
   public static sendErrorTelemetry(message: string) {