@autobest-ui/scripts 1.5.9-y.0 → 1.6.0

package/common/extendWebpackConfigFromProject.js

@@ -0,0 +1,31 @@
+const { getProjectPath, isExistsSyncFile } = require('./utils');
+const appWebpackConfigPath = getProjectPath('/config/app.webpack.js');
+
+module.exports = function extendWebpackConfigFromProject(
+  resultCallback,
+  appConfig,
+  extendEnv,
+  { isProd, isServer, isHotServer }
+) {
+  const result = resultCallback(appConfig, extendEnv, { isProd, isServer, isHotServer });
+  if (isExistsSyncFile(appWebpackConfigPath)) {
+    const extendConfig = require(appWebpackConfigPath);
+    if (typeof extendConfig !== 'function') {
+      throw Error(
+        `Extend webpack config file only functions are supported and return extend result! \n current type is ${typeof extendConfig} \n filename is ${appWebpackConfigPath}`
+      );
+    }
+    const extendResult = extendConfig(result, appConfig, extendEnv, {
+      isProd,
+      isServer,
+      isHotServer
+    });
+    if (!extendResult) {
+      throw Error(
+        `Return extend result! \n current extendResult is ${extendResult} \n filename is ${appWebpackConfigPath}`
+      );
+    }
+    return extendResult;
+  }
+  return result;
+};

package/common/start.js

@@ -4,6 +4,7 @@ const open = require('open');
 const appConfig = require('./appConfig');
 const getEnvironmentInfo = require('./extendEnv');
 const { parseArgsToJson } = require('./utils');
+const extendWebpackConfigFromProject = require('./extendWebpackConfigFromProject');
 
 function openStartRun(webpackFactory) {
   process.env.BABEL_ENV = 'development';
@@ -41,9 +42,13 @@ function openStartRun(webpackFactory) {
   };
 
   const startOpenPath = appConfig.startOpenPath ? appConfig.startOpenPath : '';
-
   try {
-    const config = webpackFactory({ ...appConfig, port: PORT, startOpenPath }, extendEnv);
+    const config = extendWebpackConfigFromProject(
+      webpackFactory,
+      { ...appConfig, port: PORT, startOpenPath },
+      extendEnv,
+      { isProd: false, isServer: false, isHotServer: false }
+    );
     options.static.publicPath = config.output.publicPath;
     options.static.directory = config.output.path;
     const compiler = webpack(config);

package/common/webpack.common.js

@@ -3,8 +3,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const ESLintPlugin = require('eslint-webpack-plugin');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 const getCSSModuleLocalIdent = require('./getCSSModuleLocalIdent');
-const { getProjectPath, isExistsSyncFile } = require('./utils');
-const appWebpackConfigPath = getProjectPath('/config/app.webpack.js');
 
 const sassRegex = /\.(scss|sass)$/;
 const sassModuleRegex = /\.module\.(scss|sass)$/;
@@ -249,25 +247,5 @@ module.exports = (appConfig, extendEnv, { isProd, isServer, isHotServer }) => {
     };
   }
 
-  if (isExistsSyncFile(appWebpackConfigPath)) {
-    const extendConfig = require(appWebpackConfigPath);
-    if (typeof extendConfig !== 'function') {
-      throw Error(
-        `Extend webpack config file only functions are supported and return extend result! \n current type is ${typeof extendConfig} \n filename is ${appWebpackConfigPath}`
-      );
-    }
-    const extendResult = extendConfig(result, appConfig, extendEnv, {
-      isProd,
-      isServer,
-      isHotServer
-    });
-    if (!extendResult) {
-      throw Error(
-        `Return extend result! \n current extendResult is ${extendResult} \n filename is ${appWebpackConfigPath}`
-      );
-    }
-    return extendResult;
-  }
-
   return result;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobest-ui/scripts",
-  "version": "1.5.9-y.0",
+  "version": "1.6.0",
   "private": false,
   "description": "utils for project tools",
   "bin": {
@@ -92,5 +92,5 @@
     "webpack-merge": "5.8.0",
     "webpack-node-externals": "3.0.0"
   },
-  "gitHead": "abde96771d0bac2f69d306fa99aa1deb89110b34"
+  "gitHead": "9b866727a1d94a367ef225e1b2eda1e4dd936766"
 }

package/spaConfig/build.js

@@ -3,6 +3,7 @@ const chalk = require('chalk');
 const appConfig = require('../common/appConfig');
 const { runCallback } = require('../common/build');
 const getClientEnvironment = require('../common/extendEnv');
+const extendWebpackConfigFromProject = require('../common/extendWebpackConfigFromProject');
 const webpackFactory = require('./webpack.prod');
 
 process.env.BABEL_ENV = 'production';
@@ -16,7 +17,11 @@ process.on('unhandledRejection', err => {
 const extendEnv = getClientEnvironment();
 
 function build() {
-  const config = webpackFactory(appConfig, extendEnv);
+  const config = extendWebpackConfigFromProject(webpackFactory, appConfig, extendEnv, {
+    isProd: true,
+    isServer: false,
+    isHotServer: false
+  });
   // eslint-disable-next-line no-console
   console.log(chalk.green('Creating an optimized production build...'));
   const compiler = webpack(config);

package/ssrConfig/build.js

@@ -3,6 +3,7 @@ const chalk = require('chalk');
 const appConfig = require('../common/appConfig');
 const { runCallback } = require('../common/build');
 const getEnvironmentInfo = require('../common/extendEnv');
+const extendWebpackConfigFromProject = require('../common/extendWebpackConfigFromProject');
 const clientConfigFactory = require('./webpack.prod.client');
 const serverConfigFactory = require('./webpack.prod.server');
 
@@ -17,8 +18,16 @@ process.on('unhandledRejection', err => {
 const extendEnv = getEnvironmentInfo();
 
 function build() {
-  const clientConfig = clientConfigFactory(appConfig, extendEnv);
-  const serverConfig = serverConfigFactory(appConfig, extendEnv);
+  const clientConfig = extendWebpackConfigFromProject(clientConfigFactory, appConfig, extendEnv, {
+    isServer: false,
+    isHotServer: false,
+    isProd: true
+  });
+  const serverConfig = extendWebpackConfigFromProject(serverConfigFactory, appConfig, extendEnv, {
+    isServer: true,
+    isHotServer: false,
+    isProd: true
+  });
   // eslint-disable-next-line no-console
   console.log(chalk.green('Creating an optimized production build...'));
   const clientCompiler = webpack(clientConfig);

package/ssrConfig/server.js

@@ -4,12 +4,23 @@ const webpack = require('webpack');
 const appConfig = require('../common/appConfig');
 const getEnvironmentInfo = require('../common/extendEnv');
 const { getProjectPath, parseArgsToJson } = require('../common/utils');
+const extendWebpackConfigFromProject = require('../common/extendWebpackConfigFromProject');
 const clientConfigFactory = require('./webpack.dev.client');
 const serverConfigFactory = require('./webpack.dev.server');
 
 const extendEnv = getEnvironmentInfo(true);
-const clientConfig = clientConfigFactory(appConfig, extendEnv);
-const serverConfig = serverConfigFactory(appConfig, extendEnv);
+
+const clientConfig = extendWebpackConfigFromProject(clientConfigFactory, appConfig, extendEnv, {
+  isProd: false,
+  isServer: false,
+  isHotServer: true
+});
+
+const serverConfig = extendWebpackConfigFromProject(serverConfigFactory, appConfig, extendEnv, {
+  isServer: true,
+  isHotServer: true,
+  isProd: false
+});
 
 const PORT = process.env.PORT || parseArgsToJson.port || appConfig.hotSsrDefaultPort;
 const hotSsrOpenPath = appConfig.hotSsrOpenPath ? appConfig.hotSsrOpenPath : '';

package/ssrConfig/webpack.dev.client.js

@@ -3,12 +3,12 @@ const LoadablePlugin = require('@loadable/webpack-plugin');
 const { getProjectPath } = require('../common/utils');
 const baseConfig = require('./webpack.base');
 
-module.exports = function (appConfig, extendEnv) {
+module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd }) {
   return merge(
     baseConfig(appConfig, extendEnv, {
-      isServer: false,
-      isHotServer: true,
-      isProd: false
+      isServer,
+      isHotServer,
+      isProd
     }),
     {
       // 入口文件

package/ssrConfig/webpack.dev.js

@@ -7,12 +7,12 @@ const baseConfig = require('./webpack.base');
 
 const HOST = process.env.HOST || ip.address() || 'localhost';
 
-module.exports = function (appConfig, extendEnv) {
+module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd }) {
   return merge(
     baseConfig(appConfig, extendEnv, {
-      isServer: false,
-      isHotServer: false,
-      isProd: false
+      isServer,
+      isHotServer,
+      isProd
     }),
     {
       entry: getProjectPath('/src/index.tsx'),

package/ssrConfig/webpack.dev.server.js

@@ -4,12 +4,12 @@ const { merge } = require('webpack-merge');
 const { getProjectPath } = require('../common/utils');
 const baseConfig = require('./webpack.base');
 
-module.exports = function (appConfig, extendEnv) {
+module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd }) {
   return merge(
     baseConfig(appConfig, extendEnv, {
-      isServer: true,
-      isHotServer: true,
-      isProd: false
+      isServer,
+      isHotServer,
+      isProd
     }),
     {
       // 告诉 webpack打包的是 node端代码，避免把nodejs内置的模块打包到输出文件中，例如 fs path

package/ssrConfig/webpack.prod.client.js

@@ -5,12 +5,12 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const { getProjectPath, deleteFolders } = require('../common/utils');
 const baseConfig = require('./webpack.base');
 
-module.exports = function (appConfig, extendEnv) {
+module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd }) {
   const result = merge(
     baseConfig(appConfig, extendEnv, {
-      isServer: false,
-      isHotServer: false,
-      isProd: true
+      isServer,
+      isHotServer,
+      isProd
     }),
     {
       entry: getProjectPath('/src/client-entry.tsx'),

package/ssrConfig/webpack.prod.server.js

@@ -3,12 +3,12 @@ const { merge } = require('webpack-merge');
 const { getProjectPath, deleteFolders } = require('../common/utils');
 const baseConfig = require('./webpack.base');
 
-module.exports = function (appConfig, extendEnv) {
+module.exports = function (appConfig, extendEnv, { isServer, isHotServer, isProd }) {
   const result = merge(
     baseConfig(appConfig, extendEnv, {
-      isServer: true,
-      isHotServer: false,
-      isProd: true
+      isServer,
+      isHotServer,
+      isProd
     }),
     {
       target: 'node',