akfun 3.1.2 → 3.1.7

package/package.json

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

package/src/dev-server.js

@@ -111,23 +111,24 @@ module.exports = function (akfunConfig, _consoleTag) {
       if (err) {
         _reject(err);
       }
+      spinner.succeed(`${consoleTag}调试模式已开启！`);
+
       process.env.PORT = port;
       const uri = `http://${config.dev.hostname}:${port}`;
-
       console.log(`> Listening at ${uri}\n`);
-      // 如果是开发环境，自动打开浏览器并跳到项目首页
-      if (autoOpenBrowser) {
-        spinner.succeed(`${consoleTag}调试模式已开启！`);
-        // 打印当前环境中的首个html和css地址
-        const projPath = `${uri}${webpackConfig.output.publicPath}`;
-        let entryConfig = webpackConfig.entry || {}; // 获取构建入口配置
-        const entryFiles = (entryConfig && Object.keys(entryConfig)) || [];
-        if (entryFiles.length > 0) {
-          // 获取第一个入口文件
-          const filename = entryFiles[0];
-          console.info(
-            `当前运行脚本:\n ${projPath}${filename}.js\n当前运行样式[可能不存在]:\n${projPath}${filename}.css`
-          );
+
+      // 打印当前环境中的首个html和css地址
+      const projPath = `${uri}${webpackConfig.output.publicPath}`;
+      let entryConfig = webpackConfig.entry || {}; // 获取构建入口配置
+      const entryFiles = (entryConfig && Object.keys(entryConfig)) || [];
+      if (entryFiles.length > 0) {
+        // 获取第一个入口文件
+        const filename = entryFiles[0];
+        console.info(
+          `当前运行脚本:\n ${projPath}${filename}.js\n当前运行样式[可能不存在]:\n${projPath}${filename}.css`
+        );
+        // 是否自动打开浏览器并跳转到第一个入口页面
+        if (!config.dev.closeHtmlWebpackPlugin && autoOpenBrowser) {
           open(`${projPath}${filename}.html`, { wait: true });
         }
       }

package/src/utils/getProjectDir.js

@@ -7,10 +7,20 @@ module.exports = (_projectDir) => {
     curProjectDir.push(resolveToCurrentRoot('./src'));
   } else if (isArray(_projectDir)) {
     _projectDir.forEach((dir) => {
-      curProjectDir.push(resolveToCurrentRoot(dir));
+      if (dir.indexOf('/') === 0) {
+        // 判断是否是绝对路径
+        curProjectDir.push(dir);
+      } else {
+        curProjectDir.push(resolveToCurrentRoot(dir));
+      }
     });
   } else if (isString(_projectDir)) {
-    curProjectDir.push(resolveToCurrentRoot(_projectDir));
+    if (_projectDir.indexOf('/') === 0) {
+      // 判断是否是绝对路径
+      curProjectDir.push(_projectDir);
+    } else {
+      curProjectDir.push(resolveToCurrentRoot(_projectDir));
+    }
   }
   return curProjectDir;
 };

package/src/webpack/loaderUtils.js

@@ -44,7 +44,10 @@ exports.cssLoaders = function (options) {
             return options.cssLoaderUrl;
           }
           // Don't handle `node_modules` urls
-          if (resourcePath.includes('node_modules')) {
+          if (
+            resourcePath.includes('node_modules') ||
+            (options.cssLoaderUrlDir && resourcePath.includes(options.cssLoaderUrlDir))
+          ) {
             return true;
           }
           return false;

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

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

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

@@ -7,6 +7,7 @@ const projectConfig = require('../config/index');
 const getBaseWebpackConfig = require('./webpack.base.conf');
 const entrys2htmlWebpackPlugin = require('../utils/entrys2htmlWebpackPlugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const config = require('../config');
 // const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 
 module.exports = (akfunConfig) => {
@@ -30,7 +31,8 @@ module.exports = (akfunConfig) => {
       rules: utils.styleLoaders({
         sourceMap: curEnvConfig.cssSourceMap,
         environment: 'prod', // 'dev': 不会将css单独提取出来
-        cssLoaderUrl: config.webpack.cssLoaderUrl
+        cssLoaderUrl: config.webpack.cssLoaderUrl,
+        cssLoaderUrlDir: config.webpack.cssLoaderUrlDir
       })
     },
     // devtool: '#cheap-module-eval-source-map', // 本地开发环境中的取值
@@ -52,11 +54,13 @@ module.exports = (akfunConfig) => {
     ]
   });
 
-  // 使用用户自定义的多入口配置，生产对应的多页面多模板（优先使用用户的自定义页面模板）
-  const htmlWebpackPluginList = entrys2htmlWebpackPlugin(webpackDevConfig.entry, curHtmlTemplate);
-  htmlWebpackPluginList.forEach((htmlWebpackPlugin) => {
-    webpackDevConfig.plugins.push(htmlWebpackPlugin);
-  });
+  if (!webpackDevConfig.closeHtmlWebpackPlugin) {
+    // 使用用户自定义的多入口配置，生产对应的多页面多模板（优先使用用户的自定义页面模板）
+    const htmlWebpackPluginList = entrys2htmlWebpackPlugin(webpackDevConfig.entry, curHtmlTemplate);
+    htmlWebpackPluginList.forEach((htmlWebpackPlugin) => {
+      webpackDevConfig.plugins.push(htmlWebpackPlugin);
+    });
+  }
 
   // 开启热更新能力
   const devClientPath = path.resolve(__dirname, '../dev-client'); // 从akfun中获取

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

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

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

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