akfun 5.1.13 → 6.0.0

package/module/main.js

@@ -12,11 +12,18 @@ const getCurWebpackConfig = require('../src/utils/getCurWebpackConfig.js'); //
 const aliBOS = require('../src/oss/aliBos.js');
 const baiduBOS = require('../src/oss/baiduBos.js');
 
+// 新增：配置管理和环境管理
+const configManager = require('../src/config/ConfigManager');
+const { validateConfig } = require('../src/utils/configValidator');
+
 module.exports = {
+  // 核心功能
   dev: devAction,
   build: buildAction,
   build2esm,
   inspect,
+  
+  // 工具方法
   gitClone,
   createFile,
   resolve,
@@ -24,6 +31,12 @@ module.exports = {
   deepMergeConfig,
   getCurWebpackConfig,
   curWebpackBaseConfPath: getCurWebpackConfig('base'),
+  
+  // OSS 上传
   aliBOS,
-  baiduBOS
+  baiduBOS,
+  
+  // 新增：配置管理
+  configManager,
+  validateConfig
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akfun",
-  "version": "5.1.13",
+  "version": "6.0.0",
   "description": "前端脚手架：支持Vue技术栈和react技术栈",
   "keywords": [
     "前端工程",
@@ -62,21 +62,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": "^6.0.0",
+    "@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",
@@ -88,6 +88,7 @@
     "chalk": "^4.0.0",
     "compression-webpack-plugin": "^9.2.0",
     "connect-history-api-fallback": "^2.0.0",
+    "core-js": "^3.47.0",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^6.6.0",
     "css-minimizer-webpack-plugin": "^3.4.1",
@@ -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/build2esm.js

@@ -1,6 +1,6 @@
 const ora = require('ora');
 const rollup = require('rollup');
-const { terser } = require('rollup-plugin-terser'); // 压缩
+const { terser } = require('@rollup/plugin-terser'); // 压缩
 const projectConfig = require('./config/index'); // 引入当前项目配置文件
 const defaultConfig = require('./config/default.config');
 const rollupConfig = require('./config/rollup.config'); // rollup的配置文件
@@ -12,18 +12,20 @@ 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();
 }
 
 // 构建脚本：一般用于构建生产环境的代码
@@ -60,8 +62,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

@@ -5,6 +5,8 @@ module.exports = {
       {
         loose: true,
         modules: false, // 是否启用将ES6模块语法转换为其他模块类型的功能，当前设置为false，以便webpack进行tree shaking。
+        useBuiltIns: 'usage', // 按需引入 polyfill，替代 @babel/polyfill
+        corejs: 3, // 使用 core-js 3.x 版本
         targets: {
           browsers: ['> 1%', 'last 2 versions', 'not ie <= 8']
         }

package/src/config/index.js

@@ -1,15 +1,22 @@
-// 统一路径解析：
-const { resolve } = require('../utils/pathUtils');
-const defaultAKFunConfig = require('./default.config');
-const getConfigObj = require('../utils/getConfigObj');
-const deepMergeConfig = require('../utils/deepMergeConfig');
-
-/** akfun脚手架赋予当前项目的默认配置
- * 备注：项目根目录的akfun.config.js的配置内容优先级高于defultAKFunConfig
+/**
+ * 配置入口文件
+ * 统一加载和管理 AKFun 配置
  */
 
-// 从项目根目录获取当前项目的配置文件
-const curProjectConfig = getConfigObj(resolve('akfun.config.js'));
+// 使用新的配置管理器
+const configManager = require('../manage/ConfigManager');
 
-// 备注：数组类型则直接覆盖
-module.exports = deepMergeConfig(defaultAKFunConfig, curProjectConfig);
+// 自动加载用户配置文件
+configManager.autoLoadConfig();
+
+// 合并配置
+const mergedConfig = configManager.mergeConfig();
+
+// 校验当前项目配置
+configManager.validateConfig(mergedConfig);
+
+// 导出合并后的配置（向后兼容）
+module.exports = mergedConfig;
+
+// 同时导出配置管理器实例，供高级用户使用
+module.exports.configManager = configManager;

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');
@@ -57,9 +57,12 @@ 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中配置）
@@ -67,7 +70,17 @@ module.exports = function (fileName, akfunConfig) {
        */
       externals({
         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
       }),
@@ -82,7 +95,11 @@ module.exports = function (fileName, akfunConfig) {
       // jsx( {factory: 'React.createElement'} ),
       buildType === 'ts' ? undefined : jsx({ factory: 'React.createElement' }),
       vue(),
-      commonjs(),
+      commonjs({
+        transformMixedEsModules: true, // 转换混合的 ES 模块和 CommonJS 模块
+        strictRequires: true, // 严格模式处理 require，确保所有 require 都被正确处理
+        ignoreDynamicRequires: true // 忽略动态 require
+      }),
       postcss({
         extensions: ['.css', '.scss', '.sass', '.styl', '.stylus', '.less'],
         // Or with custom file name, it will generate file relative to bundle.js in v3

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

@@ -0,0 +1,315 @@
+/**
+ * 配置管理器
+ * 负责加载、合并和验证配置
+ */
+const path = require('path');
+const fs = require('fs');
+const chalk = require('chalk');
+const deepMergeConfig = require('../utils/deepMergeConfig');
+
+class ConfigManager {
+  constructor() {
+    this.defaultConfig = require('../config/default.config');
+    this.userConfig = null;
+    this.mergedConfig = null;
+    this.configPath = null;
+  }
+
+  /**
+   * 加载用户配置文件
+   * @param {string} configPath - 配置文件路径（相对于项目根目录）
+   * @returns {Object|null} 用户配置对象，如果不存在则返回 null
+   */
+  loadUserConfig(configPath) {
+    try {
+      // 支持相对路径和绝对路径
+      const resolvedPath = path.isAbsolute(configPath)
+        ? configPath
+        : path.resolve(process.cwd(), configPath);
+
+      this.configPath = resolvedPath;
+
+      if (!fs.existsSync(resolvedPath)) {
+        console.log(chalk.yellow(`\n⚠️  未找到用户配置文件: ${configPath}\n   使用默认配置运行\n`));
+        return null;
+      }
+
+      // 清除 require 缓存，确保获取最新配置
+      delete require.cache[resolvedPath];
+      this.userConfig = require(resolvedPath);
+
+      console.log(chalk.green(`✓ 已加载配置文件: ${configPath}`));
+      return this.userConfig;
+    } catch (error) {
+      console.error(chalk.red(`\n❌ 加载配置文件失败: ${configPath}\n`));
+      console.error(chalk.red(`   错误信息: ${error.message}\n`));
+
+      if (error.stack && process.env.AKFUN_DEBUG) {
+        console.error(chalk.gray(error.stack));
+      }
+
+      console.log(chalk.yellow('   将使用默认配置继续运行\n'));
+      return null;
+    }
+  }
+
+  /**
+   * 自动查找并加载配置文件
+   * 按优先级查找：akfun.config.js -> akfun.config.json
+   * @returns {Object|null}
+   */
+  autoLoadConfig() {
+    const 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)) {
+        return this.loadUserConfig(configPath);
+      }
+    }
+
+    console.log(chalk.gray('   未找到配置文件，使用默认配置'));
+    return null;
+  }
+
+  /**
+   * 合并配置
+   * @param {Object} userConfig - 用户配置（可选）
+   * @returns {Object} 合并后的配置
+   */
+  mergeConfig(userConfig) {
+    const configToMerge = userConfig || this.userConfig || {};
+
+    try {
+      this.mergedConfig = deepMergeConfig(this.defaultConfig, configToMerge);
+
+      // 输出配置摘要
+      if (process.env.AKFUN_DEBUG) {
+        this.printConfigSummary();
+      }
+
+      return this.mergedConfig;
+    } catch (error) {
+      console.error(chalk.red('\n❌ 配置合并失败:'));
+      console.error(chalk.red(`   ${error.message}\n`));
+      throw error;
+    }
+  }
+
+  /**
+   * 获取配置
+   * @param {string} key - 配置键路径（支持点号分隔，如 'webpack.resolve.alias'）
+   * @returns {any} 配置值
+   */
+  getConfig(key) {
+    if (!this.mergedConfig) {
+      this.mergeConfig();
+    }
+
+    if (!key) {
+      return this.mergedConfig;
+    }
+
+    // 支持点号分隔的键路径
+    const keys = key.split('.');
+    let result = this.mergedConfig;
+
+    for (const k of keys) {
+      if (result && typeof result === 'object' && k in result) {
+        result = result[k];
+      } else {
+        return undefined;
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * 设置配置值（仅在内存中）
+   * @param {string} key - 配置键路径
+   * @param {any} value - 配置值
+   */
+  setConfig(key, value) {
+    if (!this.mergedConfig) {
+      this.mergeConfig();
+    }
+
+    const keys = key.split('.');
+    let target = this.mergedConfig;
+
+    for (let i = 0; i < keys.length - 1; i++) {
+      const k = keys[i];
+      if (!(k in target) || typeof target[k] !== 'object') {
+        target[k] = {};
+      }
+      target = target[k];
+    }
+
+    target[keys[keys.length - 1]] = value;
+  }
+
+  /**
+   * 验证配置
+   * @returns {Object} 验证后的配置
+   */
+  validateConfig() {
+    if (!this.mergedConfig) {
+      this.mergeConfig();
+    }
+
+    try {
+      // 基础验证
+      this._validateBasicConfig();
+
+      // 如果有配置验证器，使用它
+      try {
+        const { validateConfig } = require('../utils/configValidator');
+        return validateConfig(this.mergedConfig);
+      } catch (error) {
+        // 如果配置验证器不存在或出错，只进行基础验证
+        if (process.env.AKFUN_DEBUG) {
+          console.log(chalk.gray('   使用基础配置验证'));
+        }
+      }
+
+      return this.mergedConfig;
+    } catch (error) {
+      console.error(chalk.red('\n❌ 配置验证失败:'));
+      console.error(chalk.red(`   ${error.message}\n`));
+      throw error;
+    }
+  }
+
+  /**
+   * 基础配置验证
+   * @private
+   */
+  _validateBasicConfig() {
+    const config = this.mergedConfig;
+
+    // 验证必需的配置项
+    if (config.dev && typeof config.dev !== 'object') {
+      throw new Error('dev 配置格式错误');
+    }
+
+    if (config.build && typeof config.build !== 'object') {
+      throw new Error('build 配置格式错误');
+    }
+
+    if (config.webpack && typeof config.webpack !== 'object') {
+      throw new Error('webpack 配置格式错误');
+    }
+
+    // 验证端口号
+    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 之间的数字');
+      }
+    }
+
+    // 验证路径
+    if (config.build && config.build.assetsRoot) {
+      const assetsRoot = config.build.assetsRoot;
+      if (typeof assetsRoot !== 'string') {
+        throw new Error('build.assetsRoot 必须是字符串类型的路径');
+      }
+    }
+  }
+
+  /**
+   * 打印配置摘要
+   * @private
+   */
+  printConfigSummary() {
+    console.log(chalk.cyan('\n📋 配置摘要:'));
+
+    const config = this.mergedConfig;
+
+    if (config.dev) {
+      console.log(chalk.gray('   开发环境:'));
+      console.log(chalk.gray(`     - 端口: ${config.dev.port}`));
+      console.log(chalk.gray(`     - 自动打开浏览器: ${config.dev.autoOpenBrowser}`));
+      console.log(
+        chalk.gray(`     - 代理配置: ${Object.keys(config.dev.proxyTable || {}).length} 个`)
+      );
+    }
+
+    if (config.build) {
+      console.log(chalk.gray('   生产构建:'));
+      console.log(chalk.gray(`     - 输出目录: ${config.build.assetsRoot}`));
+      console.log(chalk.gray(`     - SourceMap: ${config.build.productionSourceMap}`));
+      console.log(chalk.gray(`     - Gzip 压缩: ${config.build.productionGzip}`));
+    }
+
+    if (config.webpack && config.webpack.resolve) {
+      console.log(chalk.gray('   Webpack 配置:'));
+      console.log(chalk.gray(`     - 解析扩展名: ${config.webpack.resolve.extensions.length} 个`));
+      console.log(
+        chalk.gray(`     - 别名配置: ${Object.keys(config.webpack.resolve.alias || {}).length} 个`)
+      );
+    }
+
+    if (config.settings) {
+      console.log(chalk.gray('   代码检查:'));
+      console.log(chalk.gray(`     - ESLint: ${config.settings.enableESLint}`));
+      console.log(chalk.gray(`     - StyleLint: ${config.settings.enableStyleLint}`));
+    }
+
+    console.log('');
+  }
+
+  /**
+   * 重置配置管理器
+   */
+  reset() {
+    this.userConfig = null;
+    this.mergedConfig = null;
+    this.configPath = null;
+  }
+
+  /**
+   * 获取默认配置
+   * @returns {Object}
+   */
+  getDefaultConfig() {
+    return this.defaultConfig;
+  }
+
+  /**
+   * 获取用户配置
+   * @returns {Object|null}
+   */
+  getUserConfig() {
+    return this.userConfig;
+  }
+
+  /**
+   * 导出配置到文件（用于调试）
+   * @param {string} outputPath - 输出路径
+   */
+  exportConfig(outputPath) {
+    if (!this.mergedConfig) {
+      this.mergeConfig();
+    }
+
+    const fs = require('fs');
+    const output = JSON.stringify(this.mergedConfig, null, 2);
+
+    try {
+      fs.writeFileSync(outputPath, output, 'utf-8');
+      console.log(chalk.green(`✓ 配置已导出到: ${outputPath}`));
+    } catch (error) {
+      console.error(chalk.red(`❌ 配置导出失败: ${error.message}`));
+    }
+  }
+}
+
+// 导出单例实例
+const configManager = new ConfigManager();
+
+// 也导出类，方便测试
+configManager.ConfigManager = ConfigManager;
+
+module.exports = configManager;