@4399ywkf/core 5.3.1 → 5.4.1

package/dist/rspack/index.js

@@ -150,9 +150,7 @@ var browserCheckPlugin = createPlugin((options = {}) => ({
       }
     }
     const minVersions = explicitVersions ? { ...baseVersions, ...explicitVersions } : baseVersions;
-    logger.info(
-      `\u6D4F\u89C8\u5668\u517C\u5BB9\u6027\u68C0\u67E5\u5DF2\u542F\u7528 (\u7279\u6027\u68C0\u6D4B: ${features.join(", ")})`
-    );
+    logger.info(`\u6D4F\u89C8\u5668\u517C\u5BB9\u6027\u68C0\u67E5\u5DF2\u542F\u7528 (\u7279\u6027\u68C0\u6D4B: ${features.join(", ")})`);
     logger.info(
       `\u6700\u4F4E\u7248\u672C\u8981\u6C42: Chrome ${minVersions.chrome ?? "\u2014"}, Edge ${minVersions.edge ?? "\u2014"}, Firefox ${minVersions.firefox ?? "\u2014"}, Safari ${minVersions.safari ?? "\u2014"}${fromBrowserslist !== false ? " (\u4ECE browserslist \u8BFB\u53D6)" : ""}`
     );
@@ -192,7 +190,7 @@ var browserCheckPlugin = createPlugin((options = {}) => ({
         const insertIndex = lastImportIndex >= 0 ? lastImportIndex + 1 : 0;
         lines.splice(insertIndex, 0, checkBlock);
         let result = lines.join("\n");
-        result = result.replace(
+        result = result.replaceAll(
           /(\s*)(await\s+)?runApp\(\);?/g,
           (_, indent, awaitKw) => `${indent}if (__ywkfBrowserOk) { ${awaitKw || ""}runApp(); }`
         );
@@ -216,37 +214,39 @@ function buildFeatureChecks(features) {
   return lines;
 }
 function buildVersionChecks(minVersions) {
-  const entries = Object.entries(minVersions).filter(
-    ([, v]) => v != null
-  );
+  const entries = Object.entries(minVersions).filter(([, v]) => v != null);
   if (entries.length === 0) return [];
   const lines = ["// UA \u7248\u672C\u68C0\u6D4B", "const ua = navigator.userAgent;"];
   for (const [browser, minVer] of entries) {
     switch (browser) {
-      case "chrome":
+      case "chrome": {
         lines.push(
           `const chromeMatch = /Chrome\\/(\\d+)/.exec(ua);`,
           `if (chromeMatch && !/Edg\\//.test(ua) && Number(chromeMatch[1]) < ${minVer}) return false;`
         );
         break;
-      case "edge":
+      }
+      case "edge": {
         lines.push(
           `const edgeMatch = /Edg\\/(\\d+)/.exec(ua);`,
           `if (edgeMatch && Number(edgeMatch[1]) < ${minVer}) return false;`
         );
         break;
-      case "firefox":
+      }
+      case "firefox": {
         lines.push(
           `const firefoxMatch = /Firefox\\/(\\d+)/.exec(ua);`,
           `if (firefoxMatch && Number(firefoxMatch[1]) < ${minVer}) return false;`
         );
         break;
-      case "safari":
+      }
+      case "safari": {
         lines.push(
           `const safariMatch = /Version\\/(\\d+\\.?\\d*)/.exec(ua);`,
           `if (safariMatch && /Safari/.test(ua) && !/Chrome/.test(ua) && Number(safariMatch[1]) < ${minVer}) return false;`
         );
         break;
+      }
     }
   }
   return lines;
@@ -339,9 +339,9 @@ function readBrowserslistFile(filePath) {
 function extractMinVersions(queries) {
   const result = {};
   const expanded = queries.flatMap((q) => q.split(",").map((s) => s.trim()));
-  const versionPattern = /^(\w+)\s*(?:(>=?)\s*)?(\d+(?:\.\d+)?)\s*$/i;
+  const versionPattern = /^([a-z_]+)\s*(?:(>=?)\s*)?(\d+(?:\.\d+)?)\s*$/i;
   for (const query of expanded) {
-    if (/^(not|dead|last|defaults|>?\s*\d+%|unreleased|current)/i.test(query)) {
+    if (/^(?:not|dead|last|defaults|>?\s*\d+%|unreleased|current)/i.test(query)) {
       continue;
     }
     const match = versionPattern.exec(query);
@@ -382,7 +382,7 @@ var garfishPlugin = createPlugin((options = {}) => ({
           rspackConfig.devServer = {
             ...rspackConfig.devServer,
             headers: {
-              ...rspackConfig.devServer?.headers || {},
+              ...rspackConfig.devServer?.headers,
               "Access-Control-Allow-Origin": "*",
               "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
               "Access-Control-Allow-Headers": "*"
@@ -626,7 +626,7 @@ function scaffoldSourceFiles(cwd, sourceDir, namespaces, logger) {
   }
   const indexPath = join3(dir, "index.ts");
   if (!existsSync3(indexPath)) {
-    const imports = namespaces.map((ns) => `import ${ns} from "./${ns}";`).join("\n");
+    const imports = namespaces.map((ns) => `import ${ns} from './${ns}';`).join("\n");
     const entries = namespaces.join(",\n  ");
     const content = `${imports}
 
@@ -643,19 +643,19 @@ export default resources;
 function buildDefaultNsFile(ns) {
   if (ns === "common") {
     return `export default {
-  welcome: "\u6B22\u8FCE\u4F7F\u7528",
-  loading: "\u52A0\u8F7D\u4E2D...",
-  confirm: "\u786E\u5B9A",
-  cancel: "\u53D6\u6D88",
-  save: "\u4FDD\u5B58",
-  delete: "\u5220\u9664",
-  edit: "\u7F16\u8F91",
-  back: "\u8FD4\u56DE",
+  welcome: '\u6B22\u8FCE\u4F7F\u7528',
+  loading: '\u52A0\u8F7D\u4E2D...',
+  confirm: '\u786E\u5B9A',
+  cancel: '\u53D6\u6D88',
+  save: '\u4FDD\u5B58',
+  delete: '\u5220\u9664',
+  edit: '\u7F16\u8F91',
+  back: '\u8FD4\u56DE',
 } as const;
 `;
   }
   return `export default {
-  title: "${ns}",
+  title: '${ns}',
 } as const;
 `;
 }
@@ -663,11 +663,11 @@ function scaffoldResourcesFile(cwd, sourceDir, _namespaces, locales, defaultLoca
   const parentDir = join3(cwd, sourceDir, "..");
   const filePath = join3(parentDir, "resources.ts");
   if (existsSync3(filePath)) return;
-  const content = `import resources from "./default";
+  const content = `import type resources from './default';
 
-export const DEFAULT_LOCALE = "${defaultLocale}";
+export const DEFAULT_LOCALE = '${defaultLocale}';
 
-export const SUPPORTED_LOCALES = ${JSON.stringify(locales)} as const;
+export const SUPPORTED_LOCALES = [${locales.map((l) => `'${l}'`).join(", ")}] as const;
 
 export type SupportedLocale = (typeof SUPPORTED_LOCALES)[number];
 
@@ -679,7 +679,7 @@ export const normalizeLocale = (locale?: string): SupportedLocale => {
   if (!locale) return DEFAULT_LOCALE as SupportedLocale;
 
   for (const l of SUPPORTED_LOCALES) {
-    if (l.startsWith(locale) || locale.startsWith(l.split("-")[0])) {
+    if (l.startsWith(locale) || locale.startsWith(l.split('-')[0])) {
       return l;
     }
   }
@@ -687,11 +687,9 @@ export const normalizeLocale = (locale?: string): SupportedLocale => {
   return DEFAULT_LOCALE as SupportedLocale;
 };
 
-export const localeOptions = ${JSON.stringify(
-    locales.map((l) => ({ value: l, label: getLocaleLabel(l) })),
-    null,
-    2
-  )} as const;
+export const localeOptions = [
+${locales.map((l) => `  { value: '${l}', label: '${getLocaleLabel(l)}' },`).join("\n")}
+] as const;
 `;
   writeFileSync2(filePath, content, "utf-8");
   logger.info(`\u5DF2\u751F\u6210\u7C7B\u578B\u6587\u4EF6: ${sourceDir}/../resources.ts`);
@@ -710,35 +708,35 @@ function getLocaleLabel(locale) {
     "ru-RU": "\u0420\u0443\u0441\u0441\u043A\u0438\u0439",
     "it-IT": "Italiano",
     "vi-VN": "Ti\u1EBFng Vi\u1EC7t",
-    ar: "\u0627\u0644\u0639\u0631\u0628\u064A\u0629"
+    "ar": "\u0627\u0644\u0639\u0631\u0628\u064A\u0629"
   };
   return map[locale] || locale;
 }
 function scaffoldConvertScript(cwd, sourceDir, localesDir, defaultLocale, logger) {
   const scriptsDir = join3(cwd, "scripts");
-  const scriptPath = join3(scriptsDir, "i18n-gen.js");
-  if (existsSync3(scriptPath)) return;
+  const scriptPath = join3(scriptsDir, "i18n-gen.cjs");
+  if (existsSync3(scriptPath) || existsSync3(join3(scriptsDir, "i18n-gen.js"))) return;
   if (!existsSync3(scriptsDir)) {
     mkdirSync(scriptsDir, { recursive: true });
   }
-  const content = `const fs = require("fs");
-const path = require("path");
+  const content = `const fs = require('node:fs');
+const path = require('node:path');
 
-const sourceDir = path.join(__dirname, "../${sourceDir}");
-const targetDir = path.join(__dirname, "../${localesDir}/${defaultLocale}");
+const sourceDir = path.join(__dirname, '../${sourceDir}');
+const targetDir = path.join(__dirname, '../${localesDir}/${defaultLocale}');
 
 const files = fs
   .readdirSync(sourceDir)
-  .filter((file) => file.endsWith(".ts") && file !== "index.ts")
-  .map((file) => path.basename(file, ".ts"));
+  .filter((file) => file.endsWith('.ts') && file !== 'index.ts')
+  .map((file) => path.basename(file, '.ts'));
 
-require("ts-node/register");
+require('ts-node/register');
 
 if (!fs.existsSync(targetDir)) {
   fs.mkdirSync(targetDir, { recursive: true });
 }
 
-console.log("\u5F00\u59CB\u8F6C\u6362 TypeScript \u6587\u4EF6\u5230 JSON...\\n");
+console.log('\u5F00\u59CB\u8F6C\u6362 TypeScript \u6587\u4EF6\u5230 JSON...\\n');
 
 files.forEach((fileName) => {
   try {
@@ -747,28 +745,28 @@ files.forEach((fileName) => {
     const moduleContent = require(modulePath).default;
     const jsonContent = JSON.stringify(moduleContent, null, 2);
     const targetPath = path.join(targetDir, \`\${fileName}.json\`);
-    fs.writeFileSync(targetPath, jsonContent, "utf8");
+    fs.writeFileSync(targetPath, jsonContent, 'utf8');
     console.log(\`  \${fileName}.ts \u2192 \${fileName}.json\`);
   } catch (error) {
     console.error(\`  \u8F6C\u6362 \${fileName}.ts \u5931\u8D25:\`, error.message);
   }
 });
 
-console.log("\\n\u8F6C\u6362\u5B8C\u6210\uFF01");
+console.log('\\n\u8F6C\u6362\u5B8C\u6210\uFF01');
 `;
   writeFileSync2(scriptPath, content, "utf-8");
-  logger.info("\u5DF2\u751F\u6210\u8F6C\u6362\u811A\u672C: scripts/i18n-gen.js");
+  logger.info("\u5DF2\u751F\u6210\u8F6C\u6362\u811A\u672C: scripts/i18n-gen.cjs");
 }
 function scaffoldI18nRc(cwd, localesDir, defaultLocale, locales, logger) {
   const filePath = join3(cwd, ".i18nrc.js");
   if (existsSync3(filePath)) return;
-  const outputLocales = locales.filter((l) => l !== defaultLocale).map((l) => `"${l}"`).join(", ");
-  const content = `const { defineConfig } = require("@4399ywkf/i18n");
+  const outputLocales = locales.filter((l) => l !== defaultLocale).map((l) => `'${l}'`).join(", ");
+  const content = `const { defineConfig } = require('@4399ywkf/i18n');
 
 module.exports = defineConfig({
-  entry: "${localesDir}/${defaultLocale}",
-  entryLocale: "${defaultLocale}",
-  output: "${localesDir}",
+  entry: '${localesDir}/${defaultLocale}',
+  entryLocale: '${defaultLocale}',
+  output: '${localesDir}',
   outputLocales: [${outputLocales}],
 });
 `;
@@ -787,15 +785,16 @@ function scaffoldLocaleJsonDirs(cwd, localesDir, locales, defaultLocale, namespa
       const filePath = join3(localeDir, `${ns}.json`);
       if (!existsSync3(filePath)) {
         const placeholder = ns === "common" ? JSON.stringify(
+          // 键按字母序排列，与 @4399ywkf/lint 的 Prettier（prettier-plugin-sort-json）一致
           {
-            welcome: "Welcome",
-            loading: "Loading...",
-            confirm: "OK",
+            back: "Back",
             cancel: "Cancel",
-            save: "Save",
+            confirm: "OK",
             delete: "Delete",
             edit: "Edit",
-            back: "Back"
+            loading: "Loading...",
+            save: "Save",
+            welcome: "Welcome"
           },
           null,
           2
@@ -861,7 +860,7 @@ function scanMockFiles(dir) {
   for (const entry of entries) {
     const fullPath = join4(dir, entry);
     const stat = statSync(fullPath);
-    if (stat.isFile() && /\.(ts|js|mjs)$/.test(entry)) {
+    if (stat.isFile() && /\.(?:ts|js|mjs)$/.test(entry)) {
       files.push(fullPath);
     } else if (stat.isDirectory()) {
       files.push(...scanMockFiles(fullPath));
@@ -1338,12 +1337,13 @@ function generateThemeProvider(opts) {
     scopePopupContainer
   } = opts;
   const isAutoLocale = locale === "auto";
-  const sections = [];
-  sections.push(`// \u6B64\u6587\u4EF6\u7531 @4399ywkf/plugin-theme v3 \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u624B\u52A8\u4FEE\u6539`);
-  sections.push(buildImports({ globalReset, cssVar, scopePopupContainer, locale }));
-  sections.push(TYPES_CODE);
-  sections.push(buildStoreCode({ defaultAppearance, primaryColor, neutralColor, locale }));
-  sections.push(HOOKS_CODE);
+  const sections = [
+    `// \u6B64\u6587\u4EF6\u7531 @4399ywkf/plugin-theme v3 \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u52FF\u624B\u52A8\u4FEE\u6539`,
+    buildImports({ globalReset, cssVar, scopePopupContainer, locale }),
+    TYPES_CODE,
+    buildStoreCode({ defaultAppearance, primaryColor, neutralColor, locale }),
+    HOOKS_CODE
+  ];
   if (globalReset) sections.push(GLOBAL_RESET_CODE);
   if (cssVar) sections.push(buildCssVarSyncCode());
   if (darkMode) sections.push(APPEARANCE_SYNC_CODE);
@@ -2038,18 +2038,58 @@ export type { StateCreator, StoreApi } from "zustand";
 
 // src/config/normalize.ts
 var BUILTIN_PLUGINS = [
-  { key: "reactQuery", factory: reactQueryPlugin, pluginName: "@4399ywkf/plugin-react-query" },
-  { key: "zustand", factory: zustandPlugin, pluginName: "@4399ywkf/plugin-zustand" },
-  { key: "tailwind", factory: tailwindPlugin, pluginName: "@4399ywkf/plugin-tailwind" }
+  {
+    key: "reactQuery",
+    factory: reactQueryPlugin,
+    pluginName: "@4399ywkf/plugin-react-query"
+  },
+  {
+    key: "zustand",
+    factory: zustandPlugin,
+    pluginName: "@4399ywkf/plugin-zustand"
+  },
+  {
+    key: "tailwind",
+    factory: tailwindPlugin,
+    pluginName: "@4399ywkf/plugin-tailwind"
+  }
 ];
 var OPTIONAL_PLUGINS = [
-  { key: "biome", factory: biomePlugin, pluginName: "@4399ywkf/plugin-biome" },
-  { key: "analytics", factory: analyticsPlugin, pluginName: "@4399ywkf/plugin-analytics" },
-  { key: "mock", factory: mockPlugin, pluginName: "@4399ywkf/plugin-mock" },
-  { key: "theme", factory: themePlugin, pluginName: "@4399ywkf/plugin-theme" },
-  { key: "i18n", factory: i18nPlugin, pluginName: "@4399ywkf/plugin-i18n" },
-  { key: "garfish", factory: garfishPlugin, pluginName: "@4399ywkf/plugin-garfish" },
-  { key: "browserCheck", factory: browserCheckPlugin, pluginName: "@4399ywkf/plugin-browser-check" }
+  {
+    key: "biome",
+    factory: biomePlugin,
+    pluginName: "@4399ywkf/plugin-biome"
+  },
+  {
+    key: "analytics",
+    factory: analyticsPlugin,
+    pluginName: "@4399ywkf/plugin-analytics"
+  },
+  {
+    key: "mock",
+    factory: mockPlugin,
+    pluginName: "@4399ywkf/plugin-mock"
+  },
+  {
+    key: "theme",
+    factory: themePlugin,
+    pluginName: "@4399ywkf/plugin-theme"
+  },
+  {
+    key: "i18n",
+    factory: i18nPlugin,
+    pluginName: "@4399ywkf/plugin-i18n"
+  },
+  {
+    key: "garfish",
+    factory: garfishPlugin,
+    pluginName: "@4399ywkf/plugin-garfish"
+  },
+  {
+    key: "browserCheck",
+    factory: browserCheckPlugin,
+    pluginName: "@4399ywkf/plugin-browser-check"
+  }
 ];
 var ALL_SHORTHAND_KEYS = /* @__PURE__ */ new Set([
   ...BUILTIN_PLUGINS.map((p) => p.key),
@@ -2086,7 +2126,7 @@ function winPath(path) {
   if (isExtendedLengthPath) {
     return path;
   }
-  return path.replace(/\\/g, "/");
+  return path.replaceAll("\\", "/");
 }
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set([
   "components",
@@ -2222,16 +2262,16 @@ var ConventionalRouteGenerator = class {
    */
   resolveRoutePath(dirName, parentPath) {
     let segment;
-    if (dirName.match(/^\[\.\.\.(.+)\]$/)) {
+    if (/^\[\.\.\..+\]$/.test(dirName)) {
       segment = "*";
-    } else if (dirName.match(/^\[(.+)\$\]$/)) {
+    } else if (/^\[.+\$\]$/.test(dirName)) {
       const param = dirName.slice(1, -2);
       segment = `:${param}?`;
-    } else if (dirName.match(/^\[(.+)\]$/)) {
+    } else if (/^\[.+\]$/.test(dirName)) {
       const param = dirName.slice(1, -1);
       segment = `:${param}`;
     } else if (dirName.includes(".")) {
-      segment = dirName.replace(/\./g, "/");
+      segment = dirName.replaceAll(".", "/");
     } else {
       segment = dirName;
     }
@@ -2242,7 +2282,7 @@ var ConventionalRouteGenerator = class {
    */
   generateRouteName(path) {
     const name = path.split("/").filter(Boolean).map((s) => s.replace(/^:/, "Param").replace(/\?$/, "Optional").replace(/^\*$/, "CatchAll")).map((s) => {
-      const cleaned = s.replace(/[^a-zA-Z0-9]/g, "");
+      const cleaned = s.replaceAll(/[^a-z0-9]/gi, "");
       if (!cleaned) return "";
       return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
     }).join("");
@@ -2362,9 +2402,7 @@ export default routes;
         );
       }
       if (route.errorFile) {
-        errorImports.push(
-          `import ${name}Error from "@/pages/${toImportPath(route.errorFile)}";`
-        );
+        errorImports.push(`import ${name}Error from "@/pages/${toImportPath(route.errorFile)}";`);
       }
       if (route.loadingFile) {
         loadingImports.push(
@@ -2875,7 +2913,7 @@ var YwkfGenerator = class {
    * 标准化内容（去掉时间戳等动态部分）
    */
   normalizeContent(content) {
-    return content.replace(/\/\/ Generated at: .+/g, "").replace(/\/\*\* Generated at: .+ \*\//g, "");
+    return content.replaceAll(/\/\/ Generated at: .+/g, "").replaceAll(/\/\*\* Generated at: .+ \*\//g, "");
   }
 };
 
@@ -3095,7 +3133,16 @@ function resolveYwkfBuildId(appName) {
 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, reactCompiler } = config;
+  const {
+    appName,
+    appCName,
+    output,
+    html,
+    alias: userAlias,
+    microFrontend,
+    router,
+    reactCompiler
+  } = config;
   const buildId = resolveYwkfBuildId(appName);
   const { env: clientEnv, dropped: droppedEnvKeys } = buildClientEnv({ cwd, env: config.env });
   if (droppedEnvKeys.length > 0) {
@@ -3128,7 +3175,7 @@ function createBaseConfig(config, cwd, options = {}) {
         ...alias,
         "process/browser.js": require2.resolve("process/browser.js"),
         "process/browser": require2.resolve("process/browser.js"),
-        react: resolveApp("node_modules/react"),
+        "react": resolveApp("node_modules/react"),
         "react-dom": resolveApp("node_modules/react-dom"),
         "react-router": resolveApp("node_modules/react-router")
       },