akfun 3.2.3 → 3.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "3.2.3",
+  "version": "3.2.7",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -155,6 +155,7 @@
     "webpack-hot-middleware": "^2.25.1",
     "webpack-merge": "^5.8.0",
     "webpack-node-externals": "^3.0.0",
+    "@svgr/webpack": "^6.2.1",
     "yargs": "^12.0.5"
   },
   "devDependencies": {

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/webpack/webpack.base.conf.js

@@ -122,6 +122,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
            */
           test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
           type: 'asset',
+          issuer: /\.s?css$/,
           parser: {
             dataUrlCondition: {
               maxSize: 2 * 1024 //data转成url的条件，也就是转成bas64的条件,maxSize相当于limit
@@ -132,6 +133,11 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
             filename: utils.assetsPath('img/[name].[hash:7][ext]') //[name]指原来的名字，[hash:6]取哈希的前六位，[ext]指原来的扩展名
           }
         },
+        {
+          test: /\.svg$/,
+          issuer: /\.[jt]sx?$/,
+          use: ['@svgr/webpack']
+        },
         {
           // 视频音频资源
           test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
@@ -311,5 +317,11 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
     webpackConfig.plugins.push(...curWebpackConfig.plugins);
   }
 
+  // 判断是否有自定义loader
+  if (curWebpackConfig.moduleRules && Array.isArray(curWebpackConfig.moduleRules)) {
+    // 添加自定义自定义loader
+    webpackConfig.module.rules.push(...curWebpackConfig.moduleRules);
+  }
+
   return webpackConfig;
 };