vscode-apollo 1.20.0 → 2.0.1

package/src/language-server/fileSet.ts

@@ -1,7 +1,7 @@
-import minimatch from "minimatch";
-import glob from "glob";
+import { minimatch } from "minimatch";
+import { globSync } from "glob";
 import { invariant } from "../tools";
-import URI from "vscode-uri";
+import { URI } from "vscode-uri";
 import { normalizeURI } from "./utilities";
 import { resolve } from "path";
 
@@ -37,13 +37,13 @@ export class FileSet {
       this.includes.some((include) => {
         return minimatch(
           normalizedFilePath,
-          resolve(this.rootURI.fsPath, include)
+          resolve(this.rootURI.fsPath, include),
         );
       }) &&
       !this.excludes.some((exclude) => {
         return minimatch(
           normalizedFilePath,
-          resolve(this.rootURI.fsPath, exclude)
+          resolve(this.rootURI.fsPath, exclude),
         );
       })
     );
@@ -54,12 +54,10 @@ export class FileSet {
     // `includes` globs into a single pattern and pass to glob.sync. The `ignore` option does, however, allow
     // an array of globs to ignore, so we can pass it in directly
     const joinedIncludes = `{${this.includes.join(",")}}`;
-    return glob
-      .sync(joinedIncludes, {
-        cwd: this.rootURI.fsPath,
-        absolute: true,
-        ignore: this.excludes,
-      })
-      .map(normalizeURI);
+    return globSync(joinedIncludes, {
+      cwd: this.rootURI.fsPath,
+      absolute: true,
+      ignore: this.excludes,
+    }).map(normalizeURI);
   }
 }

package/src/language-server/format.ts

@@ -4,7 +4,7 @@ export function formatMS(
   ms: number,
   d: number,
   allowMicros = false,
-  allowNanos = true
+  allowNanos = true,
 ) {
   if (ms === 0 || ms === null) return "0";
   const bounds = [