@4399ywkf/core 5.1.1 → 5.1.2

package/dist/cli/index.js

@@ -879,7 +879,7 @@ function createMockMiddleware(mockPath, options) {
   scanMockFiles(mockPath);
   return async (_req, _res, next) => {
     if (delay > 0) {
-      await new Promise((resolve4) => setTimeout(resolve4, delay));
+      await new Promise((resolve5) => setTimeout(resolve5, delay));
     }
     next();
   };
@@ -1833,11 +1833,11 @@ var zustandPlugin = createPlugin((options = {}) => ({
     const hooks = {
       modifyRspackConfig(rspackConfig) {
         logger.info("Zustand \u5DF2\u542F\u7528");
-        const resolve4 = rspackConfig.resolve || {};
-        const alias = resolve4.alias || {};
+        const resolve5 = rspackConfig.resolve || {};
+        const alias = resolve5.alias || {};
         alias["@store"] = storePath;
-        resolve4.alias = alias;
-        rspackConfig.resolve = resolve4;
+        resolve5.alias = alias;
+        rspackConfig.resolve = resolve5;
         return rspackConfig;
       },
       generateFiles(_ctx) {
@@ -2191,32 +2191,39 @@ function findConfigFile(cwd) {
   }
   return null;
 }
-async function loadTsConfig(configPath) {
+async function loadTsConfig(configPath, fresh = false) {
   const jiti = (await import("jiti")).default;
   const loader = jiti(configPath, {
-    interopDefault: true
+    interopDefault: true,
+    // fresh(热重启)时必须禁用缓存:jiti 的 moduleCache 默认与 Node 原生 require 缓存集成,
+    // 即使新建 jiti 实例,loader(configPath) 仍会命中 Node 全局缓存读回旧配置;
+    // fsCache 为转译产物缓存,一并关闭以确保读到最新源码。
+    ...fresh ? { moduleCache: false, fsCache: false } : {}
   });
   const config = loader(configPath);
   return config.default || config;
 }
-async function loadJsConfig(configPath) {
-  const fileUrl = pathToFileURL(configPath).href;
+async function loadJsConfig(configPath, fresh = false) {
+  let fileUrl = pathToFileURL(configPath).href;
+  if (fresh) {
+    fileUrl += `?t=${Date.now()}`;
+  }
   const module = await import(fileUrl);
   return module.default || module;
 }
-async function loadConfigFile(configPath) {
+async function loadConfigFile(configPath, opts = {}) {
   const ext = extname(configPath);
   if (ext === ".ts" || ext === ".mts") {
-    return loadTsConfig(configPath);
+    return loadTsConfig(configPath, opts.fresh);
   }
-  return loadJsConfig(configPath);
+  return loadJsConfig(configPath, opts.fresh);
 }
 function mergeConfig(userConfig, baseConfig = defaultConfig) {
   return deepmerge(baseConfig, userConfig, {
     arrayMerge: (_, sourceArray) => sourceArray
   });
 }
-async function resolveConfig(cwd) {
+async function resolveConfig(cwd, opts = {}) {
   const configPath = findConfigFile(cwd);
   if (!configPath) {
     console.warn("\u26A0\uFE0F  \u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6 (ywkf.config.ts)\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E");
@@ -2226,7 +2233,7 @@ async function resolveConfig(cwd) {
     };
   }
   try {
-    const userConfig = await loadConfigFile(configPath);
+    const userConfig = await loadConfigFile(configPath, opts);
     const normalized = normalizeConfig(userConfig);
     const config = mergeConfig(normalized);
     return { config, configPath };
@@ -3374,16 +3381,6 @@ var YwkfGeneratorPlugin = class {
     );
     this.initialized = true;
   }
-  resetState() {
-    this.initialized = false;
-    this.pluginHooks = [];
-    this.generator = null;
-  }
-  async regenerate() {
-    if (this.generator) {
-      await this.generator.generate();
-    }
-  }
   apply(compiler) {
     const pluginName = "YwkfGeneratorPlugin";
     compiler.hooks.beforeCompile.tapAsync(pluginName, async (_params, callback) => {
@@ -3399,14 +3396,13 @@ var YwkfGeneratorPlugin = class {
       }
     });
     if (this.options.isDev && !this.isWatching) {
-      this.watchPages();
-      this.watchConfig();
+      this.watchPages(compiler);
     }
   }
   /**
    * 监听页面目录变化
    */
-  watchPages() {
+  watchPages(compiler) {
     const { config, cwd } = this.options;
     const pagesDir = join11(cwd, config.router.pagesDir || "src/pages");
     if (!existsSync11(pagesDir)) {
@@ -3428,47 +3424,11 @@ var YwkfGeneratorPlugin = class {
         }
       }, 500);
     });
-    process.on("exit", () => {
-      watcher.close();
-    });
-  }
-  /**
-   * 监听配置文件变化，重新加载配置并重新生成 .ywkf 文件
-   */
-  watchConfig() {
-    const { cwd } = this.options;
-    const configPath = findConfigFile(cwd);
-    if (!configPath) {
-      return;
-    }
-    let debounceTimer = null;
-    const watcher = watch(configPath, async () => {
-      if (debounceTimer) {
-        clearTimeout(debounceTimer);
-      }
-      debounceTimer = setTimeout(async () => {
-        try {
-          console.log(`
-  [ywkf] \u68C0\u6D4B\u5230\u914D\u7F6E\u6587\u4EF6\u53D8\u5316\uFF0C\u91CD\u65B0\u751F\u6210 .ywkf \u76EE\u5F55...
-`);
-          const userConfig = await loadConfigFile(configPath);
-          const newConfig = mergeConfig(userConfig);
-          this.options.config = newConfig;
-          this.options.pluginConfigs = newConfig.plugins;
-          this.resetState();
-          await this.initialize();
-          await this.regenerate();
-          console.log(
-            `  [ywkf] .ywkf \u76EE\u5F55\u5DF2\u91CD\u65B0\u751F\u6210\u3002\u90E8\u5206\u914D\u7F6E\u53D8\u66F4\uFF08\u5982\u7AEF\u53E3\u3001\u4EE3\u7406\uFF09\u9700\u91CD\u542F dev server \u751F\u6548\u3002
-`
-          );
-        } catch (error) {
-          console.error(`  [ywkf] \u914D\u7F6E\u91CD\u8F7D\u5931\u8D25:`, error);
-        }
-      }, 500);
-    });
-    process.on("exit", () => {
+    compiler.hooks.shutdown.tap("YwkfGeneratorPlugin", () => {
+      if (debounceTimer) clearTimeout(debounceTimer);
       watcher.close();
+      this.isWatching = false;
+      this.hasGenerated = false;
     });
   }
 };
@@ -4338,7 +4298,7 @@ function createProgressHandler(printer) {
     printer.updateProgress(percent, message);
   };
 }
-function registerShortcuts(printer, opts) {
+function registerShortcuts(getPrinter, opts) {
   if (!process.stdin.isTTY) return;
   process.stdin.setEncoding("utf-8");
   process.stdin.setRawMode?.(false);
@@ -4350,10 +4310,10 @@ function registerShortcuts(printer, opts) {
     buffer = "";
     switch (cmd) {
       case "h":
-        printer.printShortcuts();
+        getPrinter().printShortcuts();
         break;
       case "o": {
-        const url = `http://localhost:${opts.port}/`;
+        const url = `http://localhost:${opts.getPort()}/`;
         import("child_process").then((cp) => {
           const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
           cp.exec(`${command} ${url}`);
@@ -4435,7 +4395,7 @@ async function build(options = {}) {
     rspackConfig.stats = "none";
     rspackConfig.infrastructureLogging = { level: "none" };
     const compiler = rspack4(rspackConfig);
-    const stats = await new Promise((resolve4, reject) => {
+    const stats = await new Promise((resolve5, reject) => {
       compiler.run((err, stats2) => {
         if (err) {
           reject(err);
@@ -4445,13 +4405,13 @@ async function build(options = {}) {
           reject(new Error("Build failed: no stats available"));
           return;
         }
-        resolve4(stats2);
+        resolve5(stats2);
       });
     });
-    await new Promise((resolve4, reject) => {
+    await new Promise((resolve5, reject) => {
       compiler.close((err) => {
         if (err) reject(err);
-        else resolve4();
+        else resolve5();
       });
     });
     const hasErrors = stats.hasErrors();
@@ -4482,17 +4442,17 @@ import chalk3 from "chalk";
 // src/cli/port.ts
 import net from "net";
 function isPortAvailable(port, host) {
-  return new Promise((resolve4) => {
+  return new Promise((resolve5) => {
     const server = net.createServer();
     server.once("error", (err) => {
       if (err.code === "EADDRINUSE") {
-        resolve4(false);
+        resolve5(false);
       } else {
-        resolve4(false);
+        resolve5(false);
       }
     });
     server.once("listening", () => {
-      server.close(() => resolve4(true));
+      server.close(() => resolve5(true));
     });
     server.listen(port, host);
   });
@@ -4509,88 +4469,211 @@ async function getAvailablePort(preferredPort, host) {
   );
 }
 
+// src/cli/restart-watcher.ts
+import { existsSync as existsSync13, watch as watch2 } from "fs";
+import { resolve as resolve4 } from "path";
+function isTriggerFile(filename, mode) {
+  if (!filename) return false;
+  if (CONFIG_FILES.includes(filename)) return true;
+  if (filename === ".env" || filename === ".env.public" || filename === `.env.${mode}`) {
+    return true;
+  }
+  return false;
+}
+function normalizeFilename(filename) {
+  if (typeof filename === "string") return filename;
+  if (Buffer.isBuffer(filename)) return filename.toString("utf8");
+  return null;
+}
+function watchForRestart(opts) {
+  const { cwd, mode, onChange, debounceMs = 300 } = opts;
+  const watchers = [];
+  let timer = null;
+  const trigger = (filename) => {
+    const name = normalizeFilename(filename);
+    if (!isTriggerFile(name, mode)) return;
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(() => {
+      timer = null;
+      Promise.resolve(onChange()).catch((err) => {
+        console.error("[ywkf] \u81EA\u52A8\u91CD\u542F\u56DE\u8C03\u51FA\u9519:", err);
+      });
+    }, debounceMs);
+  };
+  watchers.push(watch2(cwd, { recursive: false }, (_event, filename) => trigger(filename)));
+  const envDir = resolve4(cwd, "config/env");
+  if (existsSync13(envDir)) {
+    watchers.push(watch2(envDir, { recursive: false }, (_event, filename) => trigger(filename)));
+  }
+  return {
+    close: () => {
+      if (timer) clearTimeout(timer);
+      for (const w of watchers) w.close();
+    }
+  };
+}
+
 // src/cli/dev.ts
-async function dev(options = {}) {
-  const cwd = options.cwd || process.cwd();
-  const mode = options.mode || "development";
-  try {
-    preloadEnv(cwd, mode, "development");
-    const { config } = await resolveConfig(cwd);
-    loadEnv(config, cwd, mode, "development");
-    const pluginManager = new PluginManager(config, cwd, true);
-    if (config.plugins && config.plugins.length > 0) {
-      await pluginManager.loadPlugins(config.plugins);
+function restoreEnv(snapshot) {
+  for (const key of Object.keys(process.env)) {
+    if (!(key in snapshot)) {
+      delete process.env[key];
     }
-    await pluginManager.runBeforeDevServer();
-    let rspackConfig = createRspackConfig(config, cwd, { isDev: true });
-    rspackConfig = await pluginManager.applyRspackConfigHooks(rspackConfig);
-    const host = config.dev.host || "localhost";
-    const preferredPort = config.dev.port || 3e3;
-    const port = await getAvailablePort(preferredPort, host);
-    const pluginNames = pluginManager.getPluginNames();
-    if (port !== preferredPort) {
-      console.log(chalk3.yellow(`  Port ${preferredPort} is in use, using ${port} instead.
+  }
+  for (const key of Object.keys(snapshot)) {
+    process.env[key] = snapshot[key];
+  }
+}
+async function loadFullConfig(cwd, mode, envSnapshot, opts = {}) {
+  restoreEnv(envSnapshot);
+  preloadEnv(cwd, mode, "development");
+  const { config } = await resolveConfig(cwd, { fresh: opts.fresh });
+  loadEnv(config, cwd, mode, "development");
+  return config;
+}
+async function startDevServer(cwd, config) {
+  const pluginManager = new PluginManager(config, cwd, true);
+  if (config.plugins && config.plugins.length > 0) {
+    await pluginManager.loadPlugins(config.plugins);
+  }
+  await pluginManager.runBeforeDevServer();
+  let rspackConfig = createRspackConfig(config, cwd, { isDev: true });
+  rspackConfig = await pluginManager.applyRspackConfigHooks(rspackConfig);
+  const host = config.dev.host || "localhost";
+  const preferredPort = config.dev.port || 3e3;
+  const port = await getAvailablePort(preferredPort, host);
+  const pluginNames = pluginManager.getPluginNames();
+  if (port !== preferredPort) {
+    console.log(chalk3.yellow(`  Port ${preferredPort} is in use, using ${port} instead.
 `));
-    }
-    const printer = new DevPrinter(host, port, pluginNames);
-    printer.printBanner();
-    printer.printBuildStart();
-    printer.updateProgress(0, "preparing");
-    rspackConfig.plugins = rspackConfig.plugins || [];
-    rspackConfig.plugins.push(new rspack5.ProgressPlugin(createProgressHandler(printer)));
-    rspackConfig.stats = "none";
-    rspackConfig.infrastructureLogging = { level: "none" };
-    if (rspackConfig.devServer) {
-      const ds = rspackConfig.devServer;
-      const existingClient = ds.client ?? {};
-      ds.client = {
-        ...existingClient,
-        logging: "warn",
-        overlay: false,
-        progress: false
-      };
-    }
-    const compiler = rspack5(rspackConfig);
-    compiler.hooks.done.tap("ywkf-dev-printer", (stats) => {
-      const hasErrors = stats.hasErrors();
-      if (hasErrors) {
-        const info = stats.toJson({ errors: true });
-        console.log();
-        console.log(chalk3.red("  Compile error:"));
-        for (const err of info.errors || []) {
-          console.log(chalk3.red(`    ${err.message}`));
-        }
-        console.log();
+  }
+  const printer = new DevPrinter(host, port, pluginNames);
+  printer.printBanner();
+  printer.printBuildStart();
+  printer.updateProgress(0, "preparing");
+  rspackConfig.plugins = rspackConfig.plugins || [];
+  rspackConfig.plugins.push(new rspack5.ProgressPlugin(createProgressHandler(printer)));
+  rspackConfig.stats = "none";
+  rspackConfig.infrastructureLogging = { level: "none" };
+  if (rspackConfig.devServer) {
+    const ds = rspackConfig.devServer;
+    const existingClient = ds.client ?? {};
+    ds.client = {
+      ...existingClient,
+      logging: "warn",
+      overlay: false,
+      progress: false
+    };
+  }
+  const compiler = rspack5(rspackConfig);
+  compiler.hooks.done.tap("ywkf-dev-printer", (stats) => {
+    const hasErrors = stats.hasErrors();
+    if (hasErrors) {
+      const info = stats.toJson({ errors: true });
+      console.log();
+      console.log(chalk3.red("  Compile error:"));
+      for (const err of info.errors || []) {
+        console.log(chalk3.red(`    ${err.message}`));
       }
-      printer.printBuildDone(hasErrors);
-    });
-    compiler.hooks.invalid.tap("ywkf-dev-printer", () => {
-      printer.markRebuildStart();
-      printer.updateProgress(0, "rebuilding");
+      console.log();
+    }
+    printer.printBuildDone(hasErrors);
+  });
+  compiler.hooks.invalid.tap("ywkf-dev-printer", () => {
+    printer.markRebuildStart();
+    printer.updateProgress(0, "rebuilding");
+  });
+  const devServerOptions = {
+    ...rspackConfig.devServer || {},
+    host,
+    port,
+    setupExitSignals: false
+  };
+  const server = new RspackDevServer(devServerOptions, compiler);
+  await server.start();
+  await pluginManager.runAfterDevServer({ host, port });
+  let closed = false;
+  const close = async () => {
+    if (closed) return;
+    closed = true;
+    await server.stop();
+    await new Promise((resolve5, reject) => {
+      compiler.close((err) => {
+        if (err) reject(err);
+        else resolve5();
+      });
     });
-    const devServerOptions = {
-      ...rspackConfig.devServer || {},
-      host,
-      port
+  };
+  return { printer, host, port, close };
+}
+async function dev(options = {}) {
+  const cwd = options.cwd || process.cwd();
+  const mode = options.mode || "development";
+  const envSnapshot = { ...process.env };
+  try {
+    const config = await loadFullConfig(cwd, mode, envSnapshot);
+    let current = await startDevServer(cwd, config);
+    let shuttingDown = false;
+    const shutdown = async () => {
+      if (shuttingDown) return;
+      shuttingDown = true;
+      await current.close();
+      process.exit(0);
     };
-    const server = new RspackDevServer(devServerOptions, compiler);
-    await server.start();
-    await pluginManager.runAfterDevServer({ host, port });
-    registerShortcuts(printer, {
-      port,
+    registerShortcuts(() => current.printer, {
+      getPort: () => current.port,
       onQuit: async () => {
         console.log(chalk3.gray("\n  Shutting down...\n"));
-        await server.stop();
-        process.exit(0);
+        await shutdown();
       }
     });
     const signals = ["SIGINT", "SIGTERM"];
     for (const signal of signals) {
-      process.on(signal, async () => {
-        await server.stop();
-        process.exit(0);
+      process.on(signal, () => {
+        void shutdown();
       });
     }
+    let isRestarting = false;
+    let pending = false;
+    watchForRestart({
+      cwd,
+      mode,
+      onChange: async () => {
+        if (isRestarting) {
+          pending = true;
+          return;
+        }
+        isRestarting = true;
+        try {
+          do {
+            pending = false;
+            console.log(chalk3.cyan("\n  \u27F3 \u68C0\u6D4B\u5230\u914D\u7F6E\u53D8\u66F4\uFF0C\u6B63\u5728\u91CD\u542F dev server...\n"));
+            let nextConfig;
+            try {
+              nextConfig = await loadFullConfig(cwd, mode, envSnapshot, { fresh: true });
+            } catch (error) {
+              console.error(
+                chalk3.red("  \u2716 \u914D\u7F6E\u52A0\u8F7D\u5931\u8D25\uFF0C\u4FDD\u6301\u5F53\u524D dev server \u8FD0\u884C\uFF08\u4FEE\u6B63\u540E\u4FDD\u5B58\u53EF\u91CD\u8BD5\uFF09:")
+              );
+              console.error(error);
+              restoreEnv(envSnapshot);
+              continue;
+            }
+            try {
+              await current.close();
+              current = await startDevServer(cwd, nextConfig);
+            } catch (error) {
+              console.error(
+                chalk3.red("  \u2716 dev server \u91CD\u542F\u5931\u8D25\uFF0C\u5F53\u524D\u670D\u52A1\u4E0D\u53EF\u7528\uFF0C\u8BF7\u4FEE\u6B63\u540E\u4FDD\u5B58\u91CD\u8BD5:")
+              );
+              console.error(error);
+            }
+          } while (pending);
+        } finally {
+          isRestarting = false;
+        }
+      }
+    });
   } catch (error) {
     console.error();
     console.error(chalk3.red("  \u2716 Dev server failed to start"));