vscode-apollo 2.2.0 → 2.3.0

package/src/language-server/providers/schema/endpoint.ts

@@ -17,7 +17,16 @@ import { RemoteServiceConfig } from "../../config";
 import { GraphQLSchemaProvider, SchemaChangeUnsubscribeHandler } from "./base";
 import { Debug } from "../../utilities";
 import { isString } from "util";
-
+import { fetch as undiciFetch, Agent } from "undici";
+
+const skipSSLValidationFetchOptions = {
+  // see https://github.com/nodejs/undici/issues/1489#issuecomment-1543856261
+  dispatcher: new Agent({
+    connect: {
+      rejectUnauthorized: false,
+    },
+  }),
+} satisfies import("undici").RequestInit;
 export class EndpointSchemaProvider implements GraphQLSchemaProvider {
   private schema?: GraphQLSchema;
   private federatedServiceSDL?: string;
@@ -28,11 +37,11 @@ export class EndpointSchemaProvider implements GraphQLSchemaProvider {
     const { skipSSLValidation, url, headers } = this.config;
     const options: HttpOptions = {
       uri: url,
+      fetch: undiciFetch as typeof fetch,
     };
+
     if (url.startsWith("https:") && skipSSLValidation) {
-      options.fetchOptions = {
-        agent: new HTTPSAgent({ rejectUnauthorized: false }),
-      };
+      options.fetchOptions = skipSSLValidationFetchOptions;
     }
 
     const { data, errors } = (await toPromise(
@@ -92,12 +101,10 @@ export class EndpointSchemaProvider implements GraphQLSchemaProvider {
     const { skipSSLValidation, url, headers } = this.config;
     const options: HttpOptions = {
       uri: url,
-      fetch,
+      fetch: undiciFetch as typeof fetch,
     };
     if (url.startsWith("https:") && skipSSLValidation) {
-      options.fetchOptions = {
-        agent: new HTTPSAgent({ rejectUnauthorized: false }),
-      };
+      options.fetchOptions = skipSSLValidationFetchOptions;
     }
 
     const getFederationInfoQuery = `

package/src/language-server/server.ts

@@ -9,7 +9,8 @@ import {
   FileEvent,
 } from "vscode-languageserver/node";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import type { QuickPickItem } from "vscode";
+import { type QuickPickItem } from "vscode";
+import { basename } from "node:path";
 import { GraphQLWorkspace } from "./workspace";
 import { LanguageServerLoadingHandler } from "./loadingHandler";
 import { debounceHandler, Debug } from "./utilities";
@@ -23,6 +24,7 @@ import { isValidationError } from "zod-validation-error";
 import { GraphQLProject } from "./project/base";
 import type { LanguageIdExtensionMap } from "../tools/utilities/languageInformation";
 import { setLanguageIdExtensionMap } from "./utilities/languageIdForExtension";
+import { envFileNames, supportedConfigFileNames } from "./config";
 
 export type InitializationOptions = {
   languageIdExtensionMap: LanguageIdExtensionMap;
@@ -190,14 +192,13 @@ documents.onDidClose(
 connection.onDidChangeWatchedFiles((params) => {
   const handledByProject = new Map<GraphQLProject, FileEvent[]>();
   for (const { uri, type } of params.changes) {
+    const fsPath = URI.parse(uri).fsPath;
+    const fileName = basename(fsPath);
     if (
-      uri.endsWith("apollo.config.js") ||
-      uri.endsWith("apollo.config.cjs") ||
-      uri.endsWith("apollo.config.mjs") ||
-      uri.endsWith("apollo.config.ts") ||
-      uri.endsWith(".env")
+      supportedConfigFileNames.includes(fileName) ||
+      envFileNames.includes(fileName)
     ) {
-      workspace.reloadProjectForConfig(uri);
+      workspace.reloadProjectForConfigOrCompanionFile(uri);
     }
 
     // Don't respond to changes in files that are currently open,

package/src/language-server/workspace.ts

@@ -125,7 +125,7 @@ export class GraphQLWorkspace {
 
     */
     const apolloConfigFiles: string[] = globSync(
-      "**/apollo.config.@(js|ts|cjs|mjs)",
+      "**/apollo.config.@(js|ts|cjs|mjs|yaml|yml|json)",
       {
         cwd: URI.parse(folder.uri).fsPath,
         absolute: true,
@@ -197,7 +197,7 @@ export class GraphQLWorkspace {
     });
   }
 
-  async reloadProjectForConfig(configUri: DocumentUri) {
+  async reloadProjectForConfigOrCompanionFile(configUri: DocumentUri) {
     const configPath = dirname(URI.parse(configUri).fsPath);
     let config: ApolloConfig | null;
     let error;
@@ -215,9 +215,6 @@ export class GraphQLWorkspace {
     }
     // If project exists, update the config
     if (project && config) {
-      if (equal(project.config.rawConfig, config.rawConfig)) {
-        return;
-      }
       await Promise.all(project.updateConfig(config));
       this.reloadService();
     }

package/src/languageServerClient.ts

@@ -52,7 +52,9 @@ export function getLanguageServerClient(
     documentSelector: supportedLanguageIds,
     synchronize: {
       fileEvents: [
-        workspace.createFileSystemWatcher("**/.env?(.local)"),
+        workspace.createFileSystemWatcher(
+          "**/{.env?(.local),apollo.config.{json,yml,yaml}}",
+        ),
         workspace.createFileSystemWatcher(
           "**/*{" + supportedExtensions.join(",") + "}",
         ),

package/syntaxes/graphql.json

@@ -601,8 +601,8 @@
     "graphql-object-field": {
       "match": "\\s*(([_A-Za-z][_0-9A-Za-z]*))\\s*(:)",
       "captures": {
-        "1": { "name": "constant.object.key.graphql" },
-        "2": { "name": "string.unquoted.graphql" },
+        "1": { "name": "string.unquoted.graphql" },
+        "2": { "name": "variable.object.key.graphql" },
         "3": { "name": "punctuation.graphql" }
       }
     },

package/sampleWorkspace/localSchemaArray/apollo.config.js

@@ -1,12 +0,0 @@
-module.exports = {
-  client: {
-    service: {
-      name: "localMultiSchema",
-      localSchemaFile: [
-        "./starwarsSchema.graphql",
-        // this documents an unfixed bug: in this multi-folder-workspace, this looks for files relative to the first folder in the .code-workspace file
-        "./planets.graphql",
-      ],
-    },
-  },
-};

package/sampleWorkspace/rover/apollo.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  rover: {},
-};