@4399ywkf/cli 2.0.6 → 2.0.8

package/dist/index.js

@@ -480,10 +480,6 @@ async function injectMasterAppPages(pagesDir, appName) {
     path.join(pagesDir, "micro/layout.tsx"),
     MASTER_MICRO_LAYOUT
   );
-  await writeFile(
-    path.join(pagesDir, "micro/$.tsx"),
-    MASTER_MICRO_CATCHALL
-  );
   await writeFile(
     path.join(pagesDir, "page.tsx"),
     MASTER_HOME_PAGE
@@ -601,14 +597,19 @@ export default function HomePage() {
   );
 }
 `;
-const MASTER_MICRO_LAYOUT = `import { Outlet } from "react-router";
+const MASTER_MICRO_LAYOUT = `import { Outlet, useLocation } from "react-router";
 
 export default function MicroLayout() {
+  const { pathname } = useLocation();
+  const isIndex = pathname === "/micro" || pathname === "/micro/";
+
   return (
     <div>
-      <Outlet />
-      {/* Garfish \u5B50\u5E94\u7528\u6302\u8F7D\u5BB9\u5668 */}
-      <div id="subapp-container" style={{ minHeight: 400 }} />
+      {isIndex && <Outlet />}
+      <div
+        id="subapp-container"
+        style={{ minHeight: 400, display: isIndex ? "none" : "block" }}
+      />
     </div>
   );
 }
@@ -656,39 +657,6 @@ export default function MicroPage() {
   );
 }
 `;
-const MASTER_MICRO_CATCHALL = `import { Typography, Spin, Alert } from "antd";
-import { useLocation } from "react-router";
-
-const { Paragraph } = Typography;
-
-export default function MicroCatchAll() {
-  const { pathname } = useLocation();
-
-  return (
-    <div style={{ maxWidth: 720, margin: "0 auto", padding: "40px 0" }}>
-      <Alert
-        type="warning"
-        showIcon
-        message="\u5B50\u5E94\u7528\u8DEF\u7531\u533A\u57DF"
-        description={
-          <>
-            <Paragraph>
-              \u5F53\u524D\u8DEF\u5F84 <code>{pathname}</code> \u9884\u671F\u7531 Garfish \u5B50\u5E94\u7528\u63A5\u7BA1\u3002
-            </Paragraph>
-            <Paragraph type="secondary">
-              \u5982\u679C\u4F60\u770B\u5230\u6B64\u9875\u9762\uFF0C\u8BF4\u660E\u5BF9\u5E94\u7684\u5B50\u5E94\u7528\u5C1A\u672A\u6CE8\u518C\u6216\u672A\u542F\u52A8\u3002
-              \u8BF7\u68C0\u67E5 <code>ywkf.config.ts</code> \u4E2D <code>garfishPlugin</code> \u7684 apps \u914D\u7F6E\u3002
-            </Paragraph>
-          </>
-        }
-      />
-      <div style={{ textAlign: "center", marginTop: 24 }}>
-        <Spin tip="\u7B49\u5F85\u5B50\u5E94\u7528\u52A0\u8F7D..." />
-      </div>
-    </div>
-  );
-}
-`;
 const SUB_LAYOUT = `import { Outlet, Link, useLocation } from "react-router";
 import { Layout, Menu, Tag } from "antd";
 import { useEffect, useState } from "react";

package/dist/templates/app/src/index.css

@@ -1 +1,26 @@
-/* 基础样式 - Tailwind CSS 由 tailwindPlugin 自动注入到 .ywkf/tailwind.css */
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+  margin: 0;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+    "Helvetica Neue", Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  background: #fafafa;
+  color: #1a1a1a;
+}
+
+a:hover {
+  opacity: 0.85;
+}
+
+/* Card hover effect */
+a[style*="border-radius: 12px"]:hover {
+  border-color: #3b82f6 !important;
+  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.1);
+  transform: translateY(-2px);
+}

package/dist/templates/app/src/pages/layout.tsx

@@ -1,36 +1,105 @@
 import { Outlet, Link, useLocation } from "react-router";
-import { Layout, Menu } from "antd";
-
-const { Header, Content, Footer } = Layout;
 
 const NAV_ITEMS = [
-  { key: "/", label: <Link to="/">首页</Link> },
-  { key: "/dashboard", label: <Link to="/dashboard">工作台</Link> },
-  { key: "/user", label: <Link to="/user">用户管理</Link> },
+  { key: "/", label: "首页" },
+  { key: "/dashboard", label: "工作台" },
+  { key: "/user", label: "用户管理" },
 ];
 
 export default function RootLayout() {
   const { pathname } = useLocation();
-  const activeKey = NAV_ITEMS.find((item) => pathname.startsWith(item.key) && item.key !== "/")?.key
-    || (pathname === "/" ? "/" : "");
 
   return (
-    <Layout style={{ minHeight: "100vh" }}>
-      <Header style={{ display: "flex", alignItems: "center" }}>
-        <Menu
-          theme="dark"
-          mode="horizontal"
-          selectedKeys={[activeKey]}
-          style={{ flex: 1 }}
-          items={NAV_ITEMS}
-        />
-      </Header>
-      <Content style={{ padding: "24px 48px" }}>
+    <div style={styles.container}>
+      <header style={styles.header}>
+        <Link to="/" style={styles.logo}>
+          YWKF
+        </Link>
+        <nav style={styles.nav}>
+          {NAV_ITEMS.map((item) => {
+            const active =
+              item.key === "/"
+                ? pathname === "/"
+                : pathname.startsWith(item.key);
+            return (
+              <Link
+                key={item.key}
+                to={item.key}
+                style={{
+                  ...styles.navLink,
+                  ...(active ? styles.navLinkActive : {}),
+                }}
+              >
+                {item.label}
+              </Link>
+            );
+          })}
+        </nav>
+      </header>
+
+      <main style={styles.main}>
         <Outlet />
-      </Content>
-      <Footer style={{ textAlign: "center" }}>
+      </main>
+
+      <footer style={styles.footer}>
         YWKF Framework ©{new Date().getFullYear()}
-      </Footer>
-    </Layout>
+      </footer>
+    </div>
   );
 }
+
+const styles: Record<string, React.CSSProperties> = {
+  container: {
+    minHeight: "100vh",
+    display: "flex",
+    flexDirection: "column",
+    background: "#fafafa",
+  },
+  header: {
+    display: "flex",
+    alignItems: "center",
+    padding: "0 32px",
+    height: 56,
+    background: "#fff",
+    borderBottom: "1px solid #eee",
+    position: "sticky",
+    top: 0,
+    zIndex: 100,
+  },
+  logo: {
+    fontSize: 18,
+    fontWeight: 800,
+    color: "#3b82f6",
+    textDecoration: "none",
+    marginRight: 40,
+    letterSpacing: "-0.02em",
+  },
+  nav: {
+    display: "flex",
+    gap: 4,
+  },
+  navLink: {
+    padding: "6px 16px",
+    borderRadius: 6,
+    fontSize: 14,
+    color: "#666",
+    textDecoration: "none",
+    transition: "all 0.15s ease",
+  },
+  navLinkActive: {
+    color: "#3b82f6",
+    background: "rgba(59, 130, 246, 0.08)",
+    fontWeight: 500,
+  },
+  main: {
+    flex: 1,
+    padding: "24px 32px",
+  },
+  footer: {
+    textAlign: "center",
+    padding: "16px 0",
+    fontSize: 13,
+    color: "#aaa",
+    borderTop: "1px solid #eee",
+  },
+};

package/dist/templates/app/src/pages/page.tsx

@@ -1,47 +1,175 @@
-import { Typography, Space, Card } from "antd";
 import { Link } from "react-router";
 
-const { Title, Paragraph } = Typography;
+const CARDS = [
+  {
+    title: "快速上手 →",
+    desc: "了解框架核心概念，5 分钟创建你的第一个页面。",
+    to: "/dashboard",
+  },
+  {
+    title: "路由约定 →",
+    desc: "基于文件系统的约定式路由，零配置即可使用。",
+    to: "/user",
+  },
+  {
+    title: "配置文档 →",
+    desc: "通过 ywkf.config.ts 灵活定制构建、代理等行为。",
+    href: "https://github.com/nicepkg/ywkf-cli",
+  },
+  {
+    title: "插件生态 →",
+    desc: "React Query、Zustand、Tailwind、Garfish 等开箱即用。",
+    href: "https://github.com/nicepkg/ywkf-cli",
+  },
+];
 
-export default function HomePage() {
+export default function WelcomePage() {
   return (
-    <div style={{ maxWidth: 720, margin: "0 auto" }}>
-      <Title>Welcome to YWKF Framework</Title>
-      <Paragraph>
-        应用由 <code>@4399ywkf/core</code> 驱动，采用 Modern.js 风格的文件约定路由。
-      </Paragraph>
+    <div style={styles.wrapper}>
+      {/* Hero */}
+      <div style={styles.hero}>
+        <div style={styles.gradient} />
+        <div style={styles.heroContent}>
+          <h1 style={styles.heading}>
+            <span style={styles.headingLight}>欢迎使用</span>
+            <br />
+            <span style={styles.brand}>YWKF Framework</span>
+          </h1>
+          <p style={styles.hint}>
+            开始编辑{" "}
+            <code style={styles.code}>src/pages/page.tsx</code>
+          </p>
+        </div>
+      </div>
 
-      <Space direction="vertical" size="middle" style={{ width: "100%" }}>
-        <Card title="路由文件约定">
-          <ul>
-            <li><code>page.tsx</code> — 页面内容</li>
-            <li><code>layout.tsx</code> — 布局组件（使用 Outlet）</li>
-            <li><code>loading.tsx</code> — 加载状态（Suspense fallback）</li>
-            <li><code>error.tsx</code> — 错误边界</li>
-            <li><code>$.tsx</code> — 通配 / 404 路由</li>
-          </ul>
-        </Card>
+      {/* Cards */}
+      <div style={styles.cardGrid}>
+        {CARDS.map((card) => {
+          const inner = (
+            <>
+              <h3 style={styles.cardTitle}>{card.title}</h3>
+              <p style={styles.cardDesc}>{card.desc}</p>
+            </>
+          );
 
-        <Card title="目录约定">
-          <ul>
-            <li><code>[id]/</code> — 动态路由（<code>/:id</code>）</li>
-            <li><code>[id$]/</code> — 可选动态路由（<code>/:id?</code>）</li>
-            <li><code>[...slug]/</code> — 全匹配路由（<code>/*</code>）</li>
-            <li><code>__auth/</code> — 无路径布局（路由分组，不生成 URL 片段）</li>
-            <li><code>user.profile/</code> — 扁平路由（<code>/user/profile</code>）</li>
-          </ul>
-        </Card>
-
-        <Card title="本模板包含的示例路由">
-          <ul>
-            <li><Link to="/">/</Link> — 首页（当前页面）</li>
-            <li><Link to="/dashboard">/dashboard</Link> — 工作台（嵌套布局 + 子路由）</li>
-            <li><Link to="/user">/user</Link> — 用户列表</li>
-            <li><Link to="/user/42">/user/42</Link> — 动态路由示例</li>
-            <li><Link to="/not-exist">/not-exist</Link> — 404 通配路由</li>
-          </ul>
-        </Card>
-      </Space>
+          return card.href ? (
+            <a
+              key={card.title}
+              href={card.href}
+              target="_blank"
+              rel="noopener noreferrer"
+              style={styles.card}
+            >
+              {inner}
+            </a>
+          ) : (
+            <Link key={card.title} to={card.to!} style={styles.card}>
+              {inner}
+            </Link>
+          );
+        })}
+      </div>
     </div>
   );
 }
+
+const styles: Record<string, React.CSSProperties> = {
+  wrapper: {
+    display: "flex",
+    flexDirection: "column",
+    alignItems: "center",
+    minHeight: "calc(100vh - 128px)",
+    fontFamily:
+      '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
+  },
+  hero: {
+    position: "relative",
+    width: "100%",
+    display: "flex",
+    justifyContent: "center",
+    paddingTop: 80,
+    paddingBottom: 60,
+    overflow: "hidden",
+  },
+  gradient: {
+    position: "absolute",
+    top: -120,
+    left: "50%",
+    transform: "translateX(-50%)",
+    width: 800,
+    height: 400,
+    borderRadius: "50%",
+    background:
+      "radial-gradient(ellipse at center, rgba(56, 189, 248, 0.15) 0%, rgba(59, 130, 246, 0.08) 40%, transparent 70%)",
+    pointerEvents: "none",
+  },
+  heroContent: {
+    position: "relative",
+    textAlign: "center",
+    zIndex: 1,
+  },
+  heading: {
+    margin: 0,
+    lineHeight: 1.2,
+    fontWeight: 800,
+    letterSpacing: "-0.02em",
+  },
+  headingLight: {
+    fontSize: 20,
+    fontWeight: 400,
+    color: "#666",
+    letterSpacing: "0.05em",
+  },
+  brand: {
+    fontSize: 48,
+    background: "linear-gradient(135deg, #3b82f6, #06b6d4)",
+    WebkitBackgroundClip: "text",
+    WebkitTextFillColor: "transparent",
+  },
+  hint: {
+    marginTop: 24,
+    fontSize: 16,
+    color: "#888",
+  },
+  code: {
+    padding: "4px 12px",
+    borderRadius: 6,
+    background: "#f1f5f9",
+    border: "1px solid #e2e8f0",
+    fontFamily: '"SF Mono", "Fira Code", "Fira Mono", Menlo, monospace',
+    fontSize: 14,
+    color: "#334155",
+  },
+  cardGrid: {
+    display: "grid",
+    gridTemplateColumns: "repeat(4, 1fr)",
+    gap: 20,
+    maxWidth: 960,
+    width: "100%",
+    padding: "0 24px",
+    marginTop: 20,
+  },
+  card: {
+    display: "block",
+    padding: "24px 20px",
+    borderRadius: 12,
+    border: "1px solid #e5e7eb",
+    background: "#fff",
+    textDecoration: "none",
+    color: "inherit",
+    transition: "all 0.2s ease",
+    cursor: "pointer",
+  },
+  cardTitle: {
+    margin: "0 0 8px 0",
+    fontSize: 17,
+    fontWeight: 600,
+    color: "#1a1a1a",
+  },
+  cardDesc: {
+    margin: 0,
+    fontSize: 14,
+    lineHeight: 1.6,
+    color: "#666",
+  },
+};

package/dist/templates/app/src/request.ts

@@ -0,0 +1,79 @@
+/**
+ * HTTP 请求配置
+ *
+ * 框架会在 .ywkf/request.ts 中读取此配置并应用到 Axios 实例。
+ * 你可以自由修改此文件来定制请求行为。
+ *
+ * 使用方式：
+ *   import request from "@ywkf/request";
+ *   const res = await request.get<Result<User[]>>("/api/users");
+ */
+import type { RequestConfig, Result } from "@4399ywkf/core/runtime";
+import { message } from "antd";
+
+const requestConfig: RequestConfig = {
+  // API 基础路径，优先从环境变量读取
+  // baseURL: import.meta.env.VITE_API_BASE_URL || "/api",
+
+  timeout: 15000,
+
+  getToken() {
+    return localStorage.getItem("token");
+  },
+
+  // Token 前缀，默认 "Bearer"，设为 "" 则不添加前缀
+  // tokenPrefix: "Bearer",
+
+  // 请求拦截器 — 在 Token 注入之后执行
+  // requestInterceptor(config) {
+  //   // 可在此添加签名、自定义 header 等
+  //   return config;
+  // },
+
+  responseInterceptor(response: any) {
+    const { data } = response;
+
+    if (data && typeof data.code === "number") {
+      const { code, message: msg } = data as Result;
+
+      if (code === 0) {
+        return data.data;
+      }
+
+      if (code === 401 || code === 999) {
+        message.error("登录过期，请重新登录");
+        // window.location.href = "/login";
+        return Promise.reject(data);
+      }
+
+      message.error(msg || `请求失败 (${code})`);
+      return Promise.reject(data);
+    }
+
+    return data;
+  },
+
+  errorHandler(error: any) {
+    const status = error?.response?.status;
+
+    switch (status) {
+      case 401:
+        message.error("未授权，请重新登录");
+        break;
+      case 403:
+        message.error("无访问权限");
+        break;
+      case 500:
+        message.error("服务器内部错误");
+        break;
+      default:
+        if (!error?.response) {
+          message.error("网络异常，请检查网络连接");
+        }
+    }
+
+    return Promise.reject(error);
+  },
+};
+
+export default requestConfig;

package/dist/templates/app/ywkf.config.ts.tpl

@@ -35,6 +35,18 @@ export default defineConfig({
     dropConsole: process.env.NODE_ENV === "production",
   },
 
+  // 自定义 Rspack 配置（按需启用）
+  // tools: {
+  //   rspack(config, { isDev }) {
+  //     // 添加自定义 module.rules
+  //     config.module?.rules?.push({
+  //       test: /\.yaml$/,
+  //       type: "json",
+  //     });
+  //     return config;
+  //   },
+  // },
+
   plugins: [
     reactQueryPlugin(),
     zustandPlugin(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4399ywkf/cli",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "description": "运维开发部脚手架",
   "main": "dist/index.js",
   "bin": {
@@ -20,9 +20,12 @@
     "build": "rollup -c && node scripts/postbuild.js",
     "build:watch": "rollup -c -w",
     "prepublishOnly": "npm run build",
-    "release:core": "pnpm --filter @4399ywkf/core release",
-    "release:core:minor": "pnpm --filter @4399ywkf/core release:minor",
-    "release:core:major": "pnpm --filter @4399ywkf/core release:major",
+    "publish:all": "bash scripts/publish.sh",
+    "publish:core": "bash scripts/publish.sh -t core",
+    "publish:cli": "bash scripts/publish.sh -t cli",
+    "publish:minor": "bash scripts/publish.sh -b minor",
+    "publish:major": "bash scripts/publish.sh -b major",
+    "publish:dry": "bash scripts/publish.sh -d",
     "link": "npm link",
     "unlink": "npm unlink -g",
     "changeset": "changeset",