feat: add regexes from node_modules watch (#1439)

* feat: add regexes from node_modules watch * fix: self add node_modules_regexes * chore: ignorePath to Options * chore: judge contains node_modules first
umijs · Jul 25, 2024 · e215fed · e215fed
1 parent d866363
commit e215fed
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/crates/binding/src/lib.rs b/crates/binding/src/lib.rs
@@ -169,6 +169,7 @@ pub struct BuildParams {
     };
     watch?: {
         ignoredPaths?: string[];
+        nodeModulesRegexes?: string[];
     };
 }"#)]
     pub config: serde_json::Value,

diff --git a/crates/mako/src/config/config.rs b/crates/mako/src/config/config.rs
@@ -448,7 +448,8 @@ pub struct ExperimentalConfig {
 #[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct WatchConfig {
-    pub ignore_paths: Vec<String>,
+    pub ignore_paths: Option<Vec<String>>,
+    pub node_modules_regexes: Option<Vec<String>>,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -722,7 +723,7 @@ const DEFAULT_CONFIG: &str = r#"
     },
     "useDefineForClassFields": true,
     "emitDecoratorMetadata": false,
-    "watch": { "ignorePaths": [] },
+    "watch": { "ignorePaths": [], "nodeModulesRegexes": [] },
     "devServer": { "host": "127.0.0.1", "port": 3000 }
 }
 "#;

diff --git a/crates/mako/src/dev/watch.rs b/crates/mako/src/dev/watch.rs
@@ -7,6 +7,7 @@ use anyhow::{self, Ok};
 use colored::Colorize;
 use notify::{self, EventKind, Watcher as NotifyWatcher};
 use notify_debouncer_full::DebouncedEvent;
+use regex::Regex;
 use tracing::debug;
 
 use crate::compiler::Compiler;
@@ -18,6 +19,7 @@ pub struct Watcher<'a> {
     pub compiler: &'a Compiler,
     pub watched_files: HashSet<PathBuf>,
     pub watched_dirs: HashSet<PathBuf>,
+    node_modules_regexes: Vec<Regex>,
 }
 
 impl<'a> Watcher<'a> {
@@ -32,6 +34,16 @@ impl<'a> Watcher<'a> {
             compiler,
             watched_dirs: HashSet::new(),
             watched_files: HashSet::new(),
+            node_modules_regexes: compiler
+                .context
+                .config
+                .watch
+                .node_modules_regexes
+                .clone()
+                .unwrap_or_default()
+                .iter()
+                .map(|s| Regex::new(s).unwrap())
+                .collect::<Vec<Regex>>(),
         }
     }
 
@@ -57,6 +69,20 @@ impl<'a> Watcher<'a> {
                         dirs.insert(dir);
                     }
                 }
+                if !self.node_modules_regexes.is_empty() {
+                    let file_path = resource.0.path().to_str().unwrap();
+                    let is_match = file_path.contains("node_modules")
+                        && self
+                            .node_modules_regexes
+                            .iter()
+                            .any(|regex| regex.is_match(file_path));
+                    if is_match {
+                        let _ = self.watcher.watch(
+                            resource.0.path().to_path_buf().as_path(),
+                            notify::RecursiveMode::NonRecursive,
+                        );
+                    }
+                }
             }
         });
         dirs.iter().try_for_each(|dir| {
@@ -103,6 +129,8 @@ impl<'a> Watcher<'a> {
                 .config
                 .watch
                 .ignore_paths
+                .as_deref()
+                .unwrap_or(&[])
                 .iter()
                 .map(|p| p.as_str()),
         );

diff --git a/packages/mako/binding.d.ts b/packages/mako/binding.d.ts
@@ -184,6 +184,7 @@ export interface BuildParams {
     };
     watch?: {
       ignoredPaths?: string[];
+      nodeModulesRegexes?: string[];
     };
   };
   plugins: Array<JsHooks>;