[VSCode] Fix detection of projects inside folders (#519)

* [VSCode] Fix detection of projects inside folders * Exclude node_modules when scanning for config files
apollographql · Jul 30, 2018 · 5a496e1 · 5a496e1
1 parent 4eee386
commit 5a496e1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/packages/apollo-cli/src/config.ts b/packages/apollo-cli/src/config.ts
@@ -28,6 +28,7 @@ export interface DocumentSet {
 }
 
 export interface ApolloConfig {
+  configFile: string;
   projectFolder: string;
   name?: string;
   schemas?: { [name: string]: SchemaDependency }; // path to JSON introspection, if not provided endpoint will be used
@@ -100,6 +101,7 @@ function loadDocumentSet(obj: any): DocumentSet {
 
 export function loadConfig(
   obj: any,
+  configFile: string,
   configDir: string,
   defaultEndpoint: boolean,
   defaultSchema: boolean
@@ -114,6 +116,7 @@ export function loadConfig(
   }
 
   return {
+    configFile,
     projectFolder: configDir,
     schemas: schemasObj,
     name: basename(configDir),
@@ -136,6 +139,7 @@ export function loadConfigFromFile(
     delete require.cache[require.resolve(file)];
     return loadConfig(
       require(file),
+      file,
       dirname(file),
       defaultEndpoint,
       defaultSchema
@@ -145,12 +149,19 @@ export function loadConfigFromFile(
     if (apolloKey) {
       return loadConfig(
         apolloKey,
+        file,
         dirname(file),
         defaultEndpoint,
         defaultSchema
       );
     } else {
-      return loadConfig({}, dirname(file), defaultEndpoint, defaultSchema);
+      return loadConfig(
+        {},
+        file,
+        dirname(file),
+        defaultEndpoint,
+        defaultSchema
+      );
     }
   } else {
     throw new Error("Unsupported config file format");
@@ -175,7 +186,7 @@ export function findAndLoadConfig(
       defaultSchema
     );
   } else {
-    return loadConfig({}, dir, defaultEndpoint, defaultSchema);
+    return loadConfig({}, dir, dir, defaultEndpoint, defaultSchema);
   }
 }
 

diff --git a/packages/apollo-language-server/src/workspace.ts b/packages/apollo-language-server/src/workspace.ts
@@ -26,36 +26,38 @@ export class GraphQLWorkspace {
   }
 
   addProjectsInFolder(folder: WorkspaceFolder) {
-    const apolloConfigFiles: string[] = fg.sync("apollo.config.js", {
+    const apolloConfigFiles: string[] = fg.sync("**/apollo.config.js", {
       cwd: Uri.parse(folder.uri).fsPath,
-      absolute: true
+      absolute: true,
+      ignore: "**/node_modules/**"
     });
 
     apolloConfigFiles.push(
-      ...fg.sync("package.json", {
+      ...fg.sync("**/package.json", {
         cwd: Uri.parse(folder.uri).fsPath,
-        absolute: true
+        absolute: true,
+        ignore: "**/node_modules/**"
       })
     );
 
-    const projectConfigs = apolloConfigFiles.flatMap(configFile => {
-      const loadedConfig = findAndLoadConfig(dirname(configFile), false, true);
-
-      if (loadedConfig) {
-        return [
-          {
-            config: loadedConfig,
-            configFile
-          }
-        ];
-      } else {
-        return [];
+    const apolloConfigFolders = new Set<string>(
+      apolloConfigFiles.map(f => dirname(f))
+    );
+
+    const projectConfigs = Array.from(apolloConfigFolders).flatMap(
+      configFolder => {
+        try {
+          return [findAndLoadConfig(configFolder, false, true)];
+        } catch (e) {
+          console.error(e);
+          return [];
+        }
       }
-    });
+    );
 
     const projects = projectConfigs.map(projectConfig => {
       const project = new GraphQLProject(
-        projectConfig.config,
+        projectConfig,
         projectConfig.configFile
       );
 

diff --git a/packages/apollo-vscode/package-lock.json b/packages/apollo-vscode/package-lock.json