chore(deps): switch to tinyglobby

Author: benmccann

package-lock.json

@@ -73,7 +73,7 @@
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-n": "17.21.3",
     "eslint-plugin-promise": "7.2.1",
-    "globby": "11.1.0",
+    "eslint-plugin-standard": "5.0.0",
     "graphql": "16.11.0",
     "graphql-yoga": "5.15.2",
     "husky": "9.1.7",
@@ -83,6 +83,7 @@
     "prettier": "3.6.2",
     "prettier-plugin-tailwindcss": "0.6.14",
     "rimraf": "6.0.1",
+    "tinyglobby": "0.2.15",
     "ts-jest": "29.4.1",
     "tsx": "4.20.5",
     "typedoc": "0.25.13",

package.json

@@ -51,7 +51,7 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "globby": "11.1.0",
+    "tinyglobby": "^0.2.13",
     "tslib": "^2.4.0",
     "unixify": "^1.0.0"
   },

packages/load-files/package.json

@@ -2,8 +2,9 @@ import { promises as fsPromises, readFileSync, statSync } from 'fs';
 import { createRequire } from 'module';
 import { extname, join } from 'path';
 import { cwd } from 'process';
-import globby, { GlobbyOptions, sync as globbySync } from 'globby';
+import { fileURLToPath } from 'url';
 import { DocumentNode, parse } from 'graphql';
+import { GlobOptions, globSync, glob as tinyglobby } from 'tinyglobby';
 import unixify from 'unixify';
 
 const { readFile, stat } = fsPromises;
@@ -63,8 +64,8 @@ async function isDirectory(path: string) {
   }
 }
 
-function scanForFilesSync(globStr: string | string[], globOptions: GlobbyOptions = {}): string[] {
-  return globbySync(globStr, { absolute: true, ...globOptions });
+function scanForFilesSync(globStr: string | string[], globOptions: GlobOptions = {}): string[] {
+  return globSync(globStr, { absolute: true, ...globOptions });
 }
 
 function formatExtension(extension: string): string {
@@ -98,8 +99,8 @@ export interface LoadFilesOptions {
   useRequire?: boolean;
   // An alternative to `require` to use if `require` would be used to load a file
   requireMethod?: any;
-  // Additional options to pass to globby
-  globOptions?: GlobbyOptions;
+  // Additional options to pass to tinyglobby
+  globOptions?: GlobOptions;
   // Named exports to extract from each file. Defaults to ['typeDefs', 'schema']
   exportNames?: string[];
   // Load files from nested directories. Set to `false` to only search the top-level directory.
@@ -148,10 +149,12 @@ export function loadFilesSync<T = any>(
     options.globOptions,
   );
 
+  const cwd = options?.globOptions?.cwd;
+  const normalizedCwd = cwd instanceof URL ? fileURLToPath(cwd) : cwd;
   const extractExports =
     execOptions.extractExports || DEFAULT_EXTRACT_EXPORTS_FACTORY(execOptions.exportNames ?? []);
   const requireMethod =
-    execOptions.requireMethod || createRequire(join(options?.globOptions?.cwd || cwd(), 'noop.js'));
+    execOptions.requireMethod || createRequire(join(normalizedCwd || cwd(), 'noop.js'));
 
   return relevantPaths
     .map(path => {
@@ -183,9 +186,9 @@ export function loadFilesSync<T = any>(
 
 async function scanForFiles(
   globStr: string | string[],
-  globOptions: GlobbyOptions = {},
+  globOptions: GlobOptions = {},
 ): Promise<string[]> {
-  return globby(globStr, { absolute: true, ...globOptions });
+  return tinyglobby(globStr, { absolute: true, ...globOptions });
 }
 
 const checkExtension = (
@@ -248,12 +251,14 @@ export async function loadFiles(
     options.globOptions,
   );
 
+  const cwd = options?.globOptions?.cwd;
+  const normalizedCwd = cwd instanceof URL ? fileURLToPath(cwd) : cwd;
   const extractExports =
     execOptions.extractExports || DEFAULT_EXTRACT_EXPORTS_FACTORY(execOptions.exportNames ?? []);
   const defaultRequireMethod = (path: string) =>
     import(path)
       .catch(importError => {
-        const cwdRequire = createRequire(join(options?.globOptions?.cwd || cwd(), 'noop.js'));
+        const cwdRequire = createRequire(join(normalizedCwd || cwd(), 'noop.js'));
         try {
           return cwdRequire(path);
         } catch (e) {

packages/load-files/src/index.ts

@@ -6,7 +6,7 @@ import { loadDocuments, loadDocumentsSync, NoTypeDefinitionsFound } from '@graph
 import { runTests } from '../../../../testing/utils.js';
 import '../../../../testing/to-be-similar-string';
 import { readFileSync } from 'fs';
-import globby from 'globby';
+import { globSync } from 'tinyglobby';
 import { removeLoc } from '@graphql-tools/optimize';
 
 describe('documentsFromGlob', () => {
@@ -20,7 +20,7 @@ describe('documentsFromGlob', () => {
         loaders: [new GraphQLFileLoader()],
       });
       expect(result).toHaveLength(1);
-      const expectedFiles = globby.sync(glob);
+      const expectedFiles = globSync(glob);
       for (const expectedFileName of expectedFiles) {
         const fileNameResult = result?.find(({ location }) => location === expectedFileName);
         if (fileNameResult) {
@@ -38,7 +38,7 @@ describe('documentsFromGlob', () => {
         loaders: [new GraphQLFileLoader()],
       });
       expect(result).toHaveLength(2);
-      const expectedFiles = globby.sync(glob);
+      const expectedFiles = globSync(glob);
       for (const expectedFileName of expectedFiles) {
         const fileNameResult = result?.find(({ location }) => location === expectedFileName);
         if (fileNameResult) {

packages/load/tests/loaders/documents/documents-from-glob.spec.ts

@@ -53,7 +53,7 @@
   "dependencies": {
     "@graphql-tools/graphql-tag-pluck": "8.3.21",
     "@graphql-tools/utils": "^10.9.1",
-    "globby": "^11.0.3",
+    "tinyglobby": "^0.2.15",
     "tslib": "^2.4.0",
     "unixify": "^1.0.0"
   },

packages/loaders/code-file/package.json

@@ -2,9 +2,9 @@ import { existsSync, promises as fsPromises, readFileSync } from 'fs';
 import { createRequire } from 'module';
 import { isAbsolute, resolve } from 'path';
 import { cwd, env } from 'process';
-import type { GlobbyOptions } from 'globby';
-import globby from 'globby';
 import { DocumentNode, GraphQLSchema, isSchema, parse } from 'graphql';
+import type { GlobOptions } from 'tinyglobby';
+import { globSync, glob as tinyglobby } from 'tinyglobby';
 import unixify from 'unixify';
 import {
   gqlPluckFromCodeString,
@@ -59,7 +59,7 @@ const FILE_EXTENSIONS = [
   '.gjs',
 ];
 
-function createGlobbyOptions(options: CodeFileLoaderOptions): GlobbyOptions {
+function createGlobbyOptions(options: CodeFileLoaderOptions): GlobOptions {
   return { absolute: true, ...options, ignore: [] };
 }
 
@@ -138,13 +138,13 @@ export class CodeFileLoader implements Loader<CodeFileLoaderOptions> {
   async resolveGlobs(glob: string, options: CodeFileLoaderOptions) {
     options = this.getMergedOptions(options);
     const globs = this._buildGlobs(glob, options);
-    return globby(globs, createGlobbyOptions(options));
+    return tinyglobby(globs, createGlobbyOptions(options));
   }
 
   resolveGlobsSync(glob: string, options: CodeFileLoaderOptions) {
     options = this.getMergedOptions(options);
     const globs = this._buildGlobs(glob, options);
-    return globby.sync(globs, createGlobbyOptions(options));
+    return globSync(globs, createGlobbyOptions(options));
   }
 
   async load(pointer: string, options: CodeFileLoaderOptions): Promise<Source[]> {

packages/loaders/code-file/src/index.ts

@@ -53,7 +53,7 @@
   "dependencies": {
     "@graphql-tools/import": "7.1.1",
     "@graphql-tools/utils": "^10.9.1",
-    "globby": "^11.0.3",
+    "tinyglobby": "^0.2.15",
     "tslib": "^2.4.0",
     "unixify": "^1.0.0"
   },

packages/loaders/graphql-file/package.json

@@ -1,8 +1,8 @@
 import { existsSync, promises as fsPromises, readFileSync } from 'fs';
 import { isAbsolute, resolve } from 'path';
 import { env, cwd as processCwd } from 'process';
-import type { GlobbyOptions } from 'globby';
-import globby from 'globby';
+import type { GlobOptions } from 'tinyglobby';
+import { globSync, glob as tinyglobby } from 'tinyglobby';
 import unixify from 'unixify';
 import { PathAliases, processImport } from '@graphql-tools/import';
 import {
@@ -46,7 +46,7 @@ function isGraphQLImportFile(rawSDL: string) {
   return trimmedRawSDL.startsWith('# import') || trimmedRawSDL.startsWith('#import');
 }
 
-function createGlobbyOptions(options: GraphQLFileLoaderOptions): GlobbyOptions {
+function createGlobbyOptions(options: GraphQLFileLoaderOptions): GlobOptions {
   return { absolute: true, ...options, ignore: [] };
 }
 
@@ -124,7 +124,7 @@ export class GraphQLFileLoader implements Loader<GraphQLFileLoaderOptions> {
     )
       return [glob]; // bypass globby when no glob character, can be loaded, no ignores and source not requested. Fixes problem with pkg and passes ci tests
     const globs = this._buildGlobs(glob, options);
-    const result = await globby(globs, createGlobbyOptions(options));
+    const result = await tinyglobby(globs, createGlobbyOptions(options));
     return result;
   }
 
@@ -137,7 +137,7 @@ export class GraphQLFileLoader implements Loader<GraphQLFileLoaderOptions> {
     )
       return [glob]; // bypass globby when no glob character, can be loaded, no ignores and source not requested. Fixes problem with pkg and passes ci tests
     const globs = this._buildGlobs(glob, options);
-    const result = globby.sync(globs, createGlobbyOptions(options));
+    const result = globSync(globs, createGlobbyOptions(options));
     return result;
   }