nsgm-cli 2.1.20 → 2.1.22

package/lib/utils/project-config.d.ts

@@ -1,4 +1,4 @@
-import { ProjectConfig } from '../cli/types/project';
+import { ProjectConfig } from "../cli/types/project";
 /**
  * 应用项目配置到生成的文件中
  */

package/lib/utils/project-config.js

@@ -52,17 +52,17 @@ function applyProjectConfig(projectPath, config) {
  */
 function ensureDefaultFeatures(config) {
     console.log(`✅ 项目已配置默认功能栈: Next.js + Styled Components + GraphQL + MySQL + TypeScript + ESLint`);
-    console.log(`✅ 数据库配置: ${config.database ? '已启用' : '未启用'}`);
-    console.log(`✅ 包含功能: ${config.features.join(', ')}`);
+    console.log(`✅ 数据库配置: ${config.database ? "已启用" : "未启用"}`);
+    console.log(`✅ 包含功能: ${config.features.join(", ")}`);
 }
 /**
  * 更新 package.json 文件
  */
 function updatePackageJson(projectPath, config) {
-    const packageJsonPath = path.join(projectPath, 'package.json');
+    const packageJsonPath = path.join(projectPath, "package.json");
     if (fs.existsSync(packageJsonPath)) {
         try {
-            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
             // 更新基本信息
             packageJson.name = config.projectName;
             packageJson.description = config.description;
@@ -90,49 +90,49 @@ function updatePackageJson(projectPath, config) {
  * 更新 README.md 文件
  */
 function updateReadme(projectPath, config) {
-    const readmePath = path.join(projectPath, 'README.md');
+    const readmePath = path.join(projectPath, "README.md");
     if (fs.existsSync(readmePath)) {
         try {
-            let readmeContent = fs.readFileSync(readmePath, 'utf8');
+            let readmeContent = fs.readFileSync(readmePath, "utf8");
             // 替换项目名称
             readmeContent = readmeContent.replace(/nsgm-cli-project/g, config.projectName);
             // 如果有描述，添加到 README 开头
-            if (config.description && config.description !== 'A NSGM fullstack project') {
+            if (config.description && config.description !== "A NSGM fullstack project") {
                 const descriptionSection = `# ${config.projectName}\n\n${config.description}\n\n`;
                 // 检查是否已经有项目名称标题
-                if (readmeContent.startsWith('# ')) {
+                if (readmeContent.startsWith("# ")) {
                     // 替换第一行
-                    const lines = readmeContent.split('\n');
+                    const lines = readmeContent.split("\n");
                     lines[0] = `# ${config.projectName}`;
-                    if (lines[1] === '' && lines[2] && !lines[2].startsWith('#')) {
+                    if (lines[1] === "" && lines[2] && !lines[2].startsWith("#")) {
                         lines[2] = config.description;
                     }
                     else {
-                        lines.splice(2, 0, '', config.description);
+                        lines.splice(2, 0, "", config.description);
                     }
-                    readmeContent = lines.join('\n');
+                    readmeContent = lines.join("\n");
                 }
                 else {
                     readmeContent = descriptionSection + readmeContent;
                 }
             }
             // 添加作者信息
-            if (config.author && config.author !== 'Your Name') {
+            if (config.author && config.author !== "Your Name") {
                 const authorSection = `\n## 作者\n\n${config.author}\n`;
                 readmeContent += authorSection;
             }
             // 添加功能说明
             if (config.features.length > 0) {
                 const featureMap = {
-                    nextjs: 'Next.js 全栈框架',
-                    styled: 'Styled Components CSS-in-JS',
-                    graphql: 'GraphQL API',
-                    mysql: 'MySQL 数据库',
-                    typescript: 'TypeScript 强类型支持',
-                    eslint: 'ESLint 代码质量检查',
+                    nextjs: "Next.js 全栈框架",
+                    styled: "Styled Components CSS-in-JS",
+                    graphql: "GraphQL API",
+                    mysql: "MySQL 数据库",
+                    typescript: "TypeScript 强类型支持",
+                    eslint: "ESLint 代码质量检查",
                 };
                 const featureNames = config.features.map((feature) => featureMap[feature] || feature);
-                const featuresSection = `\n## 技术栈\n\n${featureNames.map((feature) => `- ${feature}`).join('\n')}\n`;
+                const featuresSection = `\n## 技术栈\n\n${featureNames.map((feature) => `- ${feature}`).join("\n")}\n`;
                 readmeContent += featuresSection;
             }
             fs.writeFileSync(readmePath, readmeContent);

package/lib/utils.js

@@ -84,18 +84,18 @@ const handleReplace = ({ regex, replacement, paths }) => {
 exports.handleReplace = handleReplace;
 const replaceInFileAll = async (array, index = 0, callback) => {
     if (replaceInFileFlag) {
-        console.log('replaceInFileAll', index);
+        console.log("replaceInFileAll", index);
         const arrayLen = array.length;
         if (index < arrayLen) {
             const item = array[index];
             (0, replace_in_file_1.replaceInFile)(item)
                 .then((changedFiles) => {
-                console.log('Modified files:', changedFiles);
+                console.log("Modified files:", changedFiles);
                 (0, exports.replaceInFileAll)(array, ++index, callback);
             })
                 .catch((error) => {
                 if (error) {
-                    console.error('Error occurred:', error);
+                    console.error("Error occurred:", error);
                 }
             });
         }

package/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+import "./build/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

package/next.config.js

@@ -40,21 +40,19 @@ module.exports = (phase, defaultConfig, options) => {
     prefix = ''
   }
 
+  // 设置环境变量用于客户端访问
+  process.env.NEXT_PUBLIC_VERSION = version
+  process.env.NEXT_PUBLIC_PREFIX = prefix
+  process.env.NEXT_PUBLIC_PROTOCOL = protocol
+  process.env.NEXT_PUBLIC_HOST = host
+  process.env.NEXT_PUBLIC_PORT = port
+  process.env.NEXT_PUBLIC_ENV = env
+  process.env.NEXT_PUBLIC_IS_EXPORT = phase === PHASE_EXPORT ? 'true' : 'false'
+
   let configObj = {
     // target: 'serverless',
     // crossOrign: 'anonymous',
     i18n,
-    serverRuntimeConfig: {},
-    publicRuntimeConfig: {
-      version,
-      prefix,
-      protocol,
-      host,
-      port,
-      env,
-      phase,
-      isExport: phase === PHASE_EXPORT,
-    },
     transpilePackages: [
       'antd',
       '@ant-design',
@@ -90,114 +88,22 @@ module.exports = (phase, defaultConfig, options) => {
       '127.0.0.1',
       'localhost',
     ],
-    webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
-      // 抑制服务端渲染时的 useLayoutEffect 警告
-      if (dev && isServer) {
-        const originalWarn = console.warn
-        const originalError = console.error
-
-        console.warn = (...args) => {
-          const warnMessage = args[0]
-          if (
-            typeof warnMessage === 'string' &&
-            (warnMessage.includes('useLayoutEffect does nothing on the server') ||
-              warnMessage.includes('Warning: useLayoutEffect does nothing on the server'))
-          ) {
-            return
-          }
-          originalWarn.apply(console, args)
-        }
-
-        console.error = (...args) => {
-          const errorMessage = args[0]
-          if (
-            typeof errorMessage === 'string' &&
-            (errorMessage.includes('useLayoutEffect does nothing on the server') ||
-              errorMessage.includes('Warning: useLayoutEffect does nothing on the server'))
-          ) {
-            return
-          }
-          originalError.apply(console, args)
-        }
-      }
-
-      // 启用压缩
-      if (!dev && !isServer) {
-        config.optimization = {
-          ...config.optimization,
-          splitChunks: {
-            chunks: 'all',
-            cacheGroups: {
-              vendor: {
-                test: /[\\/]node_modules[\\/]/,
-                name: 'vendors',
-                chunks: 'all',
-                enforce: true,
-              },
-              antd: {
-                test: /[\\/]node_modules[\\/](antd|@ant-design)[\\/]/,
-                name: 'antd',
-                chunks: 'all',
-                priority: 10,
-              },
-              react: {
-                test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/,
-                name: 'react',
-                chunks: 'all',
-                priority: 10,
-              },
-              common: {
-                name: 'common',
-                minChunks: 2,
-                chunks: 'all',
-                priority: 5,
-              },
-            },
-          },
-          minimize: true,
-        }
-
-        // 添加分析工具
-        if (process.env.ANALYZE === 'true') {
-          const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
-          config.plugins.push(
-            new BundleAnalyzerPlugin({
-              analyzerMode: 'static',
-              openAnalyzer: false,
-            })
-          )
-        }
-      }
-
-      // 优化模块解析
-      config.resolve.alias = {
-        ...config.resolve.alias,
-        '@': path.resolve(__dirname, 'client'),
-      }
-
-      // 支持 TypeScript 路径映射
-      config.resolve.modules = [path.resolve(__dirname, 'client'), 'node_modules']
-
-      return config
-    },
+    // 使用 Turbopack（Next.js 16 默认）
+    turbopack: {},
     generateBuildId: async () => {
       return 'nsgm-cli-' + version
     },
-    exportPathMap: async function (defaultPathMap, { dev, dir, outDir }) {
-      if (dev) {
-        return defaultPathMap
-      }
-
-      return defaultPathMap
-    },
     generateEtags: false,
     useFileSystemPublicRoutes: true,
   }
 
   if (phase !== PHASE_DEVELOPMENT_SERVER) {
+    // 在 Vercel 环境中使用默认的 .next 目录，否则使用 build 目录
+    const distDir = process.env.VERCEL ? '.next' : 'build'
+    
     configObj = {
       ...configObj,
-      distDir: 'build',
+      distDir,
       assetPrefix: prefix,
       async rewrites() {
         return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsgm-cli",
-  "version": "2.1.20",
+  "version": "2.1.22",
   "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,9 @@
     "test:coverage": "jest --coverage",
     "test:watch": "jest --watch",
     "performance": "./scripts/performance-check.sh",
-    "generate-password": "node scripts/generate-password-hash.js"
+    "generate-password": "node scripts/generate-password-hash.js",
+    "vercel-build": "npm run tsbuild && npm run build",
+    "vercel-dev": "npm run tsbuild && npm run dev"
   },
   "repository": {
     "type": "git",
@@ -105,7 +107,7 @@
     "lusca": "1.7.0",
     "markdown-it": "14.1.0",
     "mysql2": "3.14.2",
-    "next": "15.4.4",
+    "next": "16.1.0",
     "next-i18next": "15.3.0",
     "ora": "8.2.0",
     "rc-util": "5.44.4",

package/pages/_app.tsx

@@ -1,104 +1,104 @@
 // 必须在所有其他导入之前执行
-import '@/utils/suppressWarnings'
-
-import React, { useEffect, useState } from 'react'
-import { Provider } from 'react-redux'
-import { Spin } from 'antd'
-import { appWithTranslation } from 'next-i18next'
-import { useRouter } from 'next/router'
-import { useStore } from '@/redux/store'
-import { Loading } from '@/styled/common'
-import LayoutComponent from '@/layout'
-import ClientProviders from '@/components/ClientProviders'
-import SuppressHydrationWarnings from '@/components/SuppressHydrationWarnings'
-import SSRSafeAntdProvider from '@/components/SSRSafeAntdProvider'
-import { login } from '@/utils/sso'
-import { getAntdLocale } from '@/utils/i18n'
-import { navigateToLogin } from '@/utils/navigation'
-import nextI18NextConfig from '../next-i18next.config.js'
-import 'antd/dist/reset.css'
+import "@/utils/suppressWarnings";
+
+import { useEffect, useState } from "react";
+import { Provider } from "react-redux";
+import { Spin } from "antd";
+import { appWithTranslation } from "next-i18next";
+import { useRouter } from "next/router";
+import { useStore } from "@/redux/store";
+import { Loading } from "@/styled/common";
+import LayoutComponent from "@/layout";
+import ClientProviders from "@/components/ClientProviders";
+import SuppressHydrationWarnings from "@/components/SuppressHydrationWarnings";
+import SSRSafeAntdProvider from "@/components/SSRSafeAntdProvider";
+import { login } from "@/utils/sso";
+import { getAntdLocale } from "@/utils/i18n";
+import { navigateToLogin } from "@/utils/navigation";
+import nextI18NextConfig from "../next-i18next.config.js";
+import "antd/dist/reset.css";
 
 const theme = {
   colors: {
-    primary: '#0070f3',
+    primary: "#0070f3",
   },
-}
+};
 
 const App = ({ Component, pageProps }) => {
-  const store = useStore(pageProps.initialReduxState)
-  const router = useRouter()
-  const [ssoUser, setSsoUser] = useState(null)
-  const [pageLoad, setPageLoad] = useState(false)
-  const [loginChecked, setLoginChecked] = useState(false)
-  const [mounted, setMounted] = useState(false)
-  const [currentLocale, setCurrentLocale] = useState('zh-CN')
+  const store = useStore(pageProps.initialReduxState);
+  const router = useRouter();
+  const [ssoUser, setSsoUser] = useState(null);
+  const [pageLoad, setPageLoad] = useState(false);
+  const [loginChecked, setLoginChecked] = useState(false);
+  const [mounted, setMounted] = useState(false);
+  const [currentLocale, setCurrentLocale] = useState("zh-CN");
 
   // 检查是否为特殊页面（登录页、错误页）
   // 避免在服务器端访问 router.pathname
   const isSpecialPage =
-    Component.displayName === 'ErrorPage' ||
-    Component.name === 'ErrorPage' ||
-    Component.displayName === 'LoginPage' ||
-    Component.name === 'LoginPage'
+    Component.displayName === "ErrorPage" ||
+    Component.name === "ErrorPage" ||
+    Component.displayName === "LoginPage" ||
+    Component.name === "LoginPage";
 
   // Get Antd locale based on current locale
-  const antdLocale = getAntdLocale(currentLocale)
+  const antdLocale = getAntdLocale(currentLocale);
 
   useEffect(() => {
-    setMounted(true)
+    setMounted(true);
     // 只在客户端设置当前语言
-    if (typeof window !== 'undefined') {
-      const locale = router.locale || 'zh-CN'
-      setCurrentLocale(locale)
+    if (typeof window !== "undefined") {
+      const locale = router.locale || "zh-CN";
+      setCurrentLocale(locale);
     }
-  }, [router.locale])
+  }, [router.locale]);
 
   useEffect(() => {
-    if (!mounted) return
+    if (!mounted) return;
 
     // 对于特殊页面，跳过登录检查
     if (isSpecialPage) {
-      setLoginChecked(true)
-      setPageLoad(true)
-      return
+      setLoginChecked(true);
+      setPageLoad(true);
+      return;
     }
 
     // 检查当前路径是否为登录页或错误页
-    const isLoginPage = typeof window !== 'undefined' && window.location.pathname === '/login'
+    const isLoginPage = typeof window !== "undefined" && window.location.pathname === "/login";
     const isErrorPage =
-      typeof window !== 'undefined' &&
-      (window.location.pathname === '/404' ||
-        window.location.pathname === '/500' ||
-        window.location.pathname === '/_error')
+      typeof window !== "undefined" &&
+      (window.location.pathname === "/404" ||
+        window.location.pathname === "/500" ||
+        window.location.pathname === "/_error");
 
     // 如果是登录页或错误页，直接设置加载完成，不进行登录检查
     if (isLoginPage || isErrorPage) {
-      setLoginChecked(true)
-      setPageLoad(true)
-      return
+      setLoginChecked(true);
+      setPageLoad(true);
+      return;
     }
 
     // 检查是否有登录凭证
-    const hasLoginCookie = typeof window !== 'undefined' && document.cookie.includes('_cas_nsgm')
+    const hasLoginCookie = typeof window !== "undefined" && document.cookie.includes("_cas_nsgm");
 
     // 如果没有登录凭证，直接跳转到登录页面（保持当前语言）
-    if (!hasLoginCookie && typeof window !== 'undefined') {
-      navigateToLogin(router)
-      return
+    if (!hasLoginCookie && typeof window !== "undefined") {
+      navigateToLogin(router);
+      return;
     }
 
     // 否则执行登录检查
     login((user: any) => {
       if (user) {
-        setSsoUser(user)
+        setSsoUser(user);
       }
-      setLoginChecked(true)
-    })
+      setLoginChecked(true);
+    });
 
     setTimeout(() => {
-      setPageLoad(true)
-    }, 100)
-  }, [mounted, isSpecialPage])
+      setPageLoad(true);
+    }, 100);
+  }, [mounted, isSpecialPage]);
 
   return (
     <>
@@ -130,10 +130,7 @@ const App = ({ Component, pageProps }) => {
         </ClientProviders>
       </SSRSafeAntdProvider>
     </>
-  )
-}
+  );
+};
 
-// 移除 getInitialProps 以启用静态优化
-// 如果需要页面级别的数据获取，请在各个页面中使用 getStaticProps 或 getServerSideProps
-
-export default appWithTranslation(App, nextI18NextConfig)
+export default appWithTranslation(App, nextI18NextConfig);

package/pages/_document.tsx

@@ -1,10 +1,9 @@
-import Document, { Html, Head, Main, NextScript, DocumentContext } from 'next/document'
-import React from 'react'
-import { ServerStyleSheet } from 'styled-components'
+import Document, { Html, Head, Main, NextScript, DocumentContext } from "next/document";
+import { ServerStyleSheet } from "styled-components";
 
 const MyDocument = (props) => {
   // 从 props 中获取语言信息，如果没有则默认为 zh-CN
-  const locale = props.locale || 'zh-CN'
+  const locale = props.locale || "zh-CN";
 
   return (
     <Html lang={locale}>
@@ -86,31 +85,31 @@ const MyDocument = (props) => {
         <NextScript />
       </body>
     </Html>
-  )
-}
+  );
+};
 
 // MyDocument.renderDocument = Document.renderDocument
 
 MyDocument.getInitialProps = async (ctx: DocumentContext) => {
-  const sheet = new ServerStyleSheet()
-  const originalRenderPage = ctx.renderPage
+  const sheet = new ServerStyleSheet();
+  const originalRenderPage = ctx.renderPage;
 
   try {
     ctx.renderPage = () =>
       originalRenderPage({
         enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />),
-      })
+      });
 
-    const initialProps = await Document?.getInitialProps(ctx)
+    const initialProps = await Document?.getInitialProps(ctx);
 
     return {
       ...initialProps,
-      locale: ctx.locale || 'zh-CN',
+      locale: ctx.locale || "zh-CN",
       styles: [initialProps.styles, sheet.getStyleElement()],
-    }
+    };
   } finally {
-    sheet.seal()
+    sheet.seal();
   }
-}
+};
 
-export default MyDocument
+export default MyDocument;

package/pages/_error.tsx

@@ -1,50 +1,49 @@
-import React from 'react'
-import { Result, Button } from 'antd'
-import { NextPageContext } from 'next'
+import { Result, Button } from "antd";
+import { NextPageContext } from "next";
 
 interface ErrorProps {
-  statusCode?: number
+  statusCode?: number;
 }
 
 function ErrorPage({ statusCode }: ErrorProps) {
   const getErrorMessage = () => {
     if (statusCode === 404) {
-      return '页面未找到'
+      return "页面未找到";
     } else if (statusCode === 500) {
-      return '服务器错误'
+      return "服务器错误";
     }
-    return '发生了未知错误'
-  }
+    return "发生了未知错误";
+  };
 
   const getErrorTitle = () => {
     if (statusCode === 404) {
-      return '404'
+      return "404";
     } else if (statusCode === 500) {
-      return '500'
+      return "500";
     }
-    return '错误'
-  }
+    return "错误";
+  };
 
   return (
     <div
       style={{
-        minHeight: '100vh',
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
-        padding: '20px',
+        minHeight: "100vh",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        padding: "20px",
       }}
     >
       <Result
-        status={statusCode === 404 ? '404' : '500'}
+        status={statusCode === 404 ? "404" : "500"}
         title={getErrorTitle()}
         subTitle={getErrorMessage()}
         extra={
           <Button
             type="primary"
             onClick={() => {
-              if (typeof window !== 'undefined') {
-                window.location.href = '/'
+              if (typeof window !== "undefined") {
+                window.location.href = "/";
               }
             }}
           >
@@ -53,14 +52,14 @@ function ErrorPage({ statusCode }: ErrorProps) {
         }
       />
     </div>
-  )
+  );
 }
 
 ErrorPage.getInitialProps = ({ res, err }: NextPageContext) => {
-  const statusCode = res ? res.statusCode : err ? err.statusCode : 404
-  return { statusCode }
-}
+  const statusCode = res ? res.statusCode : err ? err.statusCode : 404;
+  return { statusCode };
+};
 
-ErrorPage.displayName = 'ErrorPage'
+ErrorPage.displayName = "ErrorPage";
 
-export default ErrorPage
+export default ErrorPage;