Merge pull request #707 from marp-team/tinyglobby

Replace globby with tinyglobby

Author: yhatt

CHANGELOG.md

@@ -15,6 +15,7 @@
   - [v4.3.0](https://github.com/marp-team/marp-core/releases/v4.3.0): Added Unicode 17 support by Twemoji
 - Upgrade development Node.js LTS ([#689](https://github.com/marp-team/marp-cli/pull/689), [#706](https://github.com/marp-team/marp-cli/pull/706))
 - Upgrade dependent packages to the latest version ([#706](https://github.com/marp-team/marp-cli/pull/706))
+- Replace `globby` with `tinyglobby` ([#707](https://github.com/marp-team/marp-cli/pull/707))
 
 ### Fixed
 

jest.config.js

@@ -10,7 +10,6 @@ const esModules = [
   'chalk',
   'chrome-launcher',
   'find-up',
-  'globby',
   'import-meta-resolve',
   'is-docker',
   'is-inside-container',

package-lock.json

@@ -109,7 +109,6 @@
     "express": "^5.2.1",
     "fast-plist": "^0.1.3",
     "globals": "^17.3.0",
-    "globby": "~14.0.2",
     "image-size": "^2.0.2",
     "import-from": "^4.0.0",
     "import-meta-resolve": "^4.2.0",
@@ -143,6 +142,7 @@
     "ts-jest": "^29.4.6",
     "ts-key-enum": "^3.0.13",
     "tslib": "^2.8.1",
+    "tinyglobby": "^0.2.15",
     "typed-emitter": "^2.1.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.56.0",

package.json

@@ -2,7 +2,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import * as url from 'node:url'
-import { globby, Options as GlobbyOptions } from 'globby'
+import { glob, GlobOptions } from 'tinyglobby'
 import { debug } from './utils/debug'
 import { getStdin } from './utils/stdin'
 import { generateTmpName } from './utils/tmp'
@@ -51,6 +51,11 @@ export enum FileType {
   Null,
 }
 
+export interface FindPathOptions {
+  ignore?: GlobOptions['ignore']
+  files: string[]
+}
+
 export class File {
   buffer?: Buffer
   inputDir?: string
@@ -176,7 +181,7 @@ export class File {
   private static stdinBuffer?: Buffer
 
   static async findPath(
-    opts: GlobbyOptions,
+    opts: FindPathOptions,
     ...paths: string[]
   ): Promise<string[]> {
     const filepaths = new Set<string>()
@@ -203,12 +208,22 @@ export class File {
       globs.push(p.split(path.sep).join('/'))
     }
 
-    // Find remaining path through globby
-    const gOpts = { absolute: true, ignore: ['**/node_modules'], ...opts }
-    ;(await globby(globs, gOpts)).forEach((p) => filepaths.add(p))
+    const { files, ignore } = opts
+    const gOpts = {
+      absolute: true,
+      ignore: ['**/node_modules', ...(ignore ?? [])],
+    } satisfies GlobOptions
+
+    // Find remaining path through glob patterns
+    ;(await glob(globs, gOpts)).forEach((p) => filepaths.add(p))
 
     for (const cwd of dirs) {
-      ;(await globby('.', { cwd, ...gOpts })).forEach((p) => filepaths.add(p))
+      ;(
+        await glob(
+          files.map((pattern) => `**/${pattern}`),
+          { ...gOpts, cwd }
+        )
+      ).forEach((p) => filepaths.add(p))
     }
 
     return [...filepaths.values()].map((p) => path.normalize(p))
@@ -217,12 +232,7 @@ export class File {
   static async find(...paths: string[]): Promise<File[]> {
     return (
       await this.findPath(
-        {
-          expandDirectories: {
-            extensions: [],
-            files: markdownExtensions.map((ext) => `*.${ext}`),
-          },
-        },
+        { files: markdownExtensions.map((ext) => `*.${ext}`) },
         ...paths
       )
     ).map((p) => new File(p))

src/file.ts

@@ -450,7 +450,7 @@ export const marpCli = async (
       // @see https://github.com/marp-team/marp-cli/issues/93
       const stdin = args.stdin ? await File.stdin() : undefined
 
-      // Regular file finding powered by globby
+      // Regular file finding powered by glob matcher
       return [stdin, ...(await File.find(...config.files))].filter(
         (f): f is File => !!f
       )

src/marp-cli.ts

@@ -2,7 +2,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { Marpit } from '@marp-team/marpit'
-import { isDynamicPattern } from 'globby'
+import { isDynamicPattern } from 'tinyglobby'
 import { warn } from './cli'
 import { isError } from './error'
 import { File } from './file'
@@ -124,7 +124,7 @@ export class ThemeSet {
     const fnForWatch = new Set<string>(found.map((f) => path.resolve(f)))
 
     for (const f of fn) {
-      // globby's hasMagic (backed by fast-glob) always recognizes "\\" (Windows path separator) as the escape character.
+      // tinyglobby's dynamic pattern check expects "/" as a path separator.
       if (!isDynamicPattern(f.split(path.sep).join('/'))) {
         try {
           const stat: fs.Stats = await fs.promises.lstat(f)
@@ -146,15 +146,7 @@ export class ThemeSet {
   }
 
   private static async findPath(fn: string[]): Promise<string[]> {
-    return File.findPath(
-      {
-        expandDirectories: {
-          extensions: [],
-          files: ['*.css'],
-        },
-      },
-      ...fn
-    )
+    return File.findPath({ files: ['*.css'] }, ...fn)
   }
 }