akfun 3.2.1 → 3.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "3.2.1",
+  "version": "3.2.5",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -74,6 +74,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-typescript": "^8.3.1",
+    "rollup-plugin-node-externals": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "@vue/compiler-sfc": "^3.2.29",

package/src/build.js

@@ -3,7 +3,7 @@ const rm = require('rimraf');
 const path = require('path');
 const chalk = require('chalk');
 const webpack = require('webpack');
-const {curConsoleTag} = require("./utils/akfunParams");
+const { curConsoleTag } = require('./utils/akfunParams');
 const checkVersion = require('./check-versions');
 const projectConfig = require('./config/index'); // 引入当前项目配置文件
 const defaultConfig = require('./config/default.config');
@@ -17,6 +17,7 @@ module.exports = function (BuildType, akfunConfig, _consoleTag) {
     // 参数中的config配置优先级最高
     config = deepMergeConfig(defaultConfig, akfunConfig);
   }
+  let curEnvConfig = config.build;
   // 检查当前npm版本号是否匹配
   checkVersion();
   const spinner = ora(`${consoleTag}开始构建...`).start();
@@ -26,6 +27,7 @@ module.exports = function (BuildType, akfunConfig, _consoleTag) {
   if (BuildType && BuildType === 'lib') {
     spinner.start(`${consoleTag}开始构建lib库...`);
     webpackConfig = require('./webpack/webpack.library.conf')(config);
+    curEnvConfig = config.build2lib;
   } else {
     spinner.start(`${consoleTag}开始构建生产环境的代码...`);
     webpackConfig = require('./webpack/webpack.prod.conf')(config);
@@ -36,10 +38,10 @@ module.exports = function (BuildType, akfunConfig, _consoleTag) {
    * 使用 config.dev.NODE_ENV 作为当前的环境
    */
   if (!process.NODE_ENV) {
-    process.NODE_ENV = config.build.NODE_ENV; // 将运行环境设置为生产环境
+    process.NODE_ENV = curEnvConfig.NODE_ENV; // 将运行环境设置为生产环境
   }
 
-  rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), (err) => {
+  rm(path.join(curEnvConfig.assetsRoot, curEnvConfig.assetsSubDirectory), (err) => {
     if (err) throw err;
     webpack(webpackConfig, (err, stats) => {
       spinner.stop();

package/src/config/rollup.config.js

@@ -19,7 +19,7 @@ const nested = require('postcss-nested');
 const postcssPresetEnv = require('postcss-preset-env');
 // css代码压缩
 const cssnano = require('cssnano');
-// const { externals } = require('rollup-plugin-node-externals');
+const { externals } = require('rollup-plugin-node-externals');
 const { resolveToCurrentRoot, resolveToCurrentDist } = require('../utils/pathUtils'); // 统一路径解析
 const babelConfig = require('./babel.config'); // Babel的配置文件
 const projectConfig = require('./index'); // 引入当前项目配置文件
@@ -45,17 +45,19 @@ module.exports = function (fileName, akfunConfig) {
     banner: buildBanner,
     // format: build2esm.format || 'esm', // 生成包的格式
     input: rollupInput,
-    /**
-     * external：（在akfun.config.js中配置）
-     * 需要一个 id 并返回 true（外部引用）或 false（不是外部的引用）， 或者 Array 应该保留在bundle的外部引用的模块ID。
-     */
-    external: build2esm.external || [],
     plugins: [
       alias({
         resolve: curConfig.webpack.resolve.extensions,
         extensions: curConfig.webpack.resolve.extensions,
         entries: curConfig.webpack.resolve.alias
       }),
+      /**
+       * excludeList（在akfun.config.js中配置）
+       * 设置打包中应该排除的依赖
+       */
+      externals({
+        include: build2esm.excludeList || []
+      }),
       nodeResolve({
         extensions: curConfig.webpack.resolve.extensions
       }),

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

@@ -71,5 +71,11 @@ module.exports = (akfunConfig) => {
     });
   }
 
+  // 判断当前环境是否有自定义plugins
+  if (curEnvConfig.plugins && Array.isArray(curEnvConfig.plugins)) {
+    // 添加自定义webpack插件
+    webpackDevConfig.plugins.push(...curEnvConfig.plugins);
+  }
+
   return webpackDevConfig;
 };

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

@@ -74,6 +74,12 @@ module.exports = (akfunConfig) => {
     );
   }
 
+  // 判断当前环境是否有自定义plugins
+  if (curEnvConfig.plugins && Array.isArray(curEnvConfig.plugins)) {
+    // 添加自定义webpack插件
+    webpackLibConfig.plugins.push(...curEnvConfig.plugins);
+  }
+
   if (curEnvConfig.bundleAnalyzerReport) {
     webpackLibConfig.plugins.push(new BundleAnalyzerPlugin());
   }

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

@@ -132,6 +132,12 @@ module.exports = (akfunConfig) => {
     );
   }
 
+  // 判断当前环境是否有自定义plugins
+  if (curEnvConfig.plugins && Array.isArray(curEnvConfig.plugins)) {
+    // 添加自定义webpack插件
+    webpackProdConfig.plugins.push(...curEnvConfig.plugins);
+  }
+
   if (curEnvConfig.bundleAnalyzerReport) {
     webpackProdConfig.plugins.push(new BundleAnalyzerPlugin());
   }