chore(deps): switch from fast-glob to tinyglobby

Author: benmccann

package-lock.json

@@ -52,7 +52,6 @@
     "es-module-lexer": "^1.0.0",
     "esbuild": "0.25.5",
     "execa": "^8.0.0",
-    "fast-glob": "^3.3.3",
     "filter-obj": "^6.0.0",
     "find-up": "^7.0.0",
     "is-builtin-module": "^3.1.0",
@@ -68,6 +67,7 @@
     "require-package-name": "^2.0.1",
     "resolve": "^2.0.0-next.1",
     "semver": "^7.3.8",
+    "tinyglobby": "https://pkg.pr.new/tinyglobby@131",
     "tmp-promise": "^3.0.2",
     "toml": "^3.0.0",
     "unixify": "^1.0.0",

packages/zip-it-and-ship-it/package.json

@@ -1,6 +1,7 @@
 import { normalize, resolve } from 'path'
+import { lstatSync } from 'fs'
 
-import glob from 'fast-glob'
+import { glob } from 'tinyglobby'
 
 import { minimatch } from '../../../utils/matching.js'
 
@@ -54,14 +55,21 @@ export const getPathsOfIncludedFiles = async (
     dot: true,
     ignore: excludePatterns,
     onlyFiles: false,
-    // get directories as well to get symlinked directories,
-    // to filter the regular non symlinked directories out mark them with a slash at the end to filter them out.
-    markDirectories: true,
     followSymbolicLinks: false,
+    expandDirectories: false,
   })
 
-  const paths = pathGroups.filter((path) => !path.endsWith('/')).map(normalize)
+  const paths = pathGroups.filter(pathFilter).map(normalize)
 
   // now filter the non symlinked directories out that got marked with a trailing slash
   return { excludePatterns, paths }
 }
+
+function pathFilter(path: string) {
+  try {
+    const stats = lstatSync(path)
+    return !stats.isDirectory() || stats.isSymbolicLink()
+  } catch (_err) {
+    return false
+  }
+}

packages/zip-it-and-ship-it/src/runtimes/node/utils/included_files.ts

@@ -1,15 +1,16 @@
-import originalGlob from 'fast-glob'
 import { minimatch as minimatchFunction, type MinimatchOptions } from 'minimatch'
 import normalizePath from 'normalize-path'
+import { glob as originalGlob, type GlobOptions } from 'tinyglobby'
 
 /**
  * Both glob and minimatch only support unix style slashes in patterns
  * For this reason we wrap them and ensure all patterns are always unixified
  * We use `normalize-path` here instead of `unixify` because we do not want to remove drive letters
  */
-export const glob = function (pattern: string, options: originalGlob.Options): Promise<string[]> {
-  const normalizedIgnore = options.ignore?.map((expression) => normalizePath(expression))
-  return originalGlob(normalizePath(pattern), { ...options, ignore: normalizedIgnore })
+export const glob = function (pattern: string, options: GlobOptions): Promise<string[]> {
+  const ignore = Array.isArray(options.ignore) ? options.ignore : options.ignore ? [options.ignore] : []
+  const normalizedIgnore = ignore.map((expression) => normalizePath(expression))
+  return originalGlob(normalizePath(pattern), { ...options, ignore: normalizedIgnore, expandDirectories: false })
 }
 
 export const minimatch = function (target: string, pattern: string, options?: MinimatchOptions): boolean {

packages/zip-it-and-ship-it/src/utils/matching.ts

@@ -6,10 +6,10 @@ import cpy from 'cpy'
 import decompress from 'decompress'
 import merge from 'deepmerge'
 import { execa, execaNode } from 'execa'
-import glob from 'fast-glob'
 import isCI from 'is-ci'
 import { pathExists } from 'path-exists'
 import semver from 'semver'
+import { glob } from 'tinyglobby'
 import { dir as getTmpDir, tmpName } from 'tmp-promise'
 import unixify from 'unixify'
 import { afterAll, afterEach, beforeAll, describe, expect, test, vi } from 'vitest'
@@ -2840,7 +2840,7 @@ describe('zip-it-and-ship-it', () => {
 
     await decompress(files[0].path, unzipPath)
 
-    const fileNames: string[] = await glob('**', { dot: true, cwd: unzipPath })
+    const fileNames: string[] = await glob('**', { dot: true, cwd: unzipPath, expandDirectories: false })
     const duplicates = fileNames.filter((item, index) => fileNames.indexOf(item) !== index)
     expect(duplicates).toHaveLength(0)
   })

packages/zip-it-and-ship-it/tests/main.test.ts

@@ -1,7 +1,7 @@
 import { join } from 'path'
 
 import decompress from 'decompress'
-import glob from 'fast-glob'
+import { glob } from 'tinyglobby'
 import { dir as getTmpDir } from 'tmp-promise'
 import { expect, test } from 'vitest'
 
@@ -32,7 +32,7 @@ test('The telemetry file should be added by default to the function bundle', asy
 
   await decompress(result!.path, unzippedPath)
 
-  const files = await glob('**/*', { cwd: unzippedPath })
+  const files = await glob('**/*', { cwd: unzippedPath, expandDirectories: false })
   expect(files.sort()).toEqual([
     '___netlify-bootstrap.mjs',
     '___netlify-entry-point.mjs',

packages/zip-it-and-ship-it/tests/telemetry.test.ts

@@ -4,8 +4,8 @@ import { platform } from 'process'
 
 import { getPath as getBootstrapPath } from '@netlify/serverless-functions-api'
 import merge from 'deepmerge'
-import glob from 'fast-glob'
 import { pathExists } from 'path-exists'
+import { glob } from 'tinyglobby'
 import { dir as getTmpDir } from 'tmp-promise'
 import { afterEach, describe, expect, test, vi } from 'vitest'
 
@@ -128,7 +128,7 @@ describe('V2 functions API', () => {
 
       const [{ name: archive, entryFilename, path }] = files
 
-      const untranspiledFiles = await glob(`${path}/**/*.ts`)
+      const untranspiledFiles = await glob(`${path}/**/*.ts`, { expandDirectories: false })
       expect(untranspiledFiles).toEqual([])
 
       const func = await importFunctionFile(`${tmpDir}/${archive}/${entryFilename}`)