akfun 1.5.16 → 1.5.17

package/module/index.js

@@ -137,7 +137,7 @@ let argv = yargs
         .alias('h', 'help');
     },
     (argv) => {
-      mainAction.build();
+      mainAction.build('prod');
     },
   )
   .command(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "1.5.16",
+  "version": "1.5.17",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",

package/src/build.js

@@ -4,10 +4,15 @@ const path = require('path');
 const chalk = require('chalk');
 const webpack = require('webpack');
 const checkVersion = require('./check-versions');
-const config = require('./config/index'); // 引入当前项目配置文件
+const projectConfig = require('./config/index'); // 引入当前项目配置文件
+const deepMergeConfig = require('./utils/deepMergeConfig');
 
 // 构建脚本：一般用于构建生产环境的代码
-module.exports = function (BuildType) {
+module.exports = function (BuildType, akfunConfig) {
+  let config = projectConfig; // 默认使用执行命令目录下的配置数据
+  if (akfunConfig) {
+    config = deepMergeConfig(defaultConfig, akfunConfig);
+  }
   // 检查当前npm版本号是否匹配
   checkVersion();
   const spinner = ora('[akfun]开启AKFun构建能力...').start();
@@ -16,10 +21,10 @@ module.exports = function (BuildType) {
   // 根据BuildType判断是否引用专用于第三方功能包的webpack配置
   if (BuildType && BuildType === 'lib') {
     spinner.start('[akfun]开始构建第三方功能包...');
-    webpackConfig = require('./webpack/webpack.library.conf')();
+    webpackConfig = require('./webpack/webpack.library.conf')(config);
   } else {
     spinner.start('[akfun]开始构建生产环境的代码...');
-    webpackConfig = require('./webpack/webpack.prod.conf')();
+    webpackConfig = require('./webpack/webpack.prod.conf')(config);
   }
 
   /**

package/src/config/default.config.js

@@ -0,0 +1,102 @@
+'use strict';
+// 统一路径解析：
+const { resolve } = require('../utils/pathUtils');
+
+/**
+ * akfun脚手架赋予当前项目的默认配置
+ */
+const defaultAKFunConfig = {
+  settings: {
+    enableESLint: false, // 是否开启ESLint，默认开启ESLint检测代码格式
+    enableESLintFix: false, // 是否ESLint自动修正代码格式
+    enableStyleLint: false, // 是否开启StyleLint，默认开启ESLint检测代码格式
+    enableStyleLintFix: false // 是否需要StyleLint自动修正代码格式
+  },
+  webpack: {
+    resolve: {
+      // webpack的resolve配置
+      extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue', '.json'], // 用于配置webpack在尝试过程中用到的后缀列表
+      alias: {
+        '@': resolve('src'),
+        $components: resolve('src/components'),
+        $pages: resolve('src/pages'),
+        $plugins: resolve('src/plugins'),
+        $utils: resolve('src/utils')
+      }
+    },
+    createDeclaration: false, // 打包时是否创建ts声明文件
+    ignoreNodeModules: false, // 打包时是否忽略 node_modules
+    externals: [], // 从输出的 bundle 中排除依赖
+    sassResources: []
+  },
+  envParams: {
+    // 项目系统环境变量
+    common: {
+      // 通用参数
+      '#version#': '20200810.1'
+    },
+    local: {
+      // 本地开发环境
+      '#dataApiBase#': 'http://localhost:1024', // 数据接口根地址
+      '#assetsPublicPath#': 'http://localhost:1024', // 静态资源根地址
+      '#routeBasePath#': '/' // 路由根地址
+    },
+    online: {
+      // 线上正式环境配置参数
+      '#dataApiBase#': '/', // 数据接口根地址 "//xxx.cn/"格式
+      '#assetsPublicPath#': '', // 静态资源根地址 "//xxx.cn/_spa/projectName"格式
+      '#routeBasePath#': '/' // 路由根地址 "/_spa/projectName/"格式
+    }
+  },
+  dev: {
+    // 用于开启本地调试模式的相关配置信息
+    NODE_ENV: 'development',
+    port: 80,
+    autoOpenBrowser: true,
+    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
+    assetsSubDirectory: '',
+    hostname: 'localhost',
+    proxyTable: {},
+    /** CSS Sourcemaps off by default because relative paths are "buggy"
+     * with this option, according to the CSS-Loader README
+     * (https://github.com/webpack/css-loader#sourcemaps)
+     * In our experience, they generally work as expected,
+     * just be aware of this issue when enabling this option.
+     */
+    cssSourceMap: false
+  },
+  build: {
+    // 用于构建生产环境代码的相关配置信息
+    NODE_ENV: 'production', // production 模式，会启动UglifyJsPlugin服务
+    assetsRoot: resolve('dist'), // 编译完成的文件存放路径
+    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
+    assetsSubDirectory: '', // 资源引用二级路径
+    productionSourceMap: false,
+    // Gzip off by default as many popular public hosts such as
+    // Surge or Netlify already gzip all public assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css', 'json'],
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: false
+  },
+  build2lib: {
+    // 用于构建第三方功能包的配置文件
+    NODE_ENV: 'production',
+    libraryName: '', // 构建第三方功能包时最后导出的引用变量名
+    assetsRoot: resolve('dist'), // 编译完成的文件存放路径
+    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
+    assetsSubDirectory: '', // 资源引用二级路径
+    productionSourceMap: false,
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css', 'json'],
+    bundleAnalyzerReport: false
+  }
+};
+
+// 备注：数组类型则直接覆盖
+module.exports = defaultAKFunConfig;

package/src/config/index.js

@@ -1,110 +1,16 @@
 'use strict';
-const deepMerge = require('deepmerge');
 // 统一路径解析：
 const { resolve } = require('../utils/pathUtils');
+const defaultAKFunConfig = require('./default.config');
 const getConfigObj = require('../utils/getConfigObj');
+const deepMergeConfig = require('../utils/deepMergeConfig');
 
 /** akfun脚手架赋予当前项目的默认配置
  * 备注：项目根目录的akfun.config.js的配置内容优先级高于defultAKFunConfig
  */
-const defaultAKFunConfig = {
-  settings: {
-    enableESLint: false, // 是否开启ESLint，默认开启ESLint检测代码格式
-    enableESLintFix: false, // 是否ESLint自动修正代码格式
-    enableStyleLint: false, // 是否开启StyleLint，默认开启ESLint检测代码格式
-    enableStyleLintFix: false // 是否需要StyleLint自动修正代码格式
-  },
-  webpack: {
-    resolve: {
-      // webpack的resolve配置
-      extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue', '.json'], // 用于配置webpack在尝试过程中用到的后缀列表
-      alias: {
-        '@': resolve('src'),
-        $components: resolve('src/components'),
-        $pages: resolve('src/pages'),
-        $plugins: resolve('src/plugins'),
-        $utils: resolve('src/utils')
-      }
-    },
-    createDeclaration: false, // 打包时是否创建ts声明文件
-    ignoreNodeModules: false, // 打包时是否忽略 node_modules
-    externals: [], // 从输出的 bundle 中排除依赖
-    sassResources: []
-  },
-  envParams: {
-    // 项目系统环境变量
-    common: {
-      // 通用参数
-      '#version#': '20200810.1'
-    },
-    local: {
-      // 本地开发环境
-      '#dataApiBase#': 'http://localhost:1024', // 数据接口根地址
-      '#assetsPublicPath#': 'http://localhost:1024', // 静态资源根地址
-      '#routeBasePath#': '/' // 路由根地址
-    },
-    online: {
-      // 线上正式环境配置参数
-      '#dataApiBase#': '/', // 数据接口根地址 "//xxx.cn/"格式
-      '#assetsPublicPath#': '', // 静态资源根地址 "//xxx.cn/_spa/projectName"格式
-      '#routeBasePath#': '/' // 路由根地址 "/_spa/projectName/"格式
-    }
-  },
-  dev: {
-    // 用于开启本地调试模式的相关配置信息
-    NODE_ENV: 'development',
-    port: 80,
-    autoOpenBrowser: true,
-    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
-    assetsSubDirectory: '',
-    hostname: 'localhost',
-    proxyTable: {},
-    /** CSS Sourcemaps off by default because relative paths are "buggy"
-     * with this option, according to the CSS-Loader README
-     * (https://github.com/webpack/css-loader#sourcemaps)
-     * In our experience, they generally work as expected,
-     * just be aware of this issue when enabling this option.
-     */
-    cssSourceMap: false
-  },
-  build: {
-    // 用于构建生产环境代码的相关配置信息
-    NODE_ENV: 'production', // production 模式，会启动UglifyJsPlugin服务
-    assetsRoot: resolve('dist'), // 编译完成的文件存放路径
-    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
-    assetsSubDirectory: '', // 资源引用二级路径
-    productionSourceMap: false,
-    // Gzip off by default as many popular public hosts such as
-    // Surge or Netlify already gzip all public assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css', 'json'],
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: false
-  },
-  build2lib: {
-    // 用于构建第三方功能包的配置文件
-    NODE_ENV: 'production',
-    libraryName: '', // 构建第三方功能包时最后导出的引用变量名
-    assetsRoot: resolve('dist'), // 编译完成的文件存放路径
-    assetsPublicPath: '/', // 设置静态资源的引用路径（根域名+路径）
-    assetsSubDirectory: '', // 资源引用二级路径
-    productionSourceMap: false,
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css', 'json'],
-    bundleAnalyzerReport: false
-  }
-};
 
 // 从项目根目录获取当前项目的配置文件
 const curProjectConfig = getConfigObj(resolve('akfun.config.js'));
 
-// module.exports = Object.assign(defaultAKFunConfig, curProjectConfig);
-
-const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
 // 备注：数组类型则直接覆盖
-module.exports = deepMerge(defaultAKFunConfig, curProjectConfig, { arrayMerge: overwriteMerge });
+module.exports = deepMergeConfig(defaultAKFunConfig, curProjectConfig);

package/src/dev-server.js

@@ -7,11 +7,17 @@ const checkVersion = require('./check-versions');
 const { createProxyMiddleware } = require('http-proxy-middleware');
 const { resolve } = require('./utils/pathUtils');
 // 引入当前项目配置文件
-const config = require('./config/index');
+const projectConfig = require('./config/index');
+const defaultConfig = require('./config/default.config');
 const getDevWebpackConfig = require('./webpack/webpack.dev.conf');
+const deepMergeConfig = require('./utils/deepMergeConfig');
 
 // 构建脚本：一般用于构建开发环境的代码（包含热更新、接口代理等功能）
-module.exports = function () {
+module.exports = function (akfunConfig) {
+  let config = projectConfig; // 默认使用执行命令目录下的配置数据
+  if (akfunConfig) {
+    config = deepMergeConfig(defaultConfig, akfunConfig);
+  }
   // 检查当前npm版本号是否匹配
   checkVersion();
   const spinner = ora('[akfun]开启调试模式...').start();
@@ -35,7 +41,7 @@ module.exports = function () {
   // 使用 express 启动一个服务
   const app = express();
   // 获取开发环境的webpack基本配置
-  const webpackConfig = getDevWebpackConfig();
+  const webpackConfig = getDevWebpackConfig(config);
   const compiler = webpack(webpackConfig); // 启动 webpack 进行编译
 
   // 启动 webpack-dev-middleware，将编译后的文件暂存到内存中

package/src/utils/deepMergeConfig.js

@@ -0,0 +1,9 @@
+const deepMerge = require('deepmerge');
+
+const deepMergeConfig = function (defaultConfig, curConfig) {
+  const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;
+  
+  return deepMerge(defaultConfig, curConfig, { arrayMerge: overwriteMerge });
+};
+
+module.exports = deepMergeConfig;

package/src/webpack/webpack.dev.conf.js

@@ -6,13 +6,14 @@ const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 const utils = require('./loaderUtils');
 // 引入当前项目配置文件
-const config = require('../config/index');
+const projectConfig = require('../config/index');
 const getBaseWebpackConfig = require('./webpack.base.conf');
 const getJsEntries = require('../utils/jsEntries');
 const entrys2htmlWebpackPlugin = require('../utils/entrys2htmlWebpackPlugin');
 const { isArray } = require('../utils/typeof');
 
-module.exports = () => {
+module.exports = (akfunConfig) => {
+  let config = akfunConfig || projectConfig; // 默认使用执行命令目录下的配置数据
   const curEnvConfig = config.dev || {}; // 当前执行环境配置
   // 获取webpack基本配置
   const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig);

package/src/webpack/webpack.library.conf.js

@@ -10,10 +10,11 @@ const nodeExternals = require('webpack-node-externals');
 
 const utils = require('./loaderUtils');
 // 引入当前项目配置文件
-const config = require('../config/index');
+const projectConfig = require('../config/index');
 const getBaseWebpackConfig = require('./webpack.base.conf');
 
-module.exports = () => {
+module.exports = (akfunConfig) => {
+  let config = akfunConfig || projectConfig; // 默认使用执行命令目录下的配置数据
   const curEnvConfig = config.build2lib || {}; // 当前执行环境配置
   // 获取webpack基本配置
   const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig);

package/src/webpack/webpack.prod.conf.js

@@ -18,10 +18,11 @@ const getJsEntries = require('../utils/jsEntries');
 const entrys2htmlWebpackPlugin = require('../utils/entrys2htmlWebpackPlugin');
 const { isArray } = require('../utils/typeof');
 // 引入当前项目配置文件
-const config = require('../config/index');
+const projectConfig = require('../config/index');
 const getBaseWebpackConfig = require('./webpack.base.conf');
 
-module.exports = () => {
+module.exports = (akfunConfig) => {
+  let config = akfunConfig || projectConfig; // 默认使用执行命令目录下的配置数据
   const curEnvConfig = config.build || {}; // 当前执行环境配置
   // 获取webpack基本配置
   const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig);