nsgm-cli 2.1.12 → 2.1.14

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

@@ -0,0 +1,5 @@
+import { ProjectConfig } from '../cli/types/project';
+/**
+ * 应用项目配置到生成的文件中
+ */
+export declare function applyProjectConfig(projectPath: string, config: ProjectConfig): void;

package/lib/utils/project-config.js

@@ -0,0 +1,145 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyProjectConfig = applyProjectConfig;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+/**
+ * 应用项目配置到生成的文件中
+ */
+function applyProjectConfig(projectPath, config) {
+    // 更新 package.json
+    updatePackageJson(projectPath, config);
+    // 更新 README.md
+    updateReadme(projectPath, config);
+    // 确保默认功能配置正确应用
+    ensureDefaultFeatures(config);
+}
+/**
+ * 确保默认功能配置正确应用
+ */
+function ensureDefaultFeatures(config) {
+    console.log(`✅ 项目已配置默认功能栈: Next.js + Styled Components + GraphQL + MySQL + TypeScript + ESLint`);
+    console.log(`✅ 数据库配置: ${config.database ? '已启用' : '未启用'}`);
+    console.log(`✅ 包含功能: ${config.features.join(', ')}`);
+}
+/**
+ * 更新 package.json 文件
+ */
+function updatePackageJson(projectPath, config) {
+    const packageJsonPath = path.join(projectPath, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        try {
+            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            // 更新基本信息
+            packageJson.name = config.projectName;
+            packageJson.description = config.description;
+            packageJson.author = config.author;
+            // 根据功能选择更新依赖（这里是示例，可以根据实际需求扩展）
+            if (!packageJson.keywords) {
+                packageJson.keywords = [];
+            }
+            // 添加功能标签
+            config.features.forEach((feature) => {
+                if (!packageJson.keywords.includes(feature)) {
+                    packageJson.keywords.push(feature);
+                }
+            });
+            // 写回文件
+            fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
+            console.log(`✅ 已更新 package.json`);
+        }
+        catch (error) {
+            console.warn(`⚠️ 更新 package.json 失败: ${error}`);
+        }
+    }
+}
+/**
+ * 更新 README.md 文件
+ */
+function updateReadme(projectPath, config) {
+    const readmePath = path.join(projectPath, 'README.md');
+    if (fs.existsSync(readmePath)) {
+        try {
+            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') {
+                const descriptionSection = `# ${config.projectName}\n\n${config.description}\n\n`;
+                // 检查是否已经有项目名称标题
+                if (readmeContent.startsWith('# ')) {
+                    // 替换第一行
+                    const lines = readmeContent.split('\n');
+                    lines[0] = `# ${config.projectName}`;
+                    if (lines[1] === '' && lines[2] && !lines[2].startsWith('#')) {
+                        lines[2] = config.description;
+                    }
+                    else {
+                        lines.splice(2, 0, '', config.description);
+                    }
+                    readmeContent = lines.join('\n');
+                }
+                else {
+                    readmeContent = descriptionSection + readmeContent;
+                }
+            }
+            // 添加作者信息
+            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 代码质量检查',
+                };
+                const featureNames = config.features.map((feature) => featureMap[feature] || feature);
+                const featuresSection = `\n## 技术栈\n\n${featureNames.map((feature) => `- ${feature}`).join('\n')}\n`;
+                readmeContent += featuresSection;
+            }
+            fs.writeFileSync(readmePath, readmeContent);
+            console.log(`✅ 已更新 README.md`);
+        }
+        catch (error) {
+            console.warn(`⚠️ 更新 README.md 失败: ${error}`);
+        }
+    }
+}

package/lib/utils.js

@@ -77,7 +77,7 @@ const handleReplace = ({ regex, replacement, paths }) => {
             replacement,
             paths,
             recursive: true,
-            silent: true
+            silent: true,
         });
     }
 };

package/next.config.js

@@ -25,12 +25,8 @@ module.exports = (phase, defaultConfig, options) => {
     pkg = require('./package.json')
   }
 
-  // const env = (pkg && pkg.config && pkg.config.env && pkg.config.env.toUpperCase()) || 'PROD'
-
-  // console.log('projectConfig', projectConfig)
   let { env, version, prefix, protocol, host, port } = projectConfig
 
-  // console.log('options', options)
   if (options != undefined) {
     version = options.version
     prefix = options.prefix
@@ -42,9 +38,7 @@ module.exports = (phase, defaultConfig, options) => {
   if (phase === PHASE_DEVELOPMENT_SERVER) {
     prefix = ''
   }
-
-  // console.log('phase', phase, version, prefix, protocol, host, port)
-
+  
   let configObj = {
     // target: 'serverless',
     // crossOrign: 'anonymous',
@@ -67,12 +61,22 @@ module.exports = (phase, defaultConfig, options) => {
     },
     compiler: {
       removeConsole: phase !== PHASE_DEVELOPMENT_SERVER,
+      styledComponents: true
     },
+    ...(phase === PHASE_DEVELOPMENT_SERVER && {
+      devIndicators: {
+        position: 'bottom-right'
+      }
+    }),
     allowedDevOrigins: [
       'http://127.0.0.1:8080',
       'http://localhost:8080',
       'http://127.0.0.1:3000',
-      'http://localhost:3000'
+      'http://localhost:3000',
+      '127.0.0.1:8080',
+      'localhost:8080',
+      '127.0.0.1',
+      'localhost'
     ],
     webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
       // 启用压缩

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsgm-cli",
-  "version": "2.1.12",
+  "version": "2.1.14",
   "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
   "main": "index.js",
   "scripts": {
@@ -18,9 +18,9 @@
     "delete": "node ./lib/index.js delete",
     "deletedb": "node ./lib/index.js deletedb",
     "clean": "rimraf .next && rimraf build && rimraf webapp && rimraf lib",
-    "lint": "eslint \"src/**/*.{ts,tsx}\" --fix",
-    "lint:check": "eslint \"src/**/*.{ts,tsx}\"",
-    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "eslint \"src/**/*.{ts,tsx}\" \"client/**/*.{ts,tsx}\" \"pages/**/*.{ts,tsx}\" --fix",
+    "lint:check": "eslint \"src/**/*.{ts,tsx}\" \"client/**/*.{ts,tsx}\" \"pages/**/*.{ts,tsx}\"",
+    "format": "prettier --write \"src/**/*.{ts,tsx}\" \"client/**/*.{ts,tsx}\" \"pages/**/*.{ts,tsx}\"",
     "check-deps": "npm outdated",
     "update-deps": "npm update",
     "audit-fix": "npm audit fix",
@@ -33,8 +33,7 @@
     "test:coverage": "jest --coverage",
     "test:watch": "jest --watch",
     "performance": "./scripts/performance-check.sh",
-    "generate-password": "node scripts/generate-password-hash.js",
-    "size-limit": "npx size-limit"
+    "generate-password": "node scripts/generate-password-hash.js"
   },
   "repository": {
     "type": "git",
@@ -83,6 +82,8 @@
     "axios": "1.11.0",
     "bcrypt": "6.0.0",
     "body-parser": "2.2.0",
+    "chalk": "5.5.0",
+    "commander": "14.0.0",
     "cors": "2.8.5",
     "critters": "0.0.25",
     "dayjs": "1.11.13",
@@ -95,12 +96,14 @@
     "glob": "11.0.3",
     "graphql": "16.11.0",
     "graphql-http": "1.22.4",
+    "inquirer": "12.9.0",
     "lodash": "4.17.21",
     "lru-cache": "11.1.0",
     "lusca": "1.7.0",
     "markdown-it": "14.1.0",
     "mysql2": "3.14.2",
     "next": "15.4.4",
+    "ora": "8.2.0",
     "rc-util": "5.44.4",
     "react": "18.3.1",
     "react-dom": "18.3.1",
@@ -129,6 +132,7 @@
     "@types/express": "5.0.3",
     "@types/express-fileupload": "1.5.1",
     "@types/graphql": "14.5.0",
+    "@types/inquirer": "9.0.8",
     "@types/jest": "30.0.0",
     "@types/lodash": "4.17.20",
     "@types/lusca": "1.7.5",
@@ -153,7 +157,6 @@
     "jest": "30.0.5",
     "jest-environment-jsdom": "30.0.5",
     "prettier": "3.6.2",
-    "size-limit": "11.2.0",
     "typescript": "5.8.3",
     "webpack-bundle-analyzer": "4.10.2"
   }

package/pages/_app.tsx

@@ -10,8 +10,8 @@ import 'antd/dist/reset.css'
 
 const theme = {
   colors: {
-    primary: '#0070f3'
-  }
+    primary: '#0070f3',
+  },
 }
 
 const App = ({ Component, pageProps }) => {
@@ -23,27 +23,26 @@ const App = ({ Component, pageProps }) => {
   useEffect(() => {
     // 检查当前路径是否为登录页
     const isLoginPage = typeof window !== 'undefined' && window.location.pathname === '/login'
-    
+
     // 如果是登录页，直接设置加载完成
     if (isLoginPage) {
       setLoginChecked(true)
       setPageLoad(true)
       return
     }
-    
+
     // 检查是否有登录凭证
     const hasLoginCookie = typeof window !== 'undefined' && document.cookie.includes('_cas_nsgm')
-    
+
     // 如果没有登录凭证，直接跳转到登录页面
     if (!hasLoginCookie && typeof window !== 'undefined') {
-      window.location.href = window.location.origin + '/login'
+      window.location.href = `${window.location.origin}/login`
       return
     }
-    
+
     // 否则执行登录检查
     login((user: any) => {
       if (user) {
-        // console.log('checkLogin_user', user)
         setSsoUser(user)
       }
       setLoginChecked(true)
@@ -59,25 +58,23 @@ const App = ({ Component, pageProps }) => {
       <GlobalStyle whiteColor={true} />
       <ThemeProvider theme={theme}>
         <Provider store={store}>
-          {
-            !loginChecked ? (
-              <Loading>
-                <Spin size="large" />
-              </Loading>
-            ) : pageLoad ? (
-              ssoUser ? (
-                <LayoutComponent user={ssoUser}>
-                  <Component {...pageProps} />
-                </LayoutComponent>
-              ) : (
+          {!loginChecked ? (
+            <Loading>
+              <Spin size="large" />
+            </Loading>
+          ) : pageLoad ? (
+            ssoUser ? (
+              <LayoutComponent user={ssoUser}>
                 <Component {...pageProps} />
-              )
+              </LayoutComponent>
             ) : (
-              <Loading>
-                <Spin size="large" />
-              </Loading>
+              <Component {...pageProps} />
             )
-          }
+          ) : (
+            <Loading>
+              <Spin size="large" />
+            </Loading>
+          )}
         </Provider>
       </ThemeProvider>
     </>
@@ -85,11 +82,9 @@ const App = ({ Component, pageProps }) => {
 }
 
 App.getInitialProps = async ({ Component, ctx }) => {
-  // console.log('app_ctx', ctx)
-
   return {
-    pageProps: await Component?.getInitialProps(ctx)
+    pageProps: await Component?.getInitialProps(ctx),
   }
 }
 
-export default App
+export default App

package/pages/_document.tsx

@@ -1,10 +1,4 @@
-import Document, {
-  Html,
-  Head,
-  Main,
-  NextScript,
-  DocumentContext
-} from 'next/document'
+import Document, { Html, Head, Main, NextScript, DocumentContext } from 'next/document'
 import React from 'react'
 import { ServerStyleSheet } from 'styled-components'
 
@@ -12,11 +6,44 @@ const MyDocument = () => {
   return (
     <Html>
       <title>NSGM CLI</title>
-      <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui" />
-      <meta name="apple-mobile-web-app-capable" content="yes" />
+      <meta
+        name="viewport"
+        content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui"
+      />
+      <meta name="mobile-web-app-capable" content="yes" />
       <meta charSet="utf-8" />
       <Head>
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+        {/* 直接使用现有的 FontAwesome CSS 文件 */}
+        <link rel="stylesheet" href="/fonts/font-awesome.min.css" />
+
+        {/* 预加载字体文件以改善性能 */}
+        <link
+          rel="preload"
+          href="/fonts/fontawesome-webfont.woff2?v=4.7.0"
+          as="font"
+          type="font/woff2"
+          crossOrigin="anonymous"
+        />
+        <link
+          rel="preload"
+          href="/fonts/fontawesome-webfont.woff?v=4.7.0"
+          as="font"
+          type="font/woff"
+          crossOrigin="anonymous"
+        />
+
+        {/* 确保字体正确显示的额外样式 */}
+        <style>{`
+          .fa {
+            font-family: FontAwesome !important;
+            font-style: normal !important;
+            font-weight: normal !important;
+            text-decoration: inherit;
+            line-height: 1;
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+          }
+        `}</style>
       </Head>
       <body>
         <Main />
@@ -29,27 +56,20 @@ const MyDocument = () => {
 // MyDocument.renderDocument = Document.renderDocument
 
 MyDocument.getInitialProps = async (ctx: DocumentContext) => {
-  // console.log('document getInitialProps')
-
   const sheet = new ServerStyleSheet()
   const originalRenderPage = ctx.renderPage
 
   try {
     ctx.renderPage = () =>
       originalRenderPage({
-        enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />)
+        enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />),
       })
 
     const initialProps = await Document?.getInitialProps(ctx)
 
     return {
       ...initialProps,
-      styles: (
-        <>
-          {initialProps.styles}
-          {sheet.getStyleElement()}
-        </>
-      )
+      styles: [initialProps.styles, sheet.getStyleElement()],
     }
   } finally {
     sheet.seal()

package/pages/index.tsx

@@ -1,62 +1,79 @@
-import MarkdownIt from 'markdown-it'
 import _ from 'lodash'
 import { Container } from '../client/styled/common'
-import getConfig from 'next/config'
 import React from 'react'
 import { Card, Typography, Divider, Row, Col, Tag } from 'antd'
 import { CodeOutlined, BookOutlined, DatabaseOutlined, SettingOutlined } from '@ant-design/icons'
 
 const { Title, Paragraph, Text } = Typography
 
-const md = new MarkdownIt({
-  html: true,
-  linkify: true,
-  typographer: true
-})
-
-const nextConfig = getConfig()
-const { publicRuntimeConfig } = nextConfig
-const { env } = publicRuntimeConfig
-
-
-const Page = ({ html }) => {
+const Page = () => {
   return (
     <Container>
       <Typography style={{ padding: '24px' }}>
         <Title level={1}>NSGM CLI</Title>
+
         <Paragraph>
           <Row gutter={[16, 16]}>
-            <Col><Tag color="blue">Next</Tag></Col>
-            <Col><Tag color="purple">Styled-components</Tag></Col>
-            <Col><Tag color="magenta">Graphql</Tag></Col>
-            <Col><Tag color="green">Mysql</Tag></Col>
+            <Col>
+              <Tag color="blue">Next</Tag>
+            </Col>
+            <Col>
+              <Tag color="purple">Styled-components</Tag>
+            </Col>
+            <Col>
+              <Tag color="magenta">Graphql</Tag>
+            </Col>
+            <Col>
+              <Tag color="green">Mysql</Tag>
+            </Col>
           </Row>
         </Paragraph>
-        <Paragraph>
-          全栈架构，代码模板生成，快速开发
-        </Paragraph>
+        <Paragraph>全栈架构，代码模板生成，快速开发</Paragraph>
 
         <Card style={{ marginBottom: '24px' }}>
           <Row gutter={[24, 16]}>
             <Col xs={24} md={8}>
-              <Card type="inner" title={<><DatabaseOutlined /> 数据库配置</>}>
+              <Card
+                type="inner"
+                title={
+                  <>
+                    <DatabaseOutlined /> 数据库配置
+                  </>
+                }
+              >
                 数据库采用 Mysql, 配置见 mysql.config.js
               </Card>
             </Col>
             <Col xs={24} md={8}>
-              <Card type="inner" title={<><SettingOutlined /> 项目配置</>}>
+              <Card
+                type="inner"
+                title={
+                  <>
+                    <SettingOutlined /> 项目配置
+                  </>
+                }
+              >
                 项目配置见 project.config.js
               </Card>
             </Col>
             <Col xs={24} md={8}>
-              <Card type="inner" title={<><CodeOutlined /> 框架配置</>}>
+              <Card
+                type="inner"
+                title={
+                  <>
+                    <CodeOutlined /> 框架配置
+                  </>
+                }
+              >
                 Next 框架配置见 next.config.js
               </Card>
             </Col>
           </Row>
         </Card>
 
-        <Title level={2}><BookOutlined /> 命令</Title>
+        <Title level={2}>
+          <BookOutlined /> 命令
+        </Title>
         <Divider />
 
         <Row gutter={[16, 16]}>
@@ -64,8 +81,12 @@ const Page = ({ html }) => {
             <Card hoverable>
               <Title level={4}>项目管理</Title>
               <ul>
-                <li><Text strong>nsgm init</Text> - 初始化项目</li>
-                <li><Text strong>nsgm upgrade</Text> - 升级项目基础文件</li>
+                <li>
+                  <Text strong>nsgm init</Text> - 初始化项目
+                </li>
+                <li>
+                  <Text strong>nsgm upgrade</Text> - 升级项目基础文件
+                </li>
               </ul>
             </Card>
           </Col>
@@ -73,9 +94,15 @@ const Page = ({ html }) => {
             <Card hoverable>
               <Title level={4}>模板操作</Title>
               <ul>
-                <li><Text strong>nsgm create</Text> - 创建模板页面</li>
-                <li><Text strong>nsgm delete</Text> - 删除模板页面</li>
-                <li><Text strong>nsgm deletedb</Text> - 删除模板页面及数据库表</li>
+                <li>
+                  <Text strong>nsgm create</Text> - 创建模板页面
+                </li>
+                <li>
+                  <Text strong>nsgm delete</Text> - 删除模板页面
+                </li>
+                <li>
+                  <Text strong>nsgm deletedb</Text> - 删除模板页面及数据库表
+                </li>
               </ul>
             </Card>
           </Col>
@@ -83,22 +110,40 @@ const Page = ({ html }) => {
             <Card hoverable>
               <Title level={4}>运行与构建</Title>
               <ul>
-                <li><Text strong>nsgm dev</Text> - 开发模式</li>
-                <li><Text strong>nsgm start</Text> - 生产模式</li>
-                <li><Text strong>nsgm build</Text> - 编译</li>
-                <li><Text strong>nsgm export</Text> - 导出静态页面</li>
+                <li>
+                  <Text strong>nsgm dev</Text> - 开发模式
+                </li>
+                <li>
+                  <Text strong>nsgm start</Text> - 生产模式
+                </li>
+                <li>
+                  <Text strong>nsgm build</Text> - 编译
+                </li>
+                <li>
+                  <Text strong>nsgm export</Text> - 导出静态页面
+                </li>
               </ul>
             </Card>
           </Col>
         </Row>
 
-        <Title level={2} style={{ marginTop: '24px' }}>参数</Title>
+        <Title level={2} style={{ marginTop: '24px' }}>
+          参数
+        </Title>
         <Divider />
         <Card>
           <ul>
-            <li><Text strong>dictionary:</Text> 在 export/init 的时候使用, 默认 webapp, 譬如: nsgm export/init dictionary=webapp 或者 nsgm export/init webapp</li>
-            <li><Text strong>controller:</Text> 在 create/delete 的时候使用， 必须有。譬如：nsgm create/delete math</li>
-            <li><Text strong>action:</Text> 在 create/delete 的时候使用， 默认 manage, 跟在 controller 后面， 譬如 nsgm create/delete math test</li>
+            <li>
+              <Text strong>dictionary:</Text> 在 export/init 的时候使用, 默认 webapp, 譬如: nsgm export/init
+              dictionary=webapp 或者 nsgm export/init webapp
+            </li>
+            <li>
+              <Text strong>controller:</Text> 在 create/delete 的时候使用， 必须有。譬如：nsgm create/delete math
+            </li>
+            <li>
+              <Text strong>action:</Text> 在 create/delete 的时候使用， 默认 manage, 跟在 controller 后面， 譬如 nsgm
+              create/delete math test
+            </li>
           </ul>
         </Card>
       </Typography>
@@ -110,4 +155,4 @@ Page.getInitialProps = () => {
   return {}
 }
 
-export default Page
+export default Page