@4399ywkf/core 5.0.10 → 5.0.12

package/dist/index.js

@@ -155,8 +155,21 @@ import { existsSync as existsSync4, mkdirSync as mkdirSync2, writeFileSync as wr
 import { join as join3 } from "path";
 
 // src/router/generator.ts
-import { existsSync as existsSync2, readdirSync, statSync, mkdirSync, writeFileSync } from "fs";
+import {
+  existsSync as existsSync2,
+  readdirSync,
+  statSync,
+  mkdirSync,
+  writeFileSync
+} from "fs";
 import { join, relative } from "path";
+function winPath(path) {
+  const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+  if (isExtendedLengthPath) {
+    return path;
+  }
+  return path.replace(/\\/g, "/");
+}
 var EXCLUDED_DIRS = /* @__PURE__ */ new Set([
   "components",
   "hooks",
@@ -213,14 +226,17 @@ var ConventionalRouteGenerator = class {
         );
         if (pathlessLayout) {
           const pathlessChildren = this.scanDirectory(subDirPath, routePath);
+          const pathlessLayoutRel = winPath(
+            relative(this.options.pagesDir, join(subDirPath, pathlessLayout))
+          );
           childRoutes.push({
             path: routePath,
             name: this.generateRouteName(subDir.slice(2)),
-            layoutFile: relative(this.options.pagesDir, join(subDirPath, pathlessLayout)),
+            layoutFile: pathlessLayoutRel,
             isLayout: true,
             pathless: true,
             children: pathlessChildren.filter(
-              (r) => r.layoutFile !== relative(this.options.pagesDir, join(subDirPath, pathlessLayout))
+              (r) => r.layoutFile !== pathlessLayoutRel
             )
           });
         } else {
@@ -232,7 +248,7 @@ var ConventionalRouteGenerator = class {
       childRoutes.push(...this.scanDirectory(subDirPath, subRoutePath));
     }
     const routeName = this.generateRouteName(routePath);
-    const relPath = (file) => relative(this.options.pagesDir, join(dir, file));
+    const relPath = (file) => winPath(relative(this.options.pagesDir, join(dir, file)));
     if (layoutFile) {
       const layoutChildren = [];
       if (pageFile) {
@@ -378,26 +394,39 @@ export default routes;
       const toImportPath = (f) => f.replace(/\.(tsx?|jsx?)$/, "");
       if (route.isLayout && route.layoutFile) {
         lazyImports.push(
-          `const ${name}Layout = lazy(() => import("@/pages/${toImportPath(route.layoutFile)}"));`
+          `const ${name}Layout = lazy(() => import("@/pages/${toImportPath(
+            route.layoutFile
+          )}"));`
         );
       }
       if (route.file) {
         lazyImports.push(
-          `const ${name}Page = lazy(() => import("@/pages/${toImportPath(route.file)}"));`
+          `const ${name}Page = lazy(() => import("@/pages/${toImportPath(
+            route.file
+          )}"));`
         );
       }
       if (route.errorFile) {
         errorImports.push(
-          `const ${name}Error = lazy(() => import("@/pages/${toImportPath(route.errorFile)}"));`
+          `const ${name}Error = lazy(() => import("@/pages/${toImportPath(
+            route.errorFile
+          )}"));`
         );
       }
       if (route.loadingFile) {
         loadingImports.push(
-          `const ${name}Loading = lazy(() => import("@/pages/${toImportPath(route.loadingFile)}"));`
+          `const ${name}Loading = lazy(() => import("@/pages/${toImportPath(
+            route.loadingFile
+          )}"));`
         );
       }
       if (route.children) {
-        this.collectImports(route.children, lazyImports, errorImports, loadingImports);
+        this.collectImports(
+          route.children,
+          lazyImports,
+          errorImports,
+          loadingImports
+        );
       }
     }
   }
@@ -423,7 +452,9 @@ export default routes;
     }
     if (route.isLayout && route.layoutFile) {
       const loadingProp = route.loadingFile ? ` Loading={${name}Loading}` : "";
-      parts.push(`element: <LazyRoute Component={${name}Layout}${loadingProp} />`);
+      parts.push(
+        `element: <LazyRoute Component={${name}Layout}${loadingProp} />`
+      );
     } else if (route.file) {
       parts.push(`element: <LazyRoute Component={${name}Page} />`);
     }
@@ -432,7 +463,9 @@ export default routes;
     }
     if (route.children && route.children.length > 0) {
       const childParent = route.pathless ? parentPath : route.path;
-      parts.push(`children: ${this.emitRouteArray(route.children, childParent)}`);
+      parts.push(
+        `children: ${this.emitRouteArray(route.children, childParent)}`
+      );
     }
     return `{
     ${parts.join(",\n    ")}
@@ -2061,7 +2094,7 @@ function RootProvider({ config, children }) {
   const {
     appName = "app",
     router,
-    basename: basename2 = "/",
+    basename = "/",
     strictMode = true,
     antd = { enabled: true },
     providers = [],
@@ -2069,7 +2102,7 @@ function RootProvider({ config, children }) {
   } = config;
   const appContextValue = {
     appName,
-    basename: basename2,
+    basename,
     isDev: process.env.NODE_ENV === "development",
     env: typeof process !== "undefined" ? process.env : {}
   };
@@ -2610,7 +2643,7 @@ var garfishPlugin = createPlugin((options = {}) => ({
     return hooks;
   }
 }));
-function generateMasterInitCode(apps, basename2) {
+function generateMasterInitCode(apps, basename) {
   const appConfigs = apps.map(
     (app) => `{
     name: "${app.name}",
@@ -2626,7 +2659,7 @@ function generateMasterInitCode(apps, basename2) {
  */
 export async function initGarfishMaster(): Promise<void> {
   await Garfish.run({
-    basename: "${basename2 || "/"}",
+    basename: "${basename || "/"}",
     domGetter: "#subapp-container",
     apps: [
       ${appConfigs}
@@ -2639,6 +2672,7 @@ export async function initGarfishMaster(): Promise<void> {
 // src/plugin/builtin/tailwind.ts
 import { existsSync as existsSync7, writeFileSync as writeFileSync3 } from "fs";
 import { join as join7 } from "path";
+import { rspack as rspack3 } from "@rspack/core";
 var tailwindPlugin = createPlugin((options = {}) => ({
   name: "@4399ywkf/plugin-tailwind",
   version: "1.0.0",
@@ -2662,7 +2696,7 @@ var tailwindPlugin = createPlugin((options = {}) => ({
         const tailwindRule = {
           test: /tailwind\.css$/,
           use: [
-            isProd ? "mini-css-extract-plugin/loader" : "style-loader",
+            isProd ? rspack3.CssExtractRspackPlugin.loader : "style-loader",
             "css-loader",
             {
               loader: "postcss-loader",
@@ -3545,7 +3579,7 @@ export type { StateCreator, StoreApi } from "zustand";
 }
 
 // src/cli/dev.ts
-import { rspack as rspack3 } from "@rspack/core";
+import { rspack as rspack4 } from "@rspack/core";
 import { RspackDevServer } from "@rspack/dev-server";
 import chalk2 from "chalk";
 
@@ -3856,7 +3890,7 @@ async function dev(options = {}) {
     printer.updateProgress(0, "preparing");
     rspackConfig.plugins = rspackConfig.plugins || [];
     rspackConfig.plugins.push(
-      new rspack3.ProgressPlugin(createProgressHandler(printer))
+      new rspack4.ProgressPlugin(createProgressHandler(printer))
     );
     rspackConfig.stats = "none";
     rspackConfig.infrastructureLogging = { level: "none" };
@@ -3870,7 +3904,7 @@ async function dev(options = {}) {
         progress: false
       };
     }
-    const compiler = rspack3(rspackConfig);
+    const compiler = rspack4(rspackConfig);
     compiler.hooks.done.tap("ywkf-dev-printer", (stats) => {
       const hasErrors = stats.hasErrors();
       if (hasErrors) {
@@ -3920,7 +3954,7 @@ async function dev(options = {}) {
 }
 
 // src/cli/build.ts
-import { rspack as rspack4 } from "@rspack/core";
+import { rspack as rspack5 } from "@rspack/core";
 import chalk3 from "chalk";
 function formatSize(bytes) {
   if (bytes < 1024) return `${bytes} B`;
@@ -3981,11 +4015,11 @@ async function build(options = {}) {
     printer.updateProgress(0, "preparing");
     rspackConfig.plugins = rspackConfig.plugins || [];
     rspackConfig.plugins.push(
-      new rspack4.ProgressPlugin(createProgressHandler(printer))
+      new rspack5.ProgressPlugin(createProgressHandler(printer))
     );
     rspackConfig.stats = "none";
     rspackConfig.infrastructureLogging = { level: "none" };
-    const compiler = rspack4(rspackConfig);
+    const compiler = rspack5(rspackConfig);
     const stats = await new Promise((resolve4, reject) => {
       compiler.run((err, stats2) => {
         if (err) {