feat(cli): upgrade chokidar to v4 (close #1605) (#1661)

Author: meteorlxy

.vscode/settings.json

@@ -20,6 +20,7 @@
   "cSpell.words": [
     "bumpp",
     "bundlerutils",
+    "chokidar",
     "composables",
     "devtool",
     "envinfo",

packages/cli/package.json

@@ -40,7 +40,7 @@
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
     "cac": "^6.7.14",
-    "chokidar": "^3.6.0",
+    "chokidar": "^4.0.3",
     "envinfo": "^7.14.0",
     "esbuild": "^0.25.8"
   },

packages/cli/src/commands/dev/watchPageFiles.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-misused-promises */
 import type { App, Page } from '@vuepress/core'
-import { colors, logger } from '@vuepress/utils'
+import { colors, logger, picomatch } from '@vuepress/utils'
 import type { FSWatcher } from 'chokidar'
 import chokidar from 'chokidar'
 import { handlePageAdd } from './handlePageAdd.js'
@@ -14,7 +14,6 @@ import { createPageDepsHelper } from './pageDepsHelper.js'
 export const watchPageFiles = (app: App): FSWatcher[] => {
   // watch page deps
   const depsWatcher = chokidar.watch([], {
-    disableGlobbing: true,
     ignoreInitial: true,
   })
   const depsHelper = createPageDepsHelper()
@@ -43,8 +42,19 @@ export const watchPageFiles = (app: App): FSWatcher[] => {
   })
 
   // watch page files
-  const pagesWatcher = chokidar.watch(app.options.pagePatterns, {
+  const pagePatternsMatchers = app.options.pagePatterns.map((pattern) =>
+    picomatch(pattern, {
+      cwd: app.dir.source(),
+    }),
+  )
+  const pagesWatcher = chokidar.watch('.', {
     cwd: app.dir.source(),
+    ignored: (filepath, stats) => {
+      // do not ignore non-file paths
+      if (!stats?.isFile()) return false
+      // ignore if the file does not match all patterns
+      return pagePatternsMatchers.some((matcher) => !matcher(filepath))
+    },
     ignoreInitial: true,
   })
   pagesWatcher.on('add', async (filePathRelative) => {

packages/utils/package.json

@@ -34,12 +34,14 @@
     "@types/debug": "^4.1.12",
     "@types/fs-extra": "^11.0.4",
     "@types/hash-sum": "^1.0.2",
+    "@types/picomatch": "^4.0.2",
     "@vuepress/shared": "workspace:*",
     "debug": "^4.4.1",
     "fs-extra": "^11.3.0",
     "hash-sum": "^2.0.0",
     "ora": "^8.2.0",
     "picocolors": "^1.1.1",
+    "picomatch": "^4.0.3",
     "tinyglobby": "^0.2.14",
     "upath": "^2.0.1"
   },

packages/utils/src/index.ts

@@ -3,10 +3,11 @@ import fs from 'fs-extra'
 import hash from 'hash-sum'
 import ora from 'ora'
 import colors from 'picocolors'
+import picomatch from 'picomatch'
 import * as tinyglobby from 'tinyglobby'
 import path from 'upath'
 
-export { debug, colors, fs, hash, ora, path, tinyglobby }
+export { debug, colors, fs, hash, ora, path, picomatch, tinyglobby }
 
 export * from './console/index.js'
 export * from './module/index.js'