nsgm-cli 2.0.12 → 2.0.15

package/package.json

@@ -1,126 +1,127 @@
-{
-  "name": "nsgm-cli",
-  "version": "2.0.12",
-  "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
-  "main": "index.js",
-  "scripts": {
-    "help": "node ./lib/index.js",
-    "dev": "npm run tsbuild && node ./lib/index.js dev",
-    "tsbuild": "rimraf lib && tsc --build tsconfig.build.json",
-    "build": "node ./lib/index.js build",
-    "tsv": "node ./lib/index.js version",
-    "start": "node ./lib/index.js start",
-    "export": "node ./lib/index.js export",
-    "init": "node ./lib/index.js init",
-    "upgrade": "node ./lib/index.js upgrade",
-    "create": "node ./lib/index.js create",
-    "delete": "node ./lib/index.js delete",
-    "deletedb": "node ./lib/index.js deletedb",
-    "clean": "rimraf .next && rimraf build && rimraf webapp && rimraf lib",
-    "lint": "tslint -p tsconfig.build.json",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "prepare": "npm run tsbuild",
-    "prepublishOnly": "npm run lint",
-    "preversion": "npm run lint",
-    "version": "npm run format && git add -A src",
-    "postversion": "git push && git push --tags",
-    "release": "npm run clean && npm run lint && npm run format && npm run tsbuild && npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/erishen/nsgm.git"
-  },
-  "keywords": [
-    "next",
-    "style-components",
-    "graphql",
-    "mysql",
-    "redux",
-    "react",
-    "hooks",
-    "express"
-  ],
-  "author": {
-    "name": "Erishen Sun",
-    "email": "787058731@qq.com"
-  },
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/erishen/nsgm/issues"
-  },
-  "bin": {
-    "nsgm": "lib/index.js"
-  },
-  "files": [
-    "generation/*",
-    "client/*",
-    "server/*",
-    "pages/*",
-    "lib/*",
-    "public/*",
-    "scripts/*",
-    "*.config.js",
-    ".babelrc",
-    "next-env.d.ts"
-  ],
-  "homepage": "https://github.com/erishen/nsgm#readme",
-  "dependencies": {
-    "@reduxjs/toolkit": "^1.8.5",
-    "antd": "^5.11.0",
-    "axios": "^1.6.0",
-    "body-parser": "^1.19.0",
-    "cors": "^2.8.5",
-    "express": "^4.17.1",
-    "express-fileupload": "^1.2.1",
-    "express-graphql": "^0.12.0",
-    "graphql": "^15.5.0",
-    "lodash": "^4.17.20",
-    "markdown-it": "^12.0.4",
-    "moment": "^2.29.1",
-    "mysql": "^2.18.1",
-    "next": "^14.0.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-redux": "^7.2.2",
-    "redux": "^4.0.5",
-    "redux-thunk": "^2.3.0",
-    "replace": "^1.2.0",
-    "replace-in-file": "^6.2.0",
-    "shelljs": "^0.8.4",
-    "styled-components": "^5.2.1",
-    "terser-webpack-plugin": "4.2.3",
-    "typescript": "^4.1.3",
-    "uglify-js": "^3.16.0",
-    "uuid": "^8.3.2",
-    "webpack": "^5.89.0",
-    "webpack-simple-progress-plugin": "0.0.4",
-    "xlsx": "^0.16.9"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-    "@types/body-parser": "^1.19.0",
-    "@types/express": "^4.17.11",
-    "@types/express-fileupload": "^1.1.6",
-    "@types/express-graphql": "^0.9.0",
-    "@types/graphql": "^14.5.0",
-    "@types/lodash": "^4.14.168",
-    "@types/moment": "^2.13.0",
-    "@types/mysql": "^2.15.17",
-    "@types/next": "^9.0.0",
-    "@types/node": "^20.8.10",
-    "@types/react": "^18.2.36",
-    "@types/react-dom": "^18.2.14",
-    "@types/react-redux": "^7.1.25",
-    "@types/shelljs": "^0.8.8",
-    "@types/styled-components": "^5.1.7",
-    "@types/uuid": "^8.3.0",
-    "babel-plugin-react-html-attrs": "^3.0.5",
-    "babel-plugin-styled-components": "^1.12.0",
-    "cross-env": "^7.0.3",
-    "prettier": "^2.2.1",
-    "rimraf": "^3.0.2",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
-  }
-}
+{
+  "name": "nsgm-cli",
+  "version": "2.0.15",
+  "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
+  "main": "index.js",
+  "scripts": {
+    "help": "node ./lib/index.js",
+    "dev": "npm run tsbuild && node ./lib/index.js dev",
+    "tsbuild": "rimraf lib && tsc --build tsconfig.build.json",
+    "build": "node ./lib/index.js build",
+    "tsv": "node ./lib/index.js version",
+    "start": "node ./lib/index.js start",
+    "export": "node ./lib/index.js export",
+    "init": "node ./lib/index.js init",
+    "upgrade": "node ./lib/index.js upgrade",
+    "create": "node ./lib/index.js create",
+    "delete": "node ./lib/index.js delete",
+    "deletedb": "node ./lib/index.js deletedb",
+    "clean": "rimraf .next && rimraf build && rimraf webapp && rimraf lib",
+    "lint": "tslint -p tsconfig.build.json",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "prepare": "npm run tsbuild",
+    "prepublishOnly": "npm run lint",
+    "preversion": "npm run lint",
+    "version": "npm run format && git add -A src",
+    "postversion": "git push && git push --tags",
+    "release": "npm run clean && npm run lint && npm run format && npm run tsbuild && npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/erishen/nsgm.git"
+  },
+  "keywords": [
+    "next",
+    "style-components",
+    "graphql",
+    "mysql",
+    "redux",
+    "react",
+    "hooks",
+    "express"
+  ],
+  "author": {
+    "name": "Erishen Sun",
+    "email": "leisun8309@gmail.com"
+  },
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/erishen/nsgm/issues"
+  },
+  "bin": {
+    "nsgm": "lib/index.js"
+  },
+  "files": [
+    "generation/*",
+    "client/*",
+    "server/*",
+    "pages/*",
+    "lib/*",
+    "public/*",
+    "scripts/*",
+    "*.config.js",
+    ".babelrc",
+    "next-env.d.ts"
+  ],
+  "homepage": "https://github.com/erishen/nsgm#readme",
+  "dependencies": {
+    "@reduxjs/toolkit": "^1.8.5",
+    "antd": "^5.11.0",
+    "axios": "^1.6.0",
+    "body-parser": "^1.19.0",
+    "cors": "^2.8.5",
+    "exceljs": "^4.4.0",
+    "express": "^4.17.1",
+    "express-fileupload": "^1.2.1",
+    "express-graphql": "^0.12.0",
+    "file-saver": "^2.0.5",
+    "graphql": "^15.5.0",
+    "lodash": "^4.17.20",
+    "markdown-it": "^12.0.4",
+    "moment": "^2.29.1",
+    "mysql": "^2.18.1",
+    "next": "^14.0.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-redux": "^7.2.2",
+    "redux": "^4.0.5",
+    "redux-thunk": "^2.3.0",
+    "replace": "^1.2.0",
+    "replace-in-file": "^6.2.0",
+    "shelljs": "^0.8.4",
+    "styled-components": "^5.2.1",
+    "terser-webpack-plugin": "4.2.3",
+    "typescript": "^4.1.3",
+    "uglify-js": "^3.16.0",
+    "uuid": "^8.3.2",
+    "webpack": "^5.89.0",
+    "webpack-simple-progress-plugin": "0.0.4"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+    "@types/body-parser": "^1.19.0",
+    "@types/express": "^4.17.11",
+    "@types/express-fileupload": "^1.1.6",
+    "@types/express-graphql": "^0.9.0",
+    "@types/graphql": "^14.5.0",
+    "@types/lodash": "^4.14.168",
+    "@types/moment": "^2.13.0",
+    "@types/mysql": "^2.15.17",
+    "@types/next": "^9.0.0",
+    "@types/node": "^20.8.10",
+    "@types/react": "^18.2.36",
+    "@types/react-dom": "^18.2.14",
+    "@types/react-redux": "^7.1.25",
+    "@types/shelljs": "^0.8.8",
+    "@types/styled-components": "^5.1.7",
+    "@types/uuid": "^8.3.0",
+    "babel-plugin-react-html-attrs": "^3.0.5",
+    "babel-plugin-styled-components": "^1.12.0",
+    "cross-env": "^7.0.3",
+    "prettier": "^2.2.1",
+    "rimraf": "^3.0.2",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0"
+  }
+}

package/pages/_app.tsx

@@ -1,54 +1,54 @@
-import React, { useEffect, useState } from 'react'
-import { Provider } from 'react-redux'
-import { ThemeProvider } from 'styled-components'
-import { useStore } from '../client/redux/store'
-import { GlobalStyle, Loading } from '../client/styled/common'
-import LayoutComponent from '../client/layout'
-import { login } from '../client/utils/sso'
-import { Spin } from 'antd'
-import 'antd/dist/reset.css'
-
-const theme = {
-  colors: {
-    primary: '#0070f3'
-  }
-}
-
-export default function App({ Component, pageProps }) {
-  const store = useStore(pageProps.initialReduxState)
-  const [ssoUser, setSsoUser] = useState(null)
-  const [pageLoad, setPageLoad] = useState(false)
-
-  useEffect(() => {
-    login((user: any) => { 
-      if (user) { 
-        // console.log('checkLogin_user', user)
-        setSsoUser(user)
-      }
-    })
-
-    setTimeout(() => { 
-      setPageLoad(true)
-    }, 100)
-  }, [])
-
-  return (
-    <>
-      <GlobalStyle whiteColor={true} />
-      <ThemeProvider theme={theme}>
-        <Provider store={store}>
-          {
-            pageLoad ?
-              ssoUser ? <LayoutComponent user={ssoUser}>
-                  <Component {...pageProps} />
-                </LayoutComponent> : 
-                <Component {...pageProps} /> :
-              <Loading>
-                <Spin size="large" />
-              </Loading>
-          }
-        </Provider>
-      </ThemeProvider>
-    </>
-  )
-}
+import React, { useEffect, useState } from 'react'
+import { Provider } from 'react-redux'
+import { ThemeProvider } from 'styled-components'
+import { useStore } from '../client/redux/store'
+import { GlobalStyle, Loading } from '../client/styled/common'
+import LayoutComponent from '../client/layout'
+import { login } from '../client/utils/sso'
+import { Spin } from 'antd'
+import 'antd/dist/reset.css'
+
+const theme = {
+  colors: {
+    primary: '#0070f3'
+  }
+}
+
+export default function App({ Component, pageProps }) {
+  const store = useStore(pageProps.initialReduxState)
+  const [ssoUser, setSsoUser] = useState(null)
+  const [pageLoad, setPageLoad] = useState(false)
+
+  useEffect(() => {
+    login((user: any) => { 
+      if (user) { 
+        // console.log('checkLogin_user', user)
+        setSsoUser(user)
+      }
+    })
+
+    setTimeout(() => { 
+      setPageLoad(true)
+    }, 100)
+  }, [])
+
+  return (
+    <>
+      <GlobalStyle whiteColor={true} />
+      <ThemeProvider theme={theme}>
+        <Provider store={store}>
+          {
+            pageLoad ?
+              ssoUser ? <LayoutComponent user={ssoUser}>
+                  <Component {...pageProps} />
+                </LayoutComponent> : 
+                <Component {...pageProps} /> :
+              <Loading>
+                <Spin size="large" />
+              </Loading>
+          }
+        </Provider>
+      </ThemeProvider>
+    </>
+  )
+}

package/pages/_document.tsx

@@ -1,55 +1,55 @@
-import Document, {
-  Html,
-  Head,
-  Main,
-  NextScript,
-  DocumentContext
-} from 'next/document'
-import React from 'react'
-import { ServerStyleSheet } from 'styled-components'
-
-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 charSet="utf-8"/>
-      <Head />
-      <body>
-        <Main />
-        <NextScript />
-      </body>
-    </Html>
-  )
-}
-
-// MyDocument.renderDocument = Document.renderDocument
-
-MyDocument.getInitialProps = async (ctx: DocumentContext) => {
-  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)
-
-    return {
-      ...initialProps,
-      styles: (
-        <>
-          {initialProps.styles}
-          {sheet.getStyleElement()}
-        </>
-      )
-    }
-  } finally {
-    sheet.seal()
-  }
-}
-
-export default MyDocument
+import Document, {
+  Html,
+  Head,
+  Main,
+  NextScript,
+  DocumentContext
+} from 'next/document'
+import React from 'react'
+import { ServerStyleSheet } from 'styled-components'
+
+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 charSet="utf-8"/>
+      <Head />
+      <body>
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
+  )
+}
+
+// MyDocument.renderDocument = Document.renderDocument
+
+MyDocument.getInitialProps = async (ctx: DocumentContext) => {
+  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)
+
+    return {
+      ...initialProps,
+      styles: (
+        <>
+          {initialProps.styles}
+          {sheet.getStyleElement()}
+        </>
+      )
+    }
+  } finally {
+    sheet.seal()
+  }
+}
+
+export default MyDocument

package/pages/index.tsx

@@ -1,69 +1,69 @@
-import MarkdownIt from 'markdown-it'
-import _ from 'lodash'
-import { Container } from '../client/styled/common'
-import getConfig from 'next/config'
-import React from 'react'
-
-const md = new MarkdownIt({
-  html: true,
-  linkify: true,
-  typographer: true
-})
-
-const nextConfig = getConfig()
-const { publicRuntimeConfig } = nextConfig
-const { env } = publicRuntimeConfig
-
-const renderArr:any = []
-
-renderArr.push('# NSGM CLI ' + env)
-renderArr.push('- 技术栈: [Next](https://github.com/vercel/next.js), [Styled-components](https://github.com/styled-components/styled-components), [Graphql](https://graphql.org/), [Mysql](https://www.mysql.com/)')
-renderArr.push('- 全栈架构，代码模板生成，快速开发')
-renderArr.push('- 数据库采用 Mysql, 配置见 mysql.config.js')
-renderArr.push('- 项目配置见 project.config.js')
-renderArr.push('- Next 框架配置见 next.config.js')
-
-renderArr.push('## 命令')
-renderArr.push('- nsgm init     初始化项目')
-renderArr.push('- nsgm upgrade  升级项目基础文件')
-renderArr.push('- nsgm create   创建模板页面')
-renderArr.push('- nsgm delete   删除模板页面')
-renderArr.push('- nsgm deletedb 删除模板页面及数据库表')
-renderArr.push('- nsgm dev      开发模式')
-renderArr.push('- nsgm start    生产模式')
-renderArr.push('- nsgm build    编译')
-renderArr.push('- nsgm export   导出静态页面')
-
-renderArr.push('## 参数')
-renderArr.push('- dictionary: 在 export/init 的时候使用, 默认 webapp, 譬如: nsgm export/init dictionary=webapp 或者 nsgm export/init webapp')
-renderArr.push('- controller: 在 create/delete 的时候使用， 必须有。譬如：nsgm create/delete math')
-renderArr.push('- action:     在 create/delete 的时候使用， 默认 manage, 跟在 controller 后面， 譬如 nsgm create/delete math test')
-
-
-const Page = ({ html }) => { 
-
-  const createMarkup = () => {
-    return {
-      __html: html
-    }
-  }
-
-  return (
-    <Container>
-      <div dangerouslySetInnerHTML={createMarkup()} />
-    </Container>
-  )
-}
-
-Page.getInitialProps = () => {
-  let html = ''
-  _.each(renderArr, (item, index) => { 
-    html += md.render(item)
-  })
-
-  return {
-    html
-  }
-}
-
+import MarkdownIt from 'markdown-it'
+import _ from 'lodash'
+import { Container } from '../client/styled/common'
+import getConfig from 'next/config'
+import React from 'react'
+
+const md = new MarkdownIt({
+  html: true,
+  linkify: true,
+  typographer: true
+})
+
+const nextConfig = getConfig()
+const { publicRuntimeConfig } = nextConfig
+const { env } = publicRuntimeConfig
+
+const renderArr:any = []
+
+renderArr.push('# NSGM CLI ' + env)
+renderArr.push('- 技术栈: [Next](https://github.com/vercel/next.js), [Styled-components](https://github.com/styled-components/styled-components), [Graphql](https://graphql.org/), [Mysql](https://www.mysql.com/)')
+renderArr.push('- 全栈架构，代码模板生成，快速开发')
+renderArr.push('- 数据库采用 Mysql, 配置见 mysql.config.js')
+renderArr.push('- 项目配置见 project.config.js')
+renderArr.push('- Next 框架配置见 next.config.js')
+
+renderArr.push('## 命令')
+renderArr.push('- nsgm init     初始化项目')
+renderArr.push('- nsgm upgrade  升级项目基础文件')
+renderArr.push('- nsgm create   创建模板页面')
+renderArr.push('- nsgm delete   删除模板页面')
+renderArr.push('- nsgm deletedb 删除模板页面及数据库表')
+renderArr.push('- nsgm dev      开发模式')
+renderArr.push('- nsgm start    生产模式')
+renderArr.push('- nsgm build    编译')
+renderArr.push('- nsgm export   导出静态页面')
+
+renderArr.push('## 参数')
+renderArr.push('- dictionary: 在 export/init 的时候使用, 默认 webapp, 譬如: nsgm export/init dictionary=webapp 或者 nsgm export/init webapp')
+renderArr.push('- controller: 在 create/delete 的时候使用， 必须有。譬如：nsgm create/delete math')
+renderArr.push('- action:     在 create/delete 的时候使用， 默认 manage, 跟在 controller 后面， 譬如 nsgm create/delete math test')
+
+
+const Page = ({ html }) => { 
+
+  const createMarkup = () => {
+    return {
+      __html: html
+    }
+  }
+
+  return (
+    <Container>
+      <div dangerouslySetInnerHTML={createMarkup()} />
+    </Container>
+  )
+}
+
+Page.getInitialProps = () => {
+  let html = ''
+  _.each(renderArr, (item, index) => { 
+    html += md.render(item)
+  })
+
+  return {
+    html
+  }
+}
+
 export default Page