akfun 1.6.5 → 1.6.6

package/package.json

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

package/src/build2esm.js

@@ -1,6 +1,5 @@
 const ora = require('ora');
 const rollup = require('rollup');
-const nodeExternals = require('webpack-node-externals');
 const projectConfig = require('./config/index'); // 引入当前项目配置文件
 const defaultConfig = require('./config/default.config');
 const rollupConfig = require('./config/rollup.config'); // rollup的配置文件
@@ -13,9 +12,7 @@ async function build2esmFunc(options, curConfig) {
   const bundle = await rollup.rollup({
     input: options.input,
     /** 直接使用webpack中的externals配置（避免再新增一个rollup对应的配置，增加用户的配置复杂度） */
-    external: curConfig.webpack.ignoreNodeModules
-      ? [nodeExternals()].concat(curConfig.webpack.externals)
-      : curConfig.webpack.externals,
+    external: curConfig.webpack.externals,
     plugins: options.plugins
   });
 
@@ -47,6 +44,6 @@ module.exports = function (fileName, akfunConfig, _consoleTag) {
     curRollupConfig.output = build2esm.output;
   }
   build2esmFunc(curRollupConfig, config).then(() => {
-    spinner.succeed(`${consoleTag}esm lib库构建完成`);
+    spinner.succeed(`${consoleTag}esm模块构建完成。`);
   });
 };

package/src/config/rollup.config.js

@@ -17,36 +17,38 @@ const nested = require('postcss-nested');
 const postcssPresetEnv = require('postcss-preset-env');
 // css代码压缩
 const cssnano = require('cssnano');
-
 const { resolveToCurrentRoot, resolveToCurrentDist } = require('../utils/pathUtils'); // 统一路径解析
 const babelConfig = require('./babel.config'); // Babel的配置文件
-const config = require('./index'); // 引入当前项目配置文件
+const curProjectConfig = require('./index'); // 引入当前项目配置文件
+const {buildBanner} = require("../utils/akfunParams");
 
-module.exports = function(fileName) {
+module.exports = function(fileName, akfunConfig) {
+  const curConfig = akfunConfig || curProjectConfig;
   // 获取用户配置的构建入口文件
   let rollupInput = resolveToCurrentRoot('src/main.js');
-  if (config.build2esm && config.build2esm.input) {
-    rollupInput = config.build2esm.input;
+  if (curConfig.build2esm && curConfig.build2esm.input) {
+    rollupInput = curConfig.build2esm.input;
   }
   let curFileName = fileName || 'index'; // 默认以"index.esm.js"输出
   // 获取用户配置的构建输出文件名
-  if (config.build2esm && config.build2esm.fileName) {
-    curFileName = config.build2esm.fileName;
+  if (curConfig.build2esm && curConfig.build2esm.fileName) {
+    curFileName = curConfig.build2esm.fileName;
   }
   // 增加babel配置
   babelConfig.babelHelpers = 'runtime';
 
   return {
+    banner: buildBanner,
     input: rollupInput,
     // external：将模块视为外部模块，不会打包在库中（在akfun.config.js中配置）
     plugins: [
       alias({
-        resolve: config.webpack.resolve.extensions,
-        extensions: config.webpack.resolve.extensions,
-        entries: config.webpack.resolve.alias
+        resolve: curConfig.webpack.resolve.extensions,
+        extensions: curConfig.webpack.resolve.extensions,
+        entries: curConfig.webpack.resolve.alias
       }),
       nodeResolve({
-        extensions: config.webpack.resolve.extensions
+        extensions: curConfig.webpack.resolve.extensions
       }),
       babel(babelConfig), // 备注，需要先babel()再commjs()
       vue(),

package/src/utils/akfunParams.js

@@ -1,10 +1,25 @@
+// 获取当前项目的package文件
+const { catchCurPackageJson } = require('../utils/pathUtils');
+const getConfigObj = require('../utils/getConfigObj');
+const currentPackageJsonDir = catchCurPackageJson();
+const currentPackageJson = getConfigObj(currentPackageJsonDir);
+
 let consoleTag = '[akfun]'; // 输出标记
 
 function setConsoleTag(newText) {
   consoleTag = newText;
 }
 
+const buildBanner = [
+  `${currentPackageJson.name} v${currentPackageJson.version}`,
+  `author: ${currentPackageJson.author}`,
+  `build tool: AKFun`,
+  `build time: ${new Date().toString()}`,
+  `build tool info: https://github.com/wibetter/akfun`
+].join('\n');
+
 module.exports = {
+  buildBanner,
   get curConsoleTag() {
     return consoleTag;
   },

package/src/webpack/webpack.base.conf.js

@@ -5,27 +5,18 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const utils = require('./loaderUtils');
 const vueLoaderConfig = require('./vue-loader.conf');
-const { resolve, resolveToCurrentRoot, catchCurPackageJson } = require('../utils/pathUtils');
-const getConfigObj = require('../utils/getConfigObj');
+const { resolve, resolveToCurrentRoot } = require('../utils/pathUtils');
 const getProjectDir = require('../utils/getProjectDir');
 const catchVuePages = require('../utils/catchVuePages'); // 用于获取当前项目中的vue单文件
 // 引入当前项目配置文件
 const config = require('../config/index');
 const babelConfig = require('../config/babel.config'); // Babel的配置文件
+const {buildBanner} = require("../utils/akfunParams");
 
-// 获取当前项目的package文件
-const currentPackageJsonDir = catchCurPackageJson();
-const currentPackageJson = getConfigObj(currentPackageJsonDir);
 
 // 生成构建头部信息
 const BannerPack = new webpack.BannerPlugin({
-  banner: [
-    `${currentPackageJson.name} v${currentPackageJson.version}`,
-    `author: ${currentPackageJson.author}`,
-    `build tool: AKFun`,
-    `build time: ${new Date().toString()}`,
-    `build tool info: https://github.com/wibetter/akfun`
-  ].join('\n'),
+  banner: buildBanner,
   entryOnly: true // 只在入口 chunks 文件中添加
 });
 
@@ -33,12 +24,13 @@ const BannerPack = new webpack.BannerPlugin({
  * webpack.base.conf.js
  * 主要用于设置 rules 和 通用插件
  */
-module.exports = (option) => {
-  const curEnvConfig = option || {}; // 用于接收当前运行环境配置变量
+module.exports = (_curEnvConfig, _curWebpackConfig) => {
+  const curEnvConfig = _curEnvConfig || {}; // 用于接收当前运行环境配置变量
+  const curWebpackConfig = _curWebpackConfig || config.webpack;
   // 获取当前项目目录
-  const curProjectDir = getProjectDir(config.webpack.projectDir);
+  const curProjectDir = getProjectDir(curWebpackConfig.projectDir);
   const webpackConfig = {
-    entry: config.webpack.entry,
+    entry: curWebpackConfig.entry,
     /*
      内置变量列表：
      id: chunk的唯一标识，从0开始；
@@ -53,7 +45,7 @@ module.exports = (option) => {
     /**
      * 当webpack试图去加载模块的时候，它默认是查找以 .js 结尾的文件的
      */
-    resolve: config.webpack.resolve,
+    resolve: curWebpackConfig.resolve,
     module: {
       rules: [
         {
@@ -78,7 +70,7 @@ module.exports = (option) => {
               options: {
                 // configFile: path.resolve(__dirname, '../config/tsconfig.json')
                 compilerOptions: {
-                  declaration: config.webpack.createDeclaration || false,
+                  declaration: curWebpackConfig.createDeclaration || false,
                   outDir: curEnvConfig.assetsRoot || './dist'
                 }
               }

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

@@ -16,7 +16,7 @@ module.exports = (akfunConfig) => {
   let config = akfunConfig || projectConfig; // 默认使用执行命令目录下的配置数据
   const curEnvConfig = config.dev || {}; // 当前执行环境配置
   // 获取webpack基本配置
-  const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig);
+  const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig, config.webpack);
 
   // 获取页面模板地址
   let curHtmlTemplate = path.resolve(__dirname, '../initData/template/index.html');

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

@@ -17,7 +17,7 @@ module.exports = (akfunConfig) => {
   let config = akfunConfig || projectConfig; // 默认使用执行命令目录下的配置数据
   const curEnvConfig = config.build2lib || {}; // 当前执行环境配置
   // 获取webpack基本配置
-  const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig);
+  const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig, config.webpack);
 
   const webpackLibConfig = merge(baseWebpackConfig, {
     mode: curEnvConfig.NODE_ENV, // production 模式，会启动UglifyJsPlugin服务

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

@@ -26,7 +26,7 @@ module.exports = (akfunConfig) => {
   let config = akfunConfig || projectConfig; // 默认使用执行命令目录下的配置数据
   const curEnvConfig = config.build || {}; // 当前执行环境配置
   // 获取webpack基本配置
-  const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig);
+  const baseWebpackConfig = getBaseWebpackConfig(curEnvConfig, config.webpack);
   // 获取页面模板地址
   let curHtmlTemplate = path.resolve(__dirname, '../initData/template/index.html');
   if (config.webpack.template) {