akfun 3.1.7 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "3.1.7",
+  "version": "3.2.0",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -73,6 +73,7 @@
     "@rollup/plugin-image": "^2.1.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-typescript": "^8.3.1",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "@vue/compiler-sfc": "^3.2.29",
@@ -113,7 +114,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/config/rollup.config.js

@@ -1,6 +1,8 @@
 // rollup.config.js
 const { babel } = require('@rollup/plugin-babel');
 const { nodeResolve } = require('@rollup/plugin-node-resolve'); // 支持node中的文件导入
+// const jsx = require('rollup-plugin-jsx'); // 用于处理jsx
+const typescript = require('@rollup/plugin-typescript'); // 支持ts
 const commonjs = require('@rollup/plugin-commonjs'); // 识别cmd模块
 const vue = require('rollup-plugin-vue');
 const json = require('@rollup/plugin-json'); // 识别json类型文件
@@ -20,9 +22,9 @@ const cssnano = require('cssnano');
 const { resolveToCurrentRoot, resolveToCurrentDist } = require('../utils/pathUtils'); // 统一路径解析
 const babelConfig = require('./babel.config'); // Babel的配置文件
 const curProjectConfig = require('./index'); // 引入当前项目配置文件
-const {buildBanner} = require("../utils/akfunParams");
+const { buildBanner } = require('../utils/akfunParams');
 
-module.exports = function(fileName, akfunConfig) {
+module.exports = function (fileName, akfunConfig) {
   const curConfig = akfunConfig || curProjectConfig;
   // 获取用户配置的构建入口文件
   let rollupInput = resolveToCurrentRoot('src/main.js');
@@ -50,7 +52,9 @@ module.exports = function(fileName, akfunConfig) {
       nodeResolve({
         extensions: curConfig.webpack.resolve.extensions
       }),
+      typescript(),
       babel(babelConfig), // 备注，需要先babel()再commjs()
+      // jsx( {factory: 'React.createElement'} ),
       vue(),
       commonjs(),
       postcss({

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

@@ -6,7 +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]的生效目录
+    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) => {
               }
             }
           ],
-          include: curProjectDir, // [resolve('src')],
-          exclude: /node_modules/
+          // exclude: /node_modules/,
+          include: curProjectDir // [resolve('src')],
         },
         {
           test: /\.(jsx?)$/,
@@ -112,8 +112,8 @@ module.exports = (_curEnvConfig, _akfunConfig) => {
               options: babelConfig
             }
           ],
-          include: curProjectDir, // [resolve('src')],
-          exclude: /node_modules/
+          // exclude: /node_modules/,
+          include: curProjectDir // [resolve('src')],
         },
         {
           // 图片资源
@@ -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.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'); // 统一路径解析
@@ -133,11 +132,6 @@ module.exports = (akfunConfig) => {
     );
   }
 
-  // 是否开启
-  if (curEnvConfig.openMonacoWebpackPlugin) {
-    webpackProdConfig.plugins.push(new MonacoWebpackPlugin());
-  }
-
   if (curEnvConfig.bundleAnalyzerReport) {
     webpackProdConfig.plugins.push(new BundleAnalyzerPlugin());
   }