@umijs/preset-umi 4.7.1 → 4.7.2

package/dist/commands/dev/dev.js

@@ -123,15 +123,25 @@ PORT=8888 umi dev
           ...(0, import_watch.expandCSSPaths)((0, import_path.join)(absSrcPath, "overrides"))
         ].filter(Boolean)
       });
-      import_utils.lodash.uniq(watcherPaths.map(import_utils.winPath)).forEach((p) => {
+      import_utils.lodash.uniqBy(
+        watcherPaths.map((watcher) => {
+          const normalized = typeof watcher === "string" ? { path: watcher } : watcher;
+          return { ...normalized, path: (0, import_utils.winPath)(normalized.path) };
+        }),
+        ({ events, path }) => `${path}:${events ? [...events].sort().join(",") : "*"}`
+      ).forEach(({ events, path: watcherPath }) => {
+        const onChange = (0, import_watch.createDebouncedHandler)({
+          timeout: 2e3,
+          async onChange(opts2) {
+            await generate({ files: opts2.files, isFirstTime: false });
+          }
+        });
         (0, import_watch.watch)({
-          path: p,
+          path: watcherPath,
           addToUnWatches: true,
-          onChange: (0, import_watch.createDebouncedHandler)({
-            timeout: 2e3,
-            async onChange(opts2) {
-              await generate({ files: opts2.files, isFirstTime: false });
-            }
+          onChange: (0, import_watch.createEventFilteredHandler)({
+            events,
+            onChange
           })
         });
       });

package/dist/commands/dev/watch.d.ts

@@ -6,6 +6,10 @@ export declare function watch(opts: {
     addToUnWatches?: boolean;
     onChange: (event: string, path: string) => void;
 }): chokidar.FSWatcher;
+export declare function createEventFilteredHandler(opts: {
+    events?: ReadonlyArray<string>;
+    onChange: (event: string, path: string) => void;
+}): (event: string, path: string) => void;
 export declare function createDebouncedHandler(opts: {
     timeout?: number;
     onChange: (opts: {

package/dist/commands/dev/watch.js

@@ -21,6 +21,7 @@ var watch_exports = {};
 __export(watch_exports, {
   addUnWatch: () => addUnWatch,
   createDebouncedHandler: () => createDebouncedHandler,
+  createEventFilteredHandler: () => createEventFilteredHandler,
   expandCSSPaths: () => expandCSSPaths,
   expandJSPaths: () => expandJSPaths,
   unwatch: () => unwatch,
@@ -45,6 +46,13 @@ function watch(opts) {
   }
   return watcher;
 }
+function createEventFilteredHandler(opts) {
+  return (event, path) => {
+    if (!opts.events || opts.events.includes(event)) {
+      opts.onChange(event, path);
+    }
+  };
+}
 function createDebouncedHandler(opts) {
   let timer = null;
   let files = [];
@@ -77,6 +85,7 @@ function expandCSSPaths(path) {
 0 && (module.exports = {
   addUnWatch,
   createDebouncedHandler,
+  createEventFilteredHandler,
   expandCSSPaths,
   expandJSPaths,
   unwatch,

package/dist/types.d.ts

@@ -3,7 +3,7 @@ import type { BuildResult as ESBuildBuildResult, Plugin as ESBuildPlugin } from
 import type { Express, IConfig, RequestHandler, webpack } from '@umijs/bundler-webpack';
 import type WebpackChain from '@umijs/bundler-webpack/compiled/webpack-5-chain';
 import { createWebSocketServer } from '@umijs/bundler-webpack/dist/server/ws';
-import type { IAdd, IEvent, IModify, IRoute as ICoreRoute, IServicePluginAPI, PluginAPI } from '@umijs/core';
+import type { IAdd, IRoute as ICoreRoute, IEvent, IModify, IServicePluginAPI, PluginAPI } from '@umijs/core';
 import { Env } from '@umijs/core';
 import type { getMarkup } from '@umijs/server';
 import type { CheerioAPI } from '@umijs/utils/compiled/cheerio';
@@ -13,7 +13,7 @@ import type { IOnDemandInstallDep } from './features/depsOnDemand/depsOnDemand';
 import type CodeFrameError from './features/transform/CodeFrameError';
 export type { IUtoopackUserConfig } from '@umijs/bundler-utoopack';
 export { UmiApiRequest, UmiApiResponse } from './features/apiRoute';
-export { webpack, IConfig };
+export { IConfig, webpack };
 export type IScript = Partial<{
     async: boolean;
     charset: string;
@@ -63,6 +63,10 @@ export type IFileInfo = Array<{
     event: string;
     path: string;
 }>;
+export interface ITmpGenerateWatcher {
+    path: string;
+    events?: string[];
+}
 export interface IOnGenerateFiles {
     files?: IFileInfo | null;
     isFirstTime?: boolean;
@@ -127,7 +131,7 @@ export type IApi = PluginAPI & IServicePluginAPI & {
     addPrepareBuildPlugins: IAdd<null, ESBuildPlugin>;
     addRuntimePlugin: IAdd<null, string>;
     addRuntimePluginKey: IAdd<null, string>;
-    addTmpGenerateWatcherPaths: IAdd<null, string>;
+    addTmpGenerateWatcherPaths: IAdd<null, string | ITmpGenerateWatcher>;
     addUIModules: IAdd<null, IUIModule[]>;
     chainWebpack: {
         (fn: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -43,21 +43,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.7.1",
-    "@umijs/bundler-esbuild": "4.7.1",
-    "@umijs/bundler-utils": "4.7.1",
-    "@umijs/bundler-utoopack": "4.7.1",
-    "@umijs/bundler-webpack": "4.7.1",
-    "@umijs/babel-preset-umi": "4.7.1",
-    "@umijs/bundler-vite": "4.7.1",
-    "@umijs/core": "4.7.1",
-    "@umijs/mfsu": "4.7.1",
-    "@umijs/plugin-run": "4.7.1",
-    "@umijs/server": "4.7.1",
+    "@umijs/ast": "4.7.2",
+    "@umijs/bundler-esbuild": "4.7.2",
+    "@umijs/bundler-utils": "4.7.2",
+    "@umijs/bundler-utoopack": "4.7.2",
+    "@umijs/bundler-vite": "4.7.2",
+    "@umijs/babel-preset-umi": "4.7.2",
+    "@umijs/bundler-webpack": "4.7.2",
+    "@umijs/plugin-run": "4.7.2",
+    "@umijs/mfsu": "4.7.2",
+    "@umijs/renderer-react": "4.7.2",
+    "@umijs/server": "4.7.2",
     "@umijs/ui": "3.0.1",
-    "@umijs/renderer-react": "4.7.1",
-    "@umijs/utils": "4.7.1",
-    "@umijs/zod2ts": "4.7.1"
+    "@umijs/core": "4.7.2",
+    "@umijs/utils": "4.7.2",
+    "@umijs/zod2ts": "4.7.2"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",