@4399ywkf/core 5.3.1 → 5.4.0

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": "*"
@@ -710,7 +710,7 @@ 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;
 }
@@ -861,7 +861,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 +1338,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 +2039,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 +2127,7 @@ function winPath(path) {
   if (isExtendedLengthPath) {
     return path;
   }
-  return path.replace(/\\/g, "/");
+  return path.replaceAll("\\", "/");
 }
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set([
   "components",
@@ -2222,16 +2263,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 +2283,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 +2403,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 +2914,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 +3134,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 +3176,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")
       },