nsgm-cli 1.0.27 → 2.0.0

package/next.config.js

@@ -1,7 +1,7 @@
 /**
  * Created by lei_sun on 2019/7/9.
  */
-const { PHASE_DEVELOPMENT_SERVER } = require('next/constants')
+const { PHASE_DEVELOPMENT_SERVER, PHASE_EXPORT } = require('next/constants')
 const fs = require('fs')
 const { promisify } = require('util')
 const { join } = require('path')
@@ -11,8 +11,11 @@ const TerserPlugin = require('terser-webpack-plugin')
 
 module.exports = (phase, defaultConfig, options) => {
   let projectConfig = null
+  let pkg = null
+
   const curFolder = process.cwd()
   const curProjectConfigPath = curFolder + '/project.config.js'
+  const curPkgPath = curFolder + '/package.json'
 
   if (fs.existsSync(curProjectConfigPath)) {
     projectConfig = require(curProjectConfigPath)
@@ -20,192 +23,209 @@ module.exports = (phase, defaultConfig, options) => {
     projectConfig = require('./project.config.js')
   }
 
-  // console.log('projectConfig', projectConfig)
-  let { version, prefix, protocol, host, port } = projectConfig 
-
-    if(options != undefined){
-      version = options.version
-      prefix = options.prefix
-      protocol = options.protocol
-      host = options.host
-      port = options.port
-      // console.log('options', options)
-    }
+  if (fs.existsSync(curPkgPath)) {
+    pkg = require(curPkgPath)
+  } else {
+    pkg = require('./package.json')
+  }
 
-    // console.log('phase', phase, PHASE_DEVELOPMENT_SERVER, version, prefix, protocol, host, port)
-
-    let configObj = {
-        async rewrites() {
-          return [
-            {
-              source: prefix + '/:slug*',
-              destination: '/:slug*'
-            }  
-          ]
-        },
-        //target: 'serverless',
-        assetPrefix: '',
-        crossOrign: 'anonymous',
-        serverRuntimeConfig: {},
-        publicRuntimeConfig: {
-          version,
-          prefix,
-          protocol,
-          host,
-          port,
-          phase
-        },
-        generateBuildId: async () => {
-            return 'nsgm-cli-' + version
-        },
-        exportPathMap: async function (defaultPathMap,
-            { dev, dir, outDir }) {
-            if (dev) {
-                return defaultPathMap
-            }
+  const env = (pkg && pkg.config && pkg.config.env && pkg.config.env.toUpperCase()) || 'PROD'
 
-            return defaultPathMap
-        },
-        generateEtags: false,
-        useFileSystemPublicRoutes: true,
-        webpack: (config, { dev, isServer }) => {
-          //console.log('dev', dev, isServer)
-
-          if(!dev){
-            if(!isServer){
-              config.optimization.splitChunks = {
-                cacheGroups: {
-                  default: false,
-                  vendors: false,
-                  framework: {
-                    //将react和react-dom打入framework当中
-                    name: 'framework',
-                    chunks: 'all',
-                    test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/, //匹配库当中的react和react-dom
-                    priority: 40, //权重为40 最大权重
-                  },
-                  lib: {
-                    test(module) {
-                      //匹配包大于160000的
-                      if(module.size() > 100000){
-                        console.log('test_module', module.identifier(), module.size())
-                      }
-                      return module.size() > 100000
-                    },
-                    name(module) {
-                      //名字就是包当中的名字
-                      return (
-                        /[\\/]node_modules[\\/](.*)/.exec(module.identifier()) && 
-                        /[\\/]node_modules[\\/](.*)/.exec(module.identifier()).length && 
-                        /[\\/]node_modules[\\/](.*)/.exec(module.identifier())[1].replace(/\/|\\/g, '_')
-                      )
-                    },
-                    priority: 30, //权重为30
-                    minChunks: 1, //最小共用次数为1时就使用
-                    reuseExistingChunk: true
-                  },
-                  commons: {
-                    name: 'commons',
-                    chunks: 'all',
-                    minChunks: 20,
-                    maxSize: 30720,
-                    priority: 20
-                  },
-                  shared: {
-                    priority: 10,
-                    minChunks: 2,
-                    reuseExistingChunk: true
-                  },
-                  styles: {
-                    name: 'styles',
-                    test: /\.css$/,
-                    chunks: 'all',
-                    maxSize: 30720,
-                    enforce: true
-                  },
-                  less: {
-                    name: 'less',
-                    test: /\.less$/,
-                    chunks: 'all',
-                    maxSize: 30720,
-                    enforce: true
-                  }
-                }
-              }
-              config.output.chunkFilename = `static/chunks/[name].${version}.js`
+  // console.log('projectConfig', projectConfig)
+  let { version, prefix, protocol, host, port } = projectConfig
+
+  // console.log('options', options)
+  if (options != undefined) {
+    version = options.version
+    prefix = options.prefix
+    protocol = options.protocol
+    host = options.host
+    port = options.port
+  }
 
-              config.output.filename = ({ chunk }) => {
-                const { name } = chunk
-                //console.log('name', name)
+  if (phase === PHASE_DEVELOPMENT_SERVER) {
+    prefix = ''
+  }
 
-                if(name === 'main'){
-                  return `static/main.${version}.js`
-                } else if(name === 'polyfills') {
-                  return `static/polyfills.${version}.js`
-                } else if(name.indexOf('webpack') != -1){
-                  return `[name]`
-                }
+  // console.log('phase', phase, version, prefix, protocol, host, port)
+
+  let configObj = {
+    //target: 'serverless',
+    // crossOrign: 'anonymous',
+    serverRuntimeConfig: {},
+    publicRuntimeConfig: {
+      version,
+      prefix,
+      protocol,
+      host,
+      port,
+      env,
+      phase,
+      isExport: (phase === PHASE_EXPORT)
+    },
+    generateBuildId: async () => {
+      return 'nsgm-cli-' + version
+    },
+    exportPathMap: async function (defaultPathMap, { dev, dir, outDir }) {
+      if (dev) {
+        return defaultPathMap
+      }
+
+      return defaultPathMap
+    },
+    generateEtags: false,
+    useFileSystemPublicRoutes: true,
+    webpack: (config, { dev, isServer }) => {
+      //console.log('dev', dev, isServer)
+
+      if (!dev) {
+        if (!isServer) {
+          config.optimization.splitChunks = {
+            cacheGroups: {
+              default: false,
+              vendors: false,
+              framework: {
+                //将react和react-dom打入framework当中
+                name: 'framework',
+                chunks: 'all',
+                test: /[\\/]node_modules[\\/](react|react-dom)[\\/]/, //匹配库当中的react和react-dom
+                priority: 40 //权重为40 最大权重
+              },
+              lib: {
+                test(module) {
+                  //匹配包大于160000的
+                  return module.size() > 160000
+                },
+                name(module) {
+                  //名字就是包当中的名字
+                  return (
+                    /[\\/]node_modules[\\/](.*)/.exec(module.identifier()) &&
+                    /[\\/]node_modules[\\/](.*)/.exec(module.identifier()).length &&
+                    /[\\/]node_modules[\\/](.*)/.exec(module.identifier())[1].replace(/\/|\\/g, '_')
+                  )
+                },
+                priority: 30, //权重为30
+                minChunks: 1, //最小共用次数为1时就使用
+                reuseExistingChunk: true
+              },
+              commons: {
+                name: 'commons',
+                chunks: 'all',
+                minChunks: 20,
+                maxSize: 30720,
+                priority: 20
+              },
+              shared: {
+                priority: 10,
+                minChunks: 2,
+                reuseExistingChunk: true
+              },
+              styles: {
+                name: 'styles',
+                test: /\.css$/,
+                chunks: 'all',
+                maxSize: 30720,
+                enforce: true,
+              },
+              less: {
+                name: 'less',
+                test: /\.less$/,
+                chunks: 'all',
+                maxSize: 30720,
+                enforce: true,
+              },
+            }
+          }
+          config.output.chunkFilename = `static/chunks/[name].${version}.js`
+
+          config.output.filename = ({ chunk }) => {
+            const { name } = chunk
+            //console.log('name', name)
+
+            if (name === 'main') {
+              return `static/main.${version}.js`
+            } else if (name === 'polyfills') {
+              return `static/polyfills.${version}.js`
+            } else if (name.indexOf('webpack') != -1) {
+              return `[name]`
+            }
 
-                return `static/[name].${version}.js`
-              }
+            return `static/[name].${version}.js`
+          }
+
+          config.optimization.runtimeChunk = {
+            name: `static/runtime/webpack.${version}.js`
+          }
+        }
 
-              config.optimization.runtimeChunk = {
-                name: `static/runtime/webpack.${version}.js`,
+        config.plugins.map((plugin) => {
+          //console.log('plugin.constructor.name', plugin.constructor.name)
+          if ('NextMiniCssExtractPlugin' == plugin.constructor.name) {
+            plugin.options = {
+              filename: `static/css/[name].${version}.css`,
+              chunkFilename: `static/css/[name].${version}.css`,
+              moduleFilename: ({ name }) => {
+                //console.log('name', name)
+                return `static/css/${name}.${version}.css`
               }
             }
-
-            config.plugins.map(plugin => {
-              //console.log('plugin.constructor.name', plugin.constructor.name)
-              if ('NextMiniCssExtractPlugin' == plugin.constructor.name) {
-                plugin.options = {
-                  filename: `static/css/[name].${version}.css`,
-                  chunkFilename: `static/css/[name].${version}.css`,
-                  moduleFilename: ({ name }) => {
-                    //console.log('name', name)
-                    return `static/css/${name}.${version}.css`
-                  }
+          }
+        })
+
+        config.plugins.push(new SimpleProgressPlugin())
+
+        config.optimization.minimizer = [
+          new TerserPlugin({
+            parallel: true,
+            terserOptions: {
+              ecma: 6
+            },
+            minify: (file, sourceMap) => {
+              // https://github.com/mishoo/UglifyJS2#minify-options
+              const uglifyJsOptions = {
+                /* your `uglify-js` package options */
+                compress: {
+                  // warnings: true,
+                  drop_console: true,
+                  drop_debugger: true
                 }
               }
-            })
-
-            config.plugins.push(new SimpleProgressPlugin())
-    
-            config.optimization.minimizer = [
-              new TerserPlugin({
-                parallel: true,
-                terserOptions: {
-                  ecma: 6
-                },
-                minify: (file, sourceMap) => {
-                  // https://github.com/mishoo/UglifyJS2#minify-options
-                  const uglifyJsOptions = {
-                    /* your `uglify-js` package options */
-                    compress: {
-                      warnings: true,
-                      drop_console: true,
-                      drop_debugger: true
-                    }
-                  }
-    
-                  if (sourceMap) {
-                    uglifyJsOptions.sourceMap = {
-                      content: sourceMap
-                    }
-                  }
-    
-                  return require('uglify-es').minify(file, uglifyJsOptions)
+
+              if (sourceMap) {
+                uglifyJsOptions.sourceMap = {
+                  content: sourceMap
                 }
-              })
-            ]
-          }
+              }
 
-          return config
-        }
+              return require('uglify-js').minify(file, uglifyJsOptions)
+            }
+          })
+        ]
+      }
+
+      return config
     }
+  }
 
-    if(phase != PHASE_DEVELOPMENT_SERVER){
-        configObj.distDir = 'build'
+  if (phase !== PHASE_DEVELOPMENT_SERVER) {
+    configObj = {
+      ...configObj,
+      distDir: 'build',
+      assetPrefix: prefix,
+      async rewrites() {
+        return [
+          {
+            source: prefix === '' ? '/' : prefix,
+            destination: '/'
+          },
+          {
+            source: prefix + '/:slug*',
+            destination: '/:slug*'
+          }
+        ]
+      }
     }
+  }
 
-    return configObj
-}
+  return configObj
+}

package/package.json

@@ -1,113 +1,125 @@
-{
-  "name": "nsgm-cli",
-  "version": "1.0.27",
-  "description": "A CLI tool to run Next/Style-components and Graphql/Mysql fullstack project",
-  "main": "index.js",
-  "scripts": {
-    "dev": "node ./lib/index.js dev",
-    "build": "next 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",
-    "clean": "rimraf .next && rimraf build && rimraf webapp && rimraf lib",
-    "tsbuild": "rimraf lib && tsc --build tsconfig.build.json",
-    "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 lint && npm run tsbuild && npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/erishen/nsgm-cli.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-cli/issues"
-  },
-  "bin": {
-    "nsgm": "lib/index.js"
-  },
-  "files": [
-    "generation/*",
-    "lib/*",
-    "*.config.js"
-  ],
-  "homepage": "https://github.com/erishen/nsgm-cli#readme",
-  "dependencies": {
-    "antd": "^4.11.2",
-    "axios": "^0.21.1",
-    "body-parser": "^1.19.0",
-    "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": "^11.0.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-redux": "^7.2.2",
-    "redux": "^4.0.5",
-    "redux-devtools-extension": "^2.13.8",
-    "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-es": "^3.3.9",
-    "webpack": "^5.44.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": "^14.14.22",
-    "@types/react": "18.0.1",
-    "@types/react-dom": "^18.0.11",
-    "@types/react-redux": "^7.1.16",
-    "@types/shelljs": "^0.8.8",
-    "@types/styled-components": "^5.1.7",
-    "babel-plugin-react-html-attrs": "^3.0.5",
-    "babel-plugin-styled-components": "^1.12.0",
-    "prettier": "^2.2.1",
-    "rimraf": "^3.0.2",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
-  }
-}
+{
+  "name": "nsgm-cli",
+  "version": "2.0.0",
+  "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",
+    "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 tsbuild && npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/erishen/nsgm-cli.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-cli/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-cli#readme",
+  "dependencies": {
+    "next": "^11.0.1",
+    "@reduxjs/toolkit": "^1.8.5",
+    "antd": "^4.11.2",
+    "axios": "^0.21.1",
+    "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",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "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": "4.44.1",
+    "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": "^14.14.31",
+    "@types/react": "18.0.1",
+    "@types/react-dom": "^18.0.11",
+    "@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"
+  }
+}