@autobest-ui/scripts 1.9.4 → 1.9.5

package/README.md

@@ -51,12 +51,11 @@ module.exports = function(
 #### app.config.js 介绍
 
 ##### start 配置参数说明(作用于`react-spa start` 或者 `react-ssr start`)
-|  参数名   | 默认值  | 说明                                |
-|  ----  |------|-----------------------------------|
-| startDefaultPort | 3030 | start默认端口号， 可自定义，下面介绍             |
-| startOpenPath  | '/'  | start 打开浏览器的路径                    |
+|  参数名   | 默认值  | 说明  |
+|  ----  |------| ----  |
+| startDefaultPort | 3030 | start默认端口号， 可自定义，下面介绍                 |
+| startOpenPath  | '/'  |  start 打开浏览器的路径                   |
 | getStartEnvConfig  | {}   | start 自定义环境变量的方法，会追加到process.env中 |
-| devServer  | {}   | start 自定义devServer配置       |
 
 ##### hot ssr 配置参数说明(作用于`react-ssr ssr`)
 |  参数名  | 默认值                            | 说明  |
@@ -75,26 +74,27 @@ module.exports = function(
 | buildClientLoadableConfig.writeToDiskFilename  | '/build'              | build ssr 自定义按需加载路径存储库文件存放位置 |
 
 ##### 公共配置
-| 参数名     | 默认值  | 说明   |
-|----------|------|------|
+| 参数名     | 默认值           | 说明   |
+|----------|---------------|------|
 | htmlPluginTemplate | '/index.html' | client端，模板html路径                   |
-| htmlPluginFavicon  | undefined |  client端，favicon.ico路径，也可以通过nginx配置 |
-| baseStaticMediaPath  | static |  静态资源图片等基础文件夹 |
-| baseStaticCssPath  | css  |  静态资源css基础文件夹 |
-| baseStaticJsPath  | js   |  静态资源js基础文件夹 |
+| htmlPluginFavicon  | undefined      |  client端，favicon.ico路径，也可以通过nginx配置 |
 
 ## 自定义
 
-#### 系统支持的运行参数
-| 参数名                 | 默认值               | 说明                                                             |
-|---------------------|-------------------|----------------------------------------------------------------|
-| --port 3031         | startDefaultPort值 | 覆盖默认端口号 `react-spa start --port 3031`                          |
-| --eslint            | false             | 运行时是否启动语法检查 `react-spa start --eslint`，`build`情况下该参数失效，不执行语法检查 |
+#### 自定义端口
+
+##### react-spa 自定义方式
+`react-spa start --port 3031` 或者已经在package.json.scripts中定义后(`{start: "react-spa start"}`), 将需要这样写 `npm run start -- --port 3031`
+
+##### react-ssr 自定义方式
+1. `react-ssr start --port 3031` 或者已经在package.json.scripts中定义后(`{start: "react-ssr start"}`), 将需要这样写 `npm run start -- --port 3031`
+1. `react-ssr server --port 3031` 或者已经在package.json.scripts中定义后(`{server: "react-ssr server"}`), 将需要这样写 `npm run server -- --port 3031`
+
 
 #### 自定义其他参数
 **例如：**
-- `react-spa start --site APW`
-- `react-ssr start --port 3032 --site APW`
+`react-spa start --site APW`
+`react-ssr start --port 3032 --site APW`
 
 该参数将解析成对象，通过get**EnvConfig()参数传递，此方式，可区分自定义的环境变量，例如：www2.0项目中site的区分。
 

package/common/appConfig.js

@@ -26,7 +26,6 @@ const defaultConfig = {
   startDefaultPort: 3030,
   startOpenPath: '/',
   getStartEnvConfig: () => ({}),
-  devServer: {},
 
   // hot ssr默认配置
   hotSsrDefaultPort: 9090,
@@ -43,13 +42,7 @@ const defaultConfig = {
     writeToDiskFilename: '/build'
   },
   // html模板
-  htmlPluginTemplate: '/index.html',
-  // 静态资源图片等基础文件夹
-  baseStaticMediaPath: 'static',
-  // 静态资源css基础文件夹
-  baseStaticCssPath: 'css',
-  // 静态资源js基础文件夹
-  baseStaticJsPath: 'js'
+  htmlPluginTemplate: '/index.html'
 };
 
 module.exports = {

package/common/start.js

@@ -1,5 +1,4 @@
 const WebpackDevServer = require('webpack-dev-server');
-const { merge } = require('webpack-merge');
 const webpack = require('webpack');
 const open = require('open');
 const appConfig = require('./appConfig');
@@ -16,40 +15,37 @@ function openStartRun(webpackFactory) {
 
   const extendEnv = getEnvironmentInfo();
 
-  const options = merge(
-    {
-      headers: {
-        'Access-Control-Allow-Origin': '*'
-      },
-      allowedHosts: 'all',
-      hot: true,
-      host: HOST,
-      port: PORT,
-      compress: true,
-      historyApiFallback: {
-        // https://github.com/facebook/create-react-app/issues/387.
-        disableDotRule: true
-      },
-      client: {
-        overlay: false,
-        progress: false
-      },
-      static: {
-        watch: {
-          aggregateTimeout: 300,
-          poll: 1000,
-          ignored: /node_modules/
-        }
-      }
+  const options = {
+    headers: {
+      'Access-Control-Allow-Origin': '*'
+    },
+    allowedHosts: 'all',
+    hot: true,
+    host: HOST,
+    port: PORT,
+    compress: true,
+    historyApiFallback: {
+      // https://github.com/facebook/create-react-app/issues/387.
+      disableDotRule: true
     },
-    appConfig.devServer
-  );
+    client: {
+      overlay: false,
+      progress: false
+    },
+    static: {
+      watch: {
+        aggregateTimeout: 300,
+        poll: 1000,
+        ignored: /node_modules/
+      }
+    }
+  };
 
   const startOpenPath = appConfig.startOpenPath ? appConfig.startOpenPath : '';
   try {
     const config = extendWebpackConfigFromProject(
       webpackFactory,
-      { ...appConfig, startOpenPath, ...parseArgsToJson, port: PORT },
+      { ...appConfig, port: PORT, startOpenPath },
       extendEnv,
       { isProd: false, isServer: false, isHotServer: false }
     );

package/common/utils.js

@@ -4,8 +4,6 @@ const fs = require('fs');
 // 执行node命令时候的文件绝对路径
 const root = process.cwd();
 
-const argsReg = /^--[0-9a-zA-Z]+$/;
-
 /**
  * 从根目录开始获取文件绝对地址路径
  * @param filePath 文件参数
@@ -17,35 +15,21 @@ function getProjectPath(...filePath) {
 
 function getParseArgsToJson() {
   const args = process.argv.slice(2);
+  const length = args.length - 1;
   const result = {};
-  const length = args.length;
-  for (let count = 0; count < args.length; count++) {
-    if (!length || count >= length) {
-      break;
-    }
-    if (!argsReg.test(args[0])) {
-      throw Error('Run args error, example: "--port 3030" or "--eslint"');
+  let count = 0;
+  while (count <= length) {
+    if (!/^--[0-9a-z]+$/.test(args[count])) {
+      throw Error('Run args error, example: --port 3030');
     }
-    const currentItem = args[count];
-    if (argsReg.test(currentItem)) {
-      const key = currentItem.substring(2);
-      if (count + 1 >= length) {
-        result[key] = true;
-        break;
-      }
-      const nextItem = args[count + 1];
-      if (argsReg.test(nextItem)) {
-        result[key] = true;
-        continue;
-      }
-      result[key] = isNaN(Number(nextItem))
-        ? nextItem === 'false'
-          ? false
-          : nextItem === 'true'
-          ? true
-          : nextItem
-        : Number(nextItem);
+    const key = args[count].substring(2);
+    count++;
+    if (count > length) {
+      result[key] = '';
+      break;
     }
+    result[key] = isNaN(Number(args[count])) ? args[count] : Number(args[count]);
+    count++;
   }
   return result;
 }

package/common/version.js

@@ -8,7 +8,8 @@ function getCurrentVersion() {
   const month = date.getMonth() + 1;
   const day = date.getDate();
   const hour = date.getHours();
-  return `${year}${getCompleteVal(month)}${getCompleteVal(day)}${getCompleteVal(hour)}`;
+  const minutes = date.getMinutes();
+  return `${year}${getCompleteVal(month)}${getCompleteVal(day)}${getCompleteVal(hour)}${getCompleteVal(minutes)}`;
 }
 
 /**

package/common/webpack.common.js

@@ -1,5 +1,6 @@
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const ESLintPlugin = require('eslint-webpack-plugin');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 const getCSSModuleLocalIdent = require('./getCSSModuleLocalIdent');
 
@@ -116,7 +117,7 @@ module.exports = (appConfig, extendEnv, { isProd, isServer, isHotServer }) => {
                 }
               },
               generator: {
-                filename: `${appConfig.baseStaticMediaPath}/[name].[contenthash:8].[ext]?v=${extendEnv.version}`
+                filename: `static/[name].[contenthash:8].[ext]?v=${extendEnv.version}`
               }
             },
             {
@@ -214,6 +215,13 @@ module.exports = (appConfig, extendEnv, { isProd, isServer, isHotServer }) => {
     },
     plugins: [
       new webpack.DefinePlugin(extendEnv.stringified),
+      new ESLintPlugin({
+        exclude: 'node_modules',
+        threads: 4,
+        failOnError: false,
+        lintDirtyModulesOnly: isProd,
+        extensions: ['tsx', 'ts', 'js']
+      }),
       new ProgressBarPlugin({
         // eslint-disable-next-line no-useless-concat
         format: 'build [:bar] ' + ':percent' + ' (:elapsed seconds)',
@@ -231,17 +239,6 @@ module.exports = (appConfig, extendEnv, { isProd, isServer, isHotServer }) => {
       })
     );
   }
-  if (!isProd && appConfig.eslint) {
-    result.plugins.push(
-      new (require('eslint-webpack-plugin'))({
-        exclude: 'node_modules',
-        threads: 4,
-        failOnError: false,
-        lintDirtyModulesOnly: false,
-        extensions: ['tsx', 'ts', 'js']
-      })
-    );
-  }
 
   if (isProd && !isServer) {
     result.optimization = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobest-ui/scripts",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "private": false,
   "description": "utils for project tools",
   "bin": {
@@ -25,9 +25,7 @@
   ],
   "keywords": [
     "node",
-    "react",
-    "SSR",
-    "react-script"
+    "express"
   ],
   "sideEffects": false,
   "browserslist": {
@@ -62,7 +60,7 @@
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
     "@babel/runtime": "7.20.1",
-    "@loadable/babel-plugin": "5.15.3",
+    "@loadable/babel-plugin": "5.13.2",
     "@loadable/webpack-plugin": "5.15.2",
     "@soda/friendly-errors-webpack-plugin": "1.8.1",
     "babel-loader": "8.2.4",
@@ -72,7 +70,9 @@
     "cross-spawn": "7.0.3",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "3.4.1",
-    "eslint-webpack-plugin": "3.2.0",
+    "eslint": "8.12.0",
+    "eslint-config-react-app": "7.0.0",
+    "eslint-webpack-plugin": "3.1.1",
     "html-webpack-plugin": "5.5.0",
     "ignore-loader": "0.1.2",
     "ip": "1.1.5",
@@ -91,16 +91,11 @@
     "sass-loader": "12.6.0",
     "style-loader": "3.3.1",
     "terser-webpack-plugin": "5.3.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.8.3",
+    "ts-node": "9.1.1",
     "webpack": "5.70.0",
     "webpack-dev-server": "4.7.4",
     "webpack-merge": "5.8.0",
     "webpack-node-externals": "3.0.0"
   },
-  "peerDependencies": {
-    "eslint": "^8.23.1",
-    "typescript": "4.8.3"
-  },
-  "gitHead": "2611548b4427c16fb03f9437ab20889615441a95"
+  "gitHead": "fb75bd54150164e95c075eef437badba8dcd0728"
 }

package/spaConfig/webpack.base.js

@@ -33,7 +33,7 @@ module.exports = (isProd, appConfig, extendEnv) => {
   if (isProd) {
     result.plugins.push(
       new MiniCssExtractPlugin({
-        filename: `${appConfig.baseStaticCssPath}/[name].css?v=${extendEnv.version}`
+        filename: `css/[name].css?v=${extendEnv.version}`
       })
     );
   }

package/spaConfig/webpack.prod.js

@@ -13,9 +13,9 @@ module.exports = function (appConfig, extendEnv) {
       publicPath: '/',
       path: getProjectPath('/build'),
       // 入口文件生产的js
-      filename: `${appConfig.baseStaticJsPath}/[name].chunk.js?v=${extendEnv.version}`,
+      filename: `js/[name].chunk.js?v=${extendEnv.version}`,
       // 非入口文件生产的js
-      chunkFilename: `${appConfig.baseStaticJsPath}/[name].chunk.js?v=${extendEnv.version}`
+      chunkFilename: `js/[name].chunk.js?v=${extendEnv.version}`
     },
     optimization: {
       // 在不同的编译中不变的短数字id。有益于长期缓存。在生产模式中会默认开启。

package/ssrConfig/webpack.base.js

@@ -14,9 +14,7 @@ module.exports = (appConfig, extendEnv, { isServer, isHotServer, isProd }) => {
       new MiniCssExtractPlugin({
         // filename: isHotServer ? 'css/[name].css' : `css/[name].css?v=${env.version}`,
         // 采用AMP直接把css填充到html
-        filename: isHotServer
-          ? `${appConfig.baseStaticCssPath}/[name].css`
-          : `${appConfig.baseStaticCssPath}/[name][contenthash:8].css`
+        filename: isHotServer ? 'css/[name].css' : 'css/[name][contenthash:8].css'
       })
     );
   }

package/ssrConfig/webpack.dev.client.js

@@ -23,8 +23,8 @@ module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd
         // 输出文件路径
         path: getProjectPath('/devPublic'),
         publicPath: '/',
-        filename: `${appConfig.baseStaticJsPath}/[name].js`,
-        chunkFilename: `${appConfig.baseStaticJsPath}/[name].js`
+        filename: 'js/[name].js',
+        chunkFilename: 'js/[name].js'
       },
       plugins: [new LoadablePlugin()]
     }

package/ssrConfig/webpack.prod.client.js

@@ -19,9 +19,9 @@ module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd
         path: getProjectPath('/build'),
         publicPath: '/',
         // 入口文件生产的js
-        filename: `${appConfig.baseStaticJsPath}/[name].js?v=${extendEnv.version}`,
+        filename: `js/[name].js?v=${extendEnv.version}`,
         // 非入口文件生产的js
-        chunkFilename: `${appConfig.baseStaticJsPath}/[name].js?v=${extendEnv.version}`
+        chunkFilename: `js/[name].js?v=${extendEnv.version}`
       },
       resolve: {
         fallback: {
@@ -78,8 +78,10 @@ module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd
             },
             vendor: {
               test: /[\\/]node_modules[\\/]/,
-              chunks: 'all',
-              name: 'vendor'
+              chunks: 'initial',
+              name: 'vendor',
+              minChunks: 1,
+              priority: 10
             }
           }
         },

package/ssrConfig/webpack.prod.server.js

@@ -18,7 +18,7 @@ module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd
         publicPath: '/',
         filename: 'server-bundle.js',
         libraryTarget: 'commonjs2',
-        chunkFilename: `${appConfig.baseStaticJsPath}/[name].[chunkhash].js`
+        chunkFilename: 'js/[name].[chunkhash].js'
       },
       module: {
         rules: [