chore: 修复 watch 问题

winixt · winixt · commit 77b651c50ba0 · 2025-09-09T20:43:03.000+08:00
diff --git a/packages/compiler/src/config/index.ts b/packages/compiler/src/config/index.ts
@@ -142,10 +142,11 @@ export default class Config {
     }
 
     async requireConfigs(configFiles: string[]): Promise<any[]> {
-        const models = await Promise.all(configFiles.map(f => {
+        const models = await Promise.all(configFiles.map((f) => {
             // 使用 pathToFileURL 确保在 Windows 下路径格式正确
             const fileUrl = pathToFileURL(f).href;
-            return import(fileUrl);
+            // 避免命中模块缓存
+            return import(`${fileUrl}?t=${Date.now()}`);
         }));
         return models.map(m => compatESModuleRequire(m));
     }
diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json
@@ -7,7 +7,7 @@
     "author": "qlin",
     "license": "MIT",
     "scripts": {
-        "build": "FES_ENV=prod fes build",
+        "prod": "FES_ENV=prod fes build",
         "dev": "fes dev"
     },
     "dependencies": {
diff --git a/packages/fes-template-vite/.fes.js b/packages/fes-template-vite/.fes.js
@@ -6,6 +6,7 @@ export default defineBuildConfig({
     define: {
         __DEV__: false,
     },
+    publicPath: './',
     title: '海贼王',
     router: {
         mode: 'hash',
@@ -71,6 +72,8 @@ export default defineBuildConfig({
         plugins: [
             tailwindcss(),
         ],
+        server: {
+        },
     },
     // enums: {
     //     status: [
diff --git a/packages/fes-template-vite/package.json b/packages/fes-template-vite/package.json
@@ -7,7 +7,6 @@
     "author": "harrywan",
     "license": "MIT",
     "scripts": {
-        "build": "fes build",
         "prod": "FES_ENV=prod fes build",
         "analyze": "ANALYZE=1 fes build",
         "dev": "fes dev",
diff --git a/packages/fes-template-vite/test.js b/packages/fes-template-vite/test.js
diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json
@@ -7,7 +7,6 @@
     "author": "harrywan",
     "license": "MIT",
     "scripts": {
-        "build": "fes build",
         "prod": "FES_ENV=prod fes build",
         "analyze": "ANALYZE=1 fes build",
         "dev": "fes dev",
diff --git a/packages/fes/tsup.config.ts b/packages/fes/tsup.config.ts
@@ -11,5 +11,10 @@ export default defineConfig({
     onSuccess() {
         copySync('public', 'dist');
     },
+    outExtension({ format }) {
+        return {
+            js: format === 'esm' ? '.mjs' : '.cjs',
+        };
+    },
     format: ['esm'],
 });
diff --git a/packages/plugin-qiankun/examples/vite-main/package.json b/packages/plugin-qiankun/examples/vite-main/package.json
@@ -6,35 +6,10 @@
     "description": "fes项目模版",
     "author": "harrywan",
     "license": "MIT",
-    "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
-    "bugs": {
-        "url": "https://github.com/WeBankFinTech/fes.js/issues"
-    },
-    "keywords": [
-        "管理端",
-        "fes",
-        "fast",
-        "easy",
-        "strong"
-    ],
-    "files": [
-        ".eslintrc.js",
-        ".fes.js",
-        ".fes.prod.js",
-        ".gitignore",
-        "/config",
-        "/src",
-        "README.md",
-        "mock.js",
-        "package.json",
-        "tsconfig.json"
-    ],
     "scripts": {
-        "build": "fes build",
         "prod": "FES_ENV=prod fes build",
         "analyze": "ANALYZE=1 fes build",
-        "dev": "fes dev",
-        "test": "fes test"
+        "dev": "fes dev"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/plugin-qiankun/examples/vite-micro/package.json b/packages/plugin-qiankun/examples/vite-micro/package.json
@@ -5,40 +5,10 @@
     "private": true,
     "description": "fes项目模版",
     "author": "harrywan",
-    "license": "MIT",
-    "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/WeBankFinTech/fes.js.git",
-        "directory": "packages/plugin-qiankun"
-    },
-    "bugs": {
-        "url": "https://github.com/WeBankFinTech/fes.js/issues"
-    },
-    "keywords": [
-        "管理端",
-        "fes",
-        "fast",
-        "easy",
-        "strong"
-    ],
-    "files": [
-        ".eslintrc.js",
-        ".fes.js",
-        ".fes.prod.js",
-        ".gitignore",
-        "/config",
-        "README.md",
-        "mock.js",
-        "package.json",
-        "tsconfig.json"
-    ],
     "scripts": {
-        "build": "fes build",
         "prod": "FES_ENV=prod fes build",
         "analyze": "ANALYZE=1 fes build",
-        "dev": "fes dev",
-        "test": "fes test"
+        "dev": "fes dev"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/plugin-qiankun/examples/webpack-main/package.json b/packages/plugin-qiankun/examples/webpack-main/package.json
@@ -6,31 +6,7 @@
     "description": "fes项目模版",
     "author": "harrywan",
     "license": "MIT",
-    "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
-    "bugs": {
-        "url": "https://github.com/WeBankFinTech/fes.js/issues"
-    },
-    "keywords": [
-        "管理端",
-        "fes",
-        "fast",
-        "easy",
-        "strong"
-    ],
-    "files": [
-        ".eslintrc.js",
-        ".fes.js",
-        ".fes.prod.js",
-        ".gitignore",
-        "/config",
-        "/src",
-        "README.md",
-        "mock.js",
-        "package.json",
-        "tsconfig.json"
-    ],
     "scripts": {
-        "build": "fes build",
         "prod": "FES_ENV=prod fes build",
         "analyze": "ANALYZE=1 fes build",
         "dev": "fes dev",
diff --git a/packages/plugin-qiankun/examples/webpack-micro/package.json b/packages/plugin-qiankun/examples/webpack-micro/package.json
@@ -11,11 +11,9 @@
         "url": "https://github.com/WeBankFinTech/fes.js/issues"
     },
     "scripts": {
-        "build": "fes build",
         "prod": "FES_ENV=prod fes build",
         "analyze": "ANALYZE=1 fes build",
-        "dev": "fes dev",
-        "test": "fes test"
+        "dev": "fes dev"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/preset-built-in/src/plugins/registerMethods.ts b/packages/preset-built-in/src/plugins/registerMethods.ts
@@ -1,6 +1,6 @@
-import assert from 'assert';
-import { dirname, join } from 'path';
-import { existsSync, statSync, readFileSync, writeFileSync, copyFileSync } from 'fs';
+import assert from 'node:assert';
+import { copyFileSync, existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import { startWatch } from './watch/watchMode';
 
 export default function (api) {
@@ -43,7 +43,7 @@ export default function (api) {
         fn({ namespace, path, ignore }) {
             const base = join(api.paths.absTmpPath, namespace);
             // copy 行为只需要执行一次
-            if (cacheCopyPath[base]) return;
+            if (cacheCopyPath[base]) { return; }
             cacheCopyPath[base] = true;
             assert(api.stage >= api.ServiceStage.pluginReady, 'api.copyTmpFiles() should not execute in register stage.');
             assert(path, 'api.copyTmpFiles() should has param path');
@@ -59,11 +59,13 @@ export default function (api) {
                 }
                 if (statSync(source).isDirectory()) {
                     api.utils.mkdirp.sync(target);
-                } else if (Array.isArray(ignore)) {
-                    if (!ignore.some((pattern) => new RegExp(pattern).test(file))) {
+                }
+                else if (Array.isArray(ignore)) {
+                    if (!ignore.some(pattern => new RegExp(pattern).test(file))) {
                         copyFileSync(source, target);
                     }
-                } else {
+                }
+                else {
                     copyFileSync(source, target);
                 }
             });
diff --git a/packages/preset-built-in/src/plugins/watch/watchMode.ts b/packages/preset-built-in/src/plugins/watch/watchMode.ts
@@ -1,4 +1,5 @@
-import { chokidar, winPath, lodash, getAppPath } from '@fesjs/utils';
+import process from 'node:process';
+import { chokidar, getAppPath, lodash, winPath } from '@fesjs/utils';
 import { watchPkg } from './watchPkg';
 
 async function generateWhenFilesChange({ api }) {
@@ -36,15 +37,17 @@ async function generateWhenFilesChange({ api }) {
         type: api.ApplyPluginsType.add,
         initialValue: [paths.absPagesPath, getAppPath(paths.absSrcPath)],
     });
-    lodash.uniq(watcherPaths.map((p) => winPath(p))).forEach((p) => {
+    lodash.uniq(watcherPaths.map(p => winPath(p))).forEach((p) => {
         createWatcher(p);
     });
 
     return unwatch;
 }
 
 export async function startWatch(api) {
-    if (process.env.WATCH === 'none') return;
+    if (process.env.WATCH === 'none') {
+        return;
+    }
 
     let unwatchs = [];
     const restartServer = () => {
@@ -76,7 +79,7 @@ export async function startWatch(api) {
         onChange: async ({ pluginChanged, valueChanged }) => {
             if (pluginChanged.length) {
                 console.log();
-                api.logger.info(`Plugins of ${pluginChanged.map((p) => p.key).join(', ')} changed.`);
+                api.logger.info(`Plugins of ${pluginChanged.map(p => p.key).join(', ')} changed.`);
                 restartServer();
             }
             if (valueChanged.length) {
@@ -102,7 +105,8 @@ export async function startWatch(api) {
                     console.log();
                     api.logger.info(`Config ${reloadConfigs.join(', ')} changed.`);
                     restartServer();
-                } else {
+                }
+                else {
                     api.service.userConfig = api.service.configInstance.getUserConfig();
 
                     await api.setConfig();
@@ -112,8 +116,9 @@ export async function startWatch(api) {
                             key: 'onGenerateFiles',
                             type: api.ApplyPluginsType.event,
                         });
-                    } else {
-                        fns.forEach((fn) => fn());
+                    }
+                    else {
+                        fns.forEach(fn => fn());
                     }
                 }
             }
diff --git a/packages/preset-built-in/src/plugins/watch/watchPkg.ts b/packages/preset-built-in/src/plugins/watch/watchPkg.ts
@@ -1,26 +1,22 @@
-/**
- * @copy 该文件代码大部分出自 umi，有需要请参考：
- * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/dev/watchPkg.ts
- */
-
-import { join } from 'path';
-import { chokidar, winPath, lodash } from '@fesjs/utils';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { isPluginOrPreset, PluginType } from '@fesjs/compiler';
+import { chokidar, lodash, winPath } from '@fesjs/utils';
 
 function getPlugins(opts) {
     return Object.keys({
         ...opts.pkg.dependencies,
         ...opts.pkg.devDependencies,
-    }).filter((name) => isPluginOrPreset(PluginType.plugin, name) || isPluginOrPreset(PluginType.preset, name));
+    }).filter(name => isPluginOrPreset(PluginType.plugin, name) || isPluginOrPreset(PluginType.preset, name));
 }
 
 function getPluginsFromPkgPath(opts) {
     let pkg = {};
     if (existsSync(opts.pkgPath)) {
         try {
             pkg = JSON.parse(readFileSync(opts.pkgPath, 'utf-8'));
-        } catch (e) {
+        }
+        catch (e) {
             // ignore
         }
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,11 @@ export default class Config {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`async requireConfigs(configFiles: string[]): Promise<any[]> {`
`145`		`- const models = await Promise.all(configFiles.map(f => {`
	`145`	`+ const models = await Promise.all(configFiles.map((f) => {`
`146`	`146`	`// 使用 pathToFileURL 确保在 Windows 下路径格式正确`
`147`	`147`	`const fileUrl = pathToFileURL(f).href;`
`148`		`- return import(fileUrl);`
	`148`	`+ // 避免命中模块缓存`
	`149`	+ return import(`${fileUrl}?t=${Date.now()}`);
`149`	`150`	`}));`
`150`	`151`	`return models.map(m => compatESModuleRequire(m));`
`151`	`152`	`}`