@4399ywkf/core 5.1.3 → 5.1.5

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { G as GeneratorContext, e as PluginHooks, Y as YwkfConfig, f as PluginConfig } from './schema-C91lhskq.js';
-export { A as AnalyticsPluginOptions, h as BiomePluginOptions, j as BrowserCheckPluginOptions, k as BrowserMinVersions, y as BuildHooks, C as CodeInjection, D as DevServerConfig, E as EnvConfig, m as GarfishPluginOptions, F as GeneratedFile, J as GeneratorHooks, H as HtmlConfig, I as I18nPluginOptions, M as MicroFrontendConfig, q as MockPluginOptions, b as OutputConfig, P as PerformanceConfig, K as PluginContext, s as ReactQueryPluginOptions, R as RouterConfig, L as RouterHooks, N as RuntimeHooks, S as StyleConfig, u as TailwindPluginOptions, v as ThemePluginOptions, T as ToolsConfig, Q as YwkfPlugin, Z as ZustandPluginOptions, g as analyticsPlugin, i as biomePlugin, l as browserCheckPlugin, d as defaultConfig, a as defineConfig, n as garfishPlugin, o as getDefaultBiomeConfig, p as i18nPlugin, r as mockPlugin, t as reactQueryPlugin, w as tailwindPlugin, x as themePlugin, z as zustandPlugin } from './schema-C91lhskq.js';
+import { G as GeneratorContext, e as PluginHooks, Y as YwkfConfig, f as PluginConfig } from './schema-CuEnqbqQ.js';
+export { A as AnalyticsPluginOptions, h as BiomePluginOptions, j as BrowserCheckPluginOptions, k as BrowserMinVersions, y as BuildHooks, C as CodeInjection, D as DevServerConfig, E as EnvConfig, m as GarfishPluginOptions, F as GeneratedFile, J as GeneratorHooks, H as HtmlConfig, I as I18nPluginOptions, M as MicroFrontendConfig, q as MockPluginOptions, b as OutputConfig, P as PerformanceConfig, K as PluginContext, s as ReactQueryPluginOptions, R as RouterConfig, L as RouterHooks, N as RuntimeHooks, S as StyleConfig, u as TailwindPluginOptions, v as ThemePluginOptions, T as ToolsConfig, Q as YwkfPlugin, Z as ZustandPluginOptions, g as analyticsPlugin, i as biomePlugin, l as browserCheckPlugin, d as defaultConfig, a as defineConfig, n as garfishPlugin, o as getDefaultBiomeConfig, p as i18nPlugin, r as mockPlugin, t as reactQueryPlugin, w as tailwindPlugin, x as themePlugin, z as zustandPlugin } from './schema-CuEnqbqQ.js';
 import { Compiler } from '@rspack/core';
 export { PluginManager, createPlugin, definePlugin } from './plugin/index.js';
 export { ConventionalRouteGenerator, ConventionalRoutePlugin, ConventionalRoutePluginOptions, GeneratorOptions, RouteConfig, generateConventionalRoutes } from './router/index.js';

package/dist/index.js

@@ -2125,6 +2125,7 @@ var defaultConfig = {
   appName: "app",
   appCName: "\u5E94\u7528",
   strictMode: true,
+  reactCompiler: false,
   dev: {
     port: 3e3,
     host: "127.0.0.1",
@@ -3443,7 +3444,7 @@ var coreNodeModules = join12(__dirname, "../../node_modules");
 function createBaseConfig(config, cwd, options = {}) {
   const isDev = options.isDev ?? process.env.NODE_ENV !== "production";
   const { resolveApp } = createPathResolver(cwd);
-  const { appName, appCName, output, html, alias: userAlias, microFrontend, router } = config;
+  const { appName, appCName, output, html, alias: userAlias, microFrontend, router, reactCompiler } = config;
   const ywkfOutputDir = resolveApp(".ywkf");
   const defaultAlias = {
     "@": resolveApp("src"),
@@ -3529,7 +3530,8 @@ function createBaseConfig(config, cwd, options = {}) {
                       runtime: "automatic",
                       development: isDev,
                       refresh: isDev
-                    }
+                    },
+                    ...reactCompiler ? { reactCompiler } : {}
                   },
                   target: "es2015"
                 },
@@ -4447,33 +4449,74 @@ import { RspackDevServer } from "@rspack/dev-server";
 import chalk3 from "chalk";
 
 // src/cli/port.ts
+import { execFile } from "child_process";
 import net from "net";
-function isPortAvailable(port, host) {
-  return new Promise((resolve5) => {
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+var PortInUseError = class extends Error {
+  constructor(port, host) {
+    super(`Port ${port} is already in use on ${host}`);
+    this.port = port;
+    this.host = host;
+    this.name = "PortInUseError";
+  }
+};
+function ensurePortAvailable(port, host) {
+  return new Promise((resolve5, reject) => {
     const server = net.createServer();
     server.once("error", (err) => {
       if (err.code === "EADDRINUSE") {
-        resolve5(false);
+        reject(new PortInUseError(port, host));
       } else {
-        resolve5(false);
+        reject(err);
       }
     });
     server.once("listening", () => {
-      server.close(() => resolve5(true));
+      server.close(() => resolve5());
     });
     server.listen(port, host);
   });
 }
-async function getAvailablePort(preferredPort, host) {
-  const MAX_ATTEMPTS = 20;
-  for (let i = 0; i < MAX_ATTEMPTS; i++) {
-    const port = preferredPort + i;
-    const available = await isPortAvailable(port, host);
-    if (available) return port;
+async function findPortHolder(port) {
+  try {
+    if (process.platform === "win32") {
+      const { stdout: stdout2 } = await execFileAsync("netstat", ["-ano", "-p", "tcp"], {
+        timeout: 1500
+      });
+      const pid2 = parseWindowsNetstatPid(stdout2, port);
+      return pid2 === null ? null : { pid: pid2 };
+    }
+    const { stdout } = await execFileAsync(
+      "lsof",
+      ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"],
+      { timeout: 1500 }
+    );
+    const pid = Number.parseInt(stdout.trim().split(/\s+/)[0], 10);
+    if (!Number.isInteger(pid)) return null;
+    let name;
+    try {
+      const { stdout: comm } = await execFileAsync(
+        "ps",
+        ["-p", String(pid), "-o", "comm="],
+        { timeout: 1500 }
+      );
+      name = comm.trim().split("/").pop() || void 0;
+    } catch {
+    }
+    return { pid, name };
+  } catch {
+    return null;
   }
-  throw new Error(
-    `No available port found in range ${preferredPort}-${preferredPort + MAX_ATTEMPTS - 1}`
-  );
+}
+function parseWindowsNetstatPid(stdout, port) {
+  for (const line of stdout.split(/\r?\n/)) {
+    const parts = line.trim().split(/\s+/);
+    if (parts.length >= 5 && parts[3] === "LISTENING" && parts[1]?.endsWith(`:${port}`)) {
+      const pid = Number.parseInt(parts[4], 10);
+      if (Number.isInteger(pid)) return pid;
+    }
+  }
+  return null;
 }
 
 // src/cli/restart-watcher.ts
@@ -4538,6 +4581,22 @@ async function loadFullConfig(cwd, mode, envSnapshot, opts = {}) {
   loadEnv(config, cwd, mode, "development");
   return config;
 }
+async function renderPortInUseError(err) {
+  const holder = await findPortHolder(err.port);
+  console.error();
+  console.error(chalk3.red(`  \u2716 \u7AEF\u53E3 ${err.port} \u5DF2\u88AB\u5360\u7528\uFF0C\u65E0\u6CD5\u542F\u52A8 dev server`));
+  if (holder) {
+    const label = holder.name ? `${holder.name} ` : "";
+    const killCmd = process.platform === "win32" ? `taskkill /PID ${holder.pid} /F` : `kill ${holder.pid}`;
+    console.error(chalk3.gray(`    \u5360\u7528\u8FDB\u7A0B\uFF1A${label}(PID ${holder.pid})`));
+    console.error(chalk3.gray(`    \xB7 \u7ED3\u675F\u5B83\uFF1A${killCmd}`));
+    console.error(chalk3.gray("    \xB7 \u6216\u4FEE\u6539\u914D\u7F6E dev.port \u6362\u4E00\u4E2A\u7AEF\u53E3"));
+  } else {
+    console.error(chalk3.gray("    \xB7 \u4FEE\u6539\u914D\u7F6E dev.port \u6362\u4E00\u4E2A\u7AEF\u53E3"));
+    console.error(chalk3.gray("    \xB7 \u6216\u5148\u91CA\u653E\u5360\u7528\u8BE5\u7AEF\u53E3\u7684\u8FDB\u7A0B"));
+  }
+  console.error();
+}
 async function startDevServer(cwd, config) {
   const pluginManager = new PluginManager(config, cwd, true);
   if (config.plugins && config.plugins.length > 0) {
@@ -4547,13 +4606,9 @@ async function startDevServer(cwd, config) {
   let rspackConfig = createRspackConfig(config, cwd, { isDev: true });
   rspackConfig = await pluginManager.applyRspackConfigHooks(rspackConfig);
   const host = config.dev.host || "127.0.0.1";
-  const preferredPort = config.dev.port || 3e3;
-  const port = await getAvailablePort(preferredPort, host);
+  const port = config.dev.port || 3e3;
+  await ensurePortAvailable(port, 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();
@@ -4671,10 +4726,17 @@ async function dev(options = {}) {
               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);
+              if (error instanceof PortInUseError) {
+                await renderPortInUseError(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")
+                );
+              } else {
+                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 {
@@ -4683,6 +4745,10 @@ async function dev(options = {}) {
       }
     });
   } catch (error) {
+    if (error instanceof PortInUseError) {
+      await renderPortInUseError(error);
+      process.exit(1);
+    }
     console.error();
     console.error(chalk3.red("  \u2716 Dev server failed to start"));
     console.error(error);