akfun 5.1.15 → 5.1.17

package/module/main.js

@@ -13,7 +13,7 @@ const aliBOS = require('../src/oss/aliBos.js');
 const baiduBOS = require('../src/oss/baiduBos.js');
 
 // 新增：配置管理和环境管理
-const configManager = require('../src/config/ConfigManager');
+const configManager = require('../src/manage/ConfigManager');
 const { validateConfig } = require('../src/utils/configValidator');
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "5.1.15",
+  "version": "5.1.17",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -51,6 +51,7 @@
   "dependencies": {
     "@babel/cli": "^7.17.0",
     "@babel/core": "^7.17.0",
+    "@babel/polyfill": "^7.10.1",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-decorators": "^7.17.0",
@@ -62,21 +63,21 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-transform-runtime": "^7.27.1",
-    "@babel/polyfill": "^7.10.1",
     "@babel/runtime": "^7.27.1",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
     "@babel/register": "^7.17.0",
     "@mapbox/stylelint-processor-arbitrary-tags": "^0.4.0",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-image": "^2.1.1",
+    "@rollup/plugin-alias": "^5.1.1",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-image": "^3.0.3",
     "@svgr/rollup": "^8.1.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-typescript": "^8.3.1",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@rollup/plugin-terser": "^0.4.4",
     "@svgr/webpack": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
@@ -129,12 +130,11 @@
     "progress-bar-webpack-plugin": "^2.1.0",
     "qs": "^6.10.3",
     "rimraf": "^3.0.2",
-    "rollup": "^2.67.0",
-    "rollup-plugin-node-externals": "^4.0.0",
+    "rollup": "^4.53.3",
+    "rollup-plugin-node-externals": "^8.1.2",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-vue": "^6.0.0",
-    "sass": "^1.49.7",
+    "sass": "^1.94.2",
     "sass-loader": "^12.4.0",
     "less": "^4.1.3",
     "less-loader": "^11.0.0",
@@ -175,8 +175,8 @@
     "prettier": "^2.5.1"
   },
   "engines": {
-    "node": ">= 10.13.0",
-    "npm": ">= 6.4.1"
+    "node": ">= 16.0.0",
+    "npm": ">= 8.0.0"
   },
   "browserslist": [
     "> 1%",

package/src/build.js

@@ -5,18 +5,13 @@ const chalk = require('chalk');
 const webpack = require('webpack');
 const { curConsoleTag } = require('./utils/akfunParams');
 const checkVersion = require('./check-versions');
-const projectConfig = require('./config/index'); // 引入当前项目配置文件
-const defaultConfig = require('./config/default.config');
-const deepMergeConfig = require('./utils/deepMergeConfig');
+const getProjectConfig = require('./config/index'); // 用于获取当前项目配置文件
 
 // 构建脚本：一般用于构建生产环境的代码
 module.exports = function (BuildType, akfunConfig, _consoleTag, callbackFunc) {
   const consoleTag = _consoleTag || curConsoleTag;
-  let config = projectConfig; // 默认使用执行命令目录下的配置数据
-  if (akfunConfig) {
-    // 参数中的config配置优先级最高
-    config = deepMergeConfig(defaultConfig, akfunConfig);
-  }
+  // 获取项目配置文件
+  let config = getProjectConfig(akfunConfig);
   let curEnvConfig = config.build;
   // 检查当前npm版本号是否匹配
   checkVersion();

package/src/build2esm.js

@@ -1,39 +1,37 @@
 const ora = require('ora');
 const rollup = require('rollup');
-const { terser } = require('rollup-plugin-terser'); // 压缩
-const projectConfig = require('./config/index'); // 引入当前项目配置文件
-const defaultConfig = require('./config/default.config');
+const { terser } = require('@rollup/plugin-terser'); // 压缩
+const getProjectConfig = require('./config/index'); // 用于获取当前项目配置文件
 const rollupConfig = require('./config/rollup.config'); // rollup的配置文件
 const { isArray, isObject } = require('./utils/typeof');
 const { curConsoleTag } = require('./utils/akfunParams');
-const deepMergeConfig = require('./utils/deepMergeConfig');
 
 async function build2esmFunc(options, curConfig) {
   // create a bundle
   const bundle = await rollup.rollup({
     input: options.input,
-    external: options.externals,
+    external: options.external || options.externals, // 兼容新旧两种写法
     plugins: options.plugins
   });
 
   if (isArray(options.output)) {
-    options.output.map((outputItem) => {
-      bundle.write(outputItem);
-    });
+    // 等待所有输出完成
+    await Promise.all(options.output.map((outputItem) => bundle.write(outputItem)));
   } else if (isObject(options.output)) {
     // or write the bundle to disk
     await bundle.write(options.output);
   }
+
+  // 关闭 bundle 以释放资源
+  await bundle.close();
 }
 
 // 构建脚本：一般用于构建生产环境的代码
 module.exports = function (fileName, akfunConfig, _consoleTag) {
   const consoleTag = _consoleTag || curConsoleTag;
-  let config = projectConfig; // 默认使用执行命令目录下的配置数据
-  if (akfunConfig) {
-    // 参数中的config配置优先级最高
-    config = deepMergeConfig(defaultConfig, akfunConfig);
-  }
+  // 获取项目配置文件
+  let config = getProjectConfig(akfunConfig);
+  
   const spinner = ora(`${consoleTag}开启esm模块构建能力...`).start();
   const curRollupConfig = rollupConfig(fileName, config); // 默认配置
   const build2esm = config.build2esm; // 用户的项目配置
@@ -60,8 +58,8 @@ module.exports = function (fileName, akfunConfig, _consoleTag) {
     externals = externals.concat(Object.keys(build2esmExternal));
   }
 
-  // 添加到 rollup 配置中
-  curRollupConfig.externals = externals;
+  // 添加到 rollup 配置中（rollup 使用 external 而不是 externals）
+  curRollupConfig.external = externals;
 
   if (build2esm && build2esm.output) {
     curRollupConfig.output = build2esm.output;

package/src/config/babel.config.js

@@ -1,13 +1,16 @@
 module.exports = {
+  sourceType: 'module', // 明确指定源类型为 ES 模块，以支持 import/export 语法
   presets: [
     [
       '@babel/preset-env',
       {
         loose: true,
         modules: false, // 是否启用将ES6模块语法转换为其他模块类型的功能，当前设置为false，以便webpack进行tree shaking。
-        targets: {
-          browsers: ['> 1%', 'last 2 versions', 'not ie <= 8']
-        }
+        /*
+        备注：后续升级babel版本时，再启用此配置
+        useBuiltIns: 'usage', // 按需引入 polyfill，替代 @babel/polyfill
+        corejs: 3, // 使用 core-js 3.x 版本
+        */
       }
     ],
     ['@babel/preset-react'],

package/src/config/index.js

@@ -2,18 +2,20 @@
  * 配置入口文件
  * 统一加载和管理 AKFun 配置
  */
-
 // 使用新的配置管理器
 const configManager = require('../manage/ConfigManager');
 
-// 自动加载用户配置文件
-configManager.autoLoadConfig();
-
-// 合并配置
-const mergedConfig = configManager.mergeConfig();
-
 // 导出合并后的配置（向后兼容）
-module.exports = mergedConfig;
+module.exports = (akfunConfig) => {
+  if (!akfunConfig) {
+    // 自动加载用户配置文件
+    configManager.autoLoadConfig();
+  }
+  // 合并配置
+  const mergedConfig = configManager.mergeConfig(akfunConfig);
+
+  // 校验当前项目配置
+  configManager.validateConfig();
 
-// 同时导出配置管理器实例，供高级用户使用
-module.exports.configManager = configManager;
+  return mergedConfig;
+};

package/src/config/rollup.config.js

@@ -7,7 +7,7 @@ const commonjs = require('@rollup/plugin-commonjs'); // 识别cmd模块
 const vue = require('rollup-plugin-vue');
 const json = require('@rollup/plugin-json'); // 识别json类型文件
 const image = require('@rollup/plugin-image'); // 图片处理器
-const { terser } = require('rollup-plugin-terser'); // 压缩
+const terser = require('@rollup/plugin-terser'); // 压缩
 const alias = require('@rollup/plugin-alias'); // 简写配置
 // css相关处理器
 const postcss = require('rollup-plugin-postcss');
@@ -21,7 +21,7 @@ const postcssPresetEnv = require('postcss-preset-env');
 const cssnano = require('cssnano');
 // 处理svg文件
 const svgr = require('@svgr/rollup');
-const { externals } = require('rollup-plugin-node-externals');
+const { nodeExternals } = require('rollup-plugin-node-externals');
 const { resolveToCurrentRoot, resolveToCurrentDist } = require('../utils/pathUtils'); // 统一路径解析
 const babelConfig = require('./babel.config'); // Babel的配置文件
 const projectConfig = require('./index'); // 引入当前项目配置文件
@@ -57,21 +57,30 @@ module.exports = function (fileName, akfunConfig) {
     input: rollupInput,
     plugins: [
       alias({
-        resolve: curConfig.webpack.resolve.extensions,
-        extensions: curConfig.webpack.resolve.extensions,
-        entries: curConfig.webpack.resolve.alias
+        entries: Object.entries(curConfig.webpack.resolve.alias || {}).map(
+          ([find, replacement]) => ({
+            find,
+            replacement
+          })
+        )
       }),
       /**
        * excludeList（在akfun.config.js中配置）
        * 设置打包中应该排除的依赖
        */
-      externals({
+      nodeExternals({
         include: build2esm.excludeList || []
         // exclude: ['./**', '../**'], // 排除所有相对路径模块
         // deps: true, // 只标记 node_modules 中的依赖
         // devDeps: false, // 不标记 devDependencies
         // peerDeps: true, // 标记 peerDependencies
       }),
+      /**
+       * nodeResolve 插件用于解析模块路径
+       * extensions: 默认识别的文件后缀列表
+       * 默认值（来自 webpack.resolve.extensions）: ['.js', '.jsx', '.ts', '.tsx', '.vue', '.json']
+       * 如果不配置此插件，Rollup 默认只识别 .js 和 .mjs 文件
+       */
       nodeResolve({
         extensions: curConfig.webpack.resolve.extensions
       }),

package/src/dev-server.js

@@ -9,21 +9,15 @@ const portfinder = require('portfinder');
 const checkVersion = require('./check-versions');
 const { createProxyMiddleware } = require('http-proxy-middleware');
 const { resolve } = require('./utils/pathUtils');
-// 引入当前项目配置文件
-const projectConfig = require('./config/index');
-const defaultConfig = require('./config/default.config');
+const getProjectConfig = require('./config/index'); // 用于获取当前项目配置文件
 const getDevWebpackConfig = require('./webpack/webpack.dev.conf');
-const deepMergeConfig = require('./utils/deepMergeConfig');
 const { curConsoleTag } = require('./utils/akfunParams');
 
 // 构建脚本：一般用于构建开发环境的代码（包含热更新、接口代理等功能）
 module.exports = function (akfunConfig, _consoleTag) {
   const consoleTag = _consoleTag || curConsoleTag;
-  let config = projectConfig; // 默认使用执行命令目录下的配置数据
-  if (akfunConfig) {
-    // 优先使用参数中的config配置
-    config = deepMergeConfig(defaultConfig, akfunConfig);
-  }
+  // 获取项目配置文件
+  let config = getProjectConfig(akfunConfig);
   const curEnvConfig = config.dev;
   // 检查当前npm版本号是否匹配
   checkVersion();

package/src/initData/akfun-package.json

@@ -55,18 +55,20 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/polyfill": "^7.10.1",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
     "@babel/register": "^7.17.0",
     "@mapbox/stylelint-processor-arbitrary-tags": "^0.4.0",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-image": "^2.1.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-alias": "^6.0.0",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-image": "^3.0.3",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@svgr/rollup": "^8.1.0",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "@vue/compiler-sfc": "^3.2.29",
@@ -77,6 +79,7 @@
     "chalk": "^4.0.0",
     "compression-webpack-plugin": "^9.2.0",
     "connect-history-api-fallback": "^1.6.0",
+    "core-js": "^3.47.0",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.6.0",
     "cssnano": "^5.0.16",
@@ -104,7 +107,7 @@
     "http-proxy-middleware": "^2.0.2",
     "inquirer": "^8.2.0",
     "mini-css-extract-plugin": "^2.5.3",
-    "sass": "^1.49.7",
+    "sass": "^1.94.2",
     "open": "^8.4.0",
     "ora": "^4.0.4",
     "params-replace-loader": "^1.1.6",
@@ -116,9 +119,10 @@
     "progress-bar-webpack-plugin": "^2.1.0",
     "qs": "^6.10.3",
     "rimraf": "^3.0.2",
-    "rollup": "^2.67.0",
+    "rollup": "^4.53.3",
+    "rollup-plugin-jsx": "^1.0.3",
+    "rollup-plugin-node-externals": "^8.1.2",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-vue": "^6.0.0",
     "sass-loader": "^12.4.0",
     "sass-resources-loader": "^2.2.4",

package/src/initData/config/babel.config.js

@@ -1,10 +1,12 @@
-module.export = {
+module.exports = {
   presets: [
     [
       '@babel/preset-env',
       {
         loose: false,
         modules: false,
+        useBuiltIns: 'usage', // 按需引入 polyfill，替代 @babel/polyfill
+        corejs: 3, // 使用 core-js 3.x 版本
         targets: {
           browsers: ['> 1%', 'last 2 versions', 'not ie <= 8']
         }

package/src/manage/ConfigManager.js

@@ -58,9 +58,7 @@ class ConfigManager {
    * 按优先级查找：akfun.config.js -> akfun.config.json
    * @returns {Object|null}
    */
-  autoLoadConfig() {
-    const configFiles = ['akfun.config.js', 'akfun.config.json', '.akfunrc.js', '.akfunrc.json'];
-
+  autoLoadConfig(configFiles = ['akfun.config.js', 'akfun.config.json', '.akfunrc.js', '.akfunrc.json']) {
     for (const configFile of configFiles) {
       const configPath = path.resolve(process.cwd(), configFile);
       if (fs.existsSync(configPath)) {
@@ -68,7 +66,7 @@ class ConfigManager {
       }
     }
 
-    console.log(chalk.gray('   未找到配置文件，使用默认配置'));
+    console.log(chalk.gray('   未找到项目配置文件，使用默认配置'));
     return null;
   }
 
@@ -150,12 +148,12 @@ class ConfigManager {
   }
 
   /**
-   * 验证配置
+   * 验证当前项目的配置（仅验证 userConfig 中的配置）
    * @returns {Object} 验证后的配置
    */
   validateConfig() {
-    if (!this.mergedConfig) {
-      this.mergeConfig();
+    if (!this.userConfig) {
+      return this.userConfig;
     }
 
     try {
@@ -165,7 +163,7 @@ class ConfigManager {
       // 如果有配置验证器，使用它
       try {
         const { validateConfig } = require('../utils/configValidator');
-        return validateConfig(this.mergedConfig);
+        return validateConfig(this.userConfig);
       } catch (error) {
         // 如果配置验证器不存在或出错，只进行基础验证
         if (process.env.AKFUN_DEBUG) {
@@ -173,7 +171,7 @@ class ConfigManager {
         }
       }
 
-      return this.mergedConfig;
+      return this.userConfig;
     } catch (error) {
       console.error(chalk.red('\n❌ 配置验证失败:'));
       console.error(chalk.red(`   ${error.message}\n`));
@@ -186,23 +184,23 @@ class ConfigManager {
    * @private
    */
   _validateBasicConfig() {
-    const config = this.mergedConfig;
+    const config = this.userConfig;
 
     // 验证必需的配置项
-    if (!config.dev || typeof config.dev !== 'object') {
-      throw new Error('dev 配置缺失或格式错误');
+    if (config.dev && typeof config.dev !== 'object') {
+      throw new Error('dev 配置格式错误');
     }
 
-    if (!config.build || typeof config.build !== 'object') {
-      throw new Error('build 配置缺失或格式错误');
+    if (config.build && typeof config.build !== 'object') {
+      throw new Error('build 配置格式错误');
     }
 
-    if (!config.webpack || typeof config.webpack !== 'object') {
-      throw new Error('webpack 配置缺失或格式错误');
+    if (config.webpack && typeof config.webpack !== 'object') {
+      throw new Error('webpack 配置格式错误');
     }
 
     // 验证端口号
-    if (config.dev.port) {
+    if (config.dev && config.dev.port) {
       const port = parseInt(config.dev.port, 10);
       if (isNaN(port) || port < 1 || port > 65535) {
         throw new Error('dev.port 必须是 1-65535 之间的数字');
@@ -210,7 +208,7 @@ class ConfigManager {
     }
 
     // 验证路径
-    if (config.build.assetsRoot) {
+    if (config.build && config.build.assetsRoot) {
       const assetsRoot = config.build.assetsRoot;
       if (typeof assetsRoot !== 'string') {
         throw new Error('build.assetsRoot 必须是字符串类型的路径');

package/src/utils/configValidator.js

@@ -35,7 +35,7 @@ class ConfigValidator {
 
     // 输出警告
     if (this.warnings.length > 0) {
-      console.log(chalk.yellow('\n⚠️  配置警告:'));
+      console.log(chalk.yellow('\n⚠️  配置异常提示:'));
       this.warnings.forEach((warning) => {
         console.log(chalk.yellow(`   - ${warning}`));
       });
@@ -81,23 +81,18 @@ class ConfigValidator {
    * @private
    */
   _validateWebpack(webpack) {
-    if (!webpack) {
-      this.errors.push('webpack 配置缺失');
-      return;
-    }
-
     // 验证 entry
-    if (webpack.entry !== undefined) {
+    if (webpack && webpack.entry !== undefined) {
       this._validateEntry(webpack.entry);
     }
 
     // 验证 resolve
-    if (webpack.resolve) {
+    if (webpack && webpack.resolve) {
       this._validateResolve(webpack.resolve);
     }
 
     // 验证 externals
-    if (webpack.externals !== undefined) {
+    if (webpack && webpack.externals !== undefined) {
       const validTypes = ['object', 'string', 'function'];
       if (!validTypes.includes(typeof webpack.externals)) {
         this.errors.push('webpack.externals 类型不正确');
@@ -105,14 +100,14 @@ class ConfigValidator {
     }
 
     // 验证 sassResources
-    if (webpack.sassResources !== undefined) {
+    if (webpack && webpack.sassResources !== undefined) {
       if (!Array.isArray(webpack.sassResources)) {
         this.errors.push('webpack.sassResources 必须是数组');
       }
     }
 
     // 验证 babelPlugins
-    if (webpack.babelPlugins !== undefined) {
+    if (webpack && webpack.babelPlugins !== undefined) {
       const validTypes = ['function', 'object'];
       const type = Array.isArray(webpack.babelPlugins) ? 'object' : typeof webpack.babelPlugins;
       if (!validTypes.includes(type)) {
@@ -121,12 +116,12 @@ class ConfigValidator {
     }
 
     // 验证 moduleRules
-    if (webpack.moduleRules !== undefined && !Array.isArray(webpack.moduleRules)) {
+    if (webpack && webpack.moduleRules !== undefined && !Array.isArray(webpack.moduleRules)) {
       this.errors.push('webpack.moduleRules 必须是数组');
     }
 
     // 验证 plugins
-    if (webpack.plugins !== undefined && !Array.isArray(webpack.plugins)) {
+    if (webpack && webpack.plugins !== undefined && !Array.isArray(webpack.plugins)) {
       this.errors.push('webpack.plugins 必须是数组');
     }
   }
@@ -384,9 +379,9 @@ class ConfigValidator {
       return;
     }
 
-    if (portNum < 1024 && process.platform !== 'win32') {
+    if (portNum < 1024 && process.platform === 'win32') {
       this.warnings.push(
-        `${fieldName} (${portNum}) 小于 1024，在非 Windows 系统上可能需要管理员权限`
+        `${fieldName} (${portNum}) 小于 1024，在 Windows 系统上可能需要管理员权限。`
       );
     }
   }