akfun 3.0.5 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "3.0.5",
+  "version": "3.1.1",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -105,7 +105,7 @@
     "express": "^4.17.2",
     "figlet": "^1.5.2",
     "file-loader": "^6.2.0",
-    "git-clone": "^0.2.0",
+    "git-clone": "0.1.0",
     "glob": "^7.2.0",
     "html-loader": "^3.1.0",
     "html-webpack-plugin": "^5.5.0",

package/src/utils/gitClone.js

@@ -1,14 +1,14 @@
 const path = require('path');
 const ora = require('ora');
-const gitclone = require('git-clone');
+const gitClone = require('git-clone');
 const rm = require('rimraf').sync;
 const { resolveToCurrentRoot } = require('../utils/pathUtils');
-const {curConsoleTag} = require("./akfunParams");
+const { curConsoleTag } = require('./akfunParams');
 
 function _gitClone(gitUrl, dir, callback, _consoleTag) {
   const consoleTag = _consoleTag || curConsoleTag;
   const spinner = ora(`${consoleTag}正在加载项目模板...`).start();
-  gitclone(
+  gitClone(
     gitUrl,
     resolveToCurrentRoot(dir),
     {
@@ -20,7 +20,7 @@ function _gitClone(gitUrl, dir, callback, _consoleTag) {
         spinner.succeed(`${consoleTag}项目模板加载完成！`);
         callback();
       } else {
-        console.log(err);
+        spinner.fail(err);
         callback(err);
       }
     }

package/src/webpack/loaderUtils.js

@@ -39,10 +39,10 @@ exports.cssLoaders = function (options) {
       // url: false, // enables/disables url()/image-set() functions handling
       url: {
         filter: (url, resourcePath) => {
-          /*// 自定义配置优先
+          // 自定义配置优先
           if (options.cssLoaderUrl !== undefined) {
             return options.cssLoaderUrl;
-          }*/
+          }
           // Don't handle `node_modules` urls
           if (resourcePath.includes('node_modules')) {
             return true;

package/src/webpack/vue-loader.conf.js

@@ -5,6 +5,7 @@ const isProduction = process.NODE_ENV === 'production';
 
 module.exports = {
   loaders: utils.cssLoaders({
+    cssLoaderUrl: config.webpack.cssLoaderUrl, // 用于自定义css-loader配置项[url]
     sourceMap: isProduction // 生产环境sourceMap是true
       ? config.build.productionSourceMap
       : config.dev.cssSourceMap,

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

@@ -193,7 +193,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
   // 优先使用执行环境中的配置
   if (curEnvConfig.ignoreNodeModules !== undefined) {
     const allowList = curEnvConfig.allowList || curWebpackConfig.allowList;
-    const externals = curEnvConfig.externals || config.webpack.external || [];
+    const externals = curEnvConfig.externals || curWebpackConfig.external || [];
     webpackConfig.externals = curEnvConfig.ignoreNodeModules
       ? [
           nodeExternals({
@@ -305,5 +305,11 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
     );
   }
 
+  // 判断是否有自定义plugins
+  if (curWebpackConfig.plugins && Array.isArray(curWebpackConfig.plugins)) {
+    // 添加自定义webpack插件
+    webpackConfig.plugins.concat(curWebpackConfig.plugins);
+  }
+
   return webpackConfig;
 };

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

@@ -29,7 +29,8 @@ module.exports = (akfunConfig) => {
     module: {
       rules: utils.styleLoaders({
         sourceMap: curEnvConfig.cssSourceMap,
-        environment: 'prod' // 'dev': 不会将css单独提取出来
+        environment: 'prod', // 'dev': 不会将css单独提取出来
+        cssLoaderUrl: config.webpack.cssLoaderUrl
       })
     },
     // devtool: '#cheap-module-eval-source-map', // 本地开发环境中的取值

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

@@ -31,7 +31,8 @@ module.exports = (akfunConfig) => {
     module: {
       rules: utils.styleLoaders({
         sourceMap: curEnvConfig.productionSourceMap,
-        environment: 'prod'
+        environment: 'prod',
+        cssLoaderUrl: config.webpack.cssLoaderUrl
       })
     },
     devtool: curEnvConfig.productionSourceMap ? curEnvConfig.devtool || 'source-map' : false, // 线上生成环境

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

@@ -46,7 +46,8 @@ module.exports = (akfunConfig) => {
     module: {
       rules: utils.styleLoaders({
         sourceMap: curEnvConfig.productionSourceMap,
-        environment: 'prod'
+        environment: 'prod',
+        cssLoaderUrl: config.webpack.cssLoaderUrl
       })
     },
     devtool: curEnvConfig.productionSourceMap ? curEnvConfig.devtool || 'source-map' : false, // 线上生成环境
@@ -137,7 +138,7 @@ module.exports = (akfunConfig) => {
   }
 
   if (curEnvConfig.bundleAnalyzerReport) {
-    webpackProdConfig.plugins.push(new BundleAnalyzerPlugin());
+    webpackConfig.plugins.push(...curWebpackConfig.plugins);
   }
 
   return webpackProdConfig;