akfun 3.1.5 → 3.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "3.1.5",
+  "version": "3.1.9",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -113,7 +113,6 @@
     "inquirer": "^8.2.0",
     "mini-css-extract-plugin": "^2.5.3",
     "css-minimizer-webpack-plugin": "^3.4.1",
-    "monaco-editor-webpack-plugin": "6.0.0",
     "sass": "^1.49.7",
     "open": "^8.4.0",
     "ora": "^4.0.4",

package/src/dev-server.js

@@ -127,10 +127,10 @@ module.exports = function (akfunConfig, _consoleTag) {
         console.info(
           `当前运行脚本:\n ${projPath}${filename}.js\n当前运行样式[可能不存在]:\n${projPath}${filename}.css`
         );
-      }
-      // 是否自动打开浏览器并跳到项目首页
-      if (!config.dev.closeHtmlWebpackPlugin && autoOpenBrowser) {
-        open(`${projPath}${filename}.html`, { wait: true });
+        // 是否自动打开浏览器并跳转到第一个入口页面
+        if (!config.dev.closeHtmlWebpackPlugin && autoOpenBrowser) {
+          open(`${projPath}${filename}.html`, { wait: true });
+        }
       }
       server = app.listen(port);
       _resolve();

package/src/initData/akfun-package.json

@@ -105,7 +105,6 @@
     "http-proxy-middleware": "^2.0.2",
     "inquirer": "^8.2.0",
     "mini-css-extract-plugin": "^2.5.3",
-    "monaco-editor-webpack-plugin": "6.0.0",
     "sass": "^1.49.7",
     "open": "^8.4.0",
     "ora": "^4.0.4",

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

@@ -101,8 +101,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
               }
             }
           ],
+          // exclude: /node_modules/,
           include: curProjectDir, // [resolve('src')],
-          exclude: /node_modules/
         },
         {
           test: /\.(jsx?)$/,
@@ -112,8 +112,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
               options: babelConfig
             }
           ],
+          // exclude: /node_modules/,
           include: curProjectDir, // [resolve('src')],
-          exclude: /node_modules/
         },
         {
           // 图片资源
@@ -163,8 +163,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
         {
           test: /\.(js|ts|tsx|jsx|vue|css|html)$/,
           loader: 'params-replace-loader',
+          // exclude: [/node_modules/, resolve('src/mock/data')], // 排除不需要进行校验的文件夹
           include: curProjectDir, // [resolve('src')],
-          exclude: [/node_modules/, resolve('src/mock/data')], // 排除不需要进行校验的文件夹
           options: config.envParams
         },
         {
@@ -243,7 +243,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
         // context: resolve('src'),
         extensions: ['ts', 'tsx'],
         // include: curProjectDir, // [resolve('src')],
-        exclude: 'node_modules',
+        // exclude: 'node_modules',
         cache: true,
         fix: config.settings.enableESLintFix || false,
         formatter: require('eslint-friendly-formatter'),
@@ -255,7 +255,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       new ESLintPlugin({
         extensions: ['js', 'jsx'],
         // include: curProjectDir, // [resolve('src')],
-        exclude: 'node_modules',
+        // exclude: 'node_modules',
         cache: true,
         fix: config.settings.enableESLintFix || false,
         formatter: require('eslint-friendly-formatter'),
@@ -267,7 +267,7 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
       new ESLintPlugin({
         extensions: ['vue'],
         // include: curProjectDir, // [resolve('src')],
-        exclude: 'node_modules',
+        // exclude: 'node_modules',
         cache: true,
         fix: config.settings.enableESLintFix || false,
         formatter: require('eslint-friendly-formatter'),

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', // 本地开发环境中的取值

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

@@ -7,7 +7,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); // 替换extrac
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const CompressionWebpackPlugin = require('compression-webpack-plugin');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
 const utils = require('./loaderUtils');
 const { resolve } = require('../utils/pathUtils'); // 统一路径解析
@@ -47,7 +46,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, // 线上生成环境
@@ -132,11 +132,6 @@ module.exports = (akfunConfig) => {
     );
   }
 
-  // 是否开启
-  if (curEnvConfig.openMonacoWebpackPlugin) {
-    webpackProdConfig.plugins.push(new MonacoWebpackPlugin());
-  }
-
   if (curEnvConfig.bundleAnalyzerReport) {
     webpackProdConfig.plugins.push(new BundleAnalyzerPlugin());
   }