@htyf-mp/cli 0.2.0-alpha.5 → 0.2.0-alpha.7

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.2.0-alpha.5",
+  "version": "0.2.0-alpha.7",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
-  "bin": "src/index.mjs",
+  "bin": {
+    "htyf": "src/index.mjs",
+    "htyf-mp": "src/index.mjs"
+  },
   "files": [
     "src",
     "README.md"
@@ -40,6 +43,8 @@
     "@callstack/repack-plugin-reanimated": "^5.1.3",
     "@inquirer/prompts": "^7.8.0",
     "@inquirer/select": "^4.3.1",
+    "@module-federation/dts-plugin": "^0.21.6",
+    "@module-federation/enhanced": "^0.21.6",
     "adm-zip": "0.5.10",
     "boxen": "^8.0.1",
     "chalk": "^5.4.1",
@@ -47,6 +52,7 @@
     "fs-extra": "^11.3.0",
     "gradient-string": "^3.0.0",
     "inquirer": "^12.9.0",
+    "loader-utils": "^3.3.1",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "ora": "^8.2.0",
@@ -58,6 +64,7 @@
     "superstatic": "^9.2.0",
     "systeminformation": "^5.27.7",
     "terser-webpack-plugin": "^5.3.14",
+    "typescript": "^5.9.3",
     "uuid": "^9.0.1",
     "webpack": "^5.101.0",
     "webpack-cli": "^6.0.1"

package/src/HtyfImportsPlugin.mjs

@@ -1,12 +1,44 @@
-import path from 'path';
+import path from 'node:path';
 import fse from 'fs-extra';
-import { fileURLToPath } from 'url';
+import { fileURLToPath } from 'node:url';
+import { getOptions } from 'loader-utils';
 
+// ==================== 常量定义 ====================
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const sharedPkg = fse.readJSONSync(path.join(__dirname, '../shared-output.json'));
+const nodeModulesPath = path.join(__dirname, '../node_modules');
+
+// 预编译正则表达式以提高性能
+const PNPM_PACKAGE_REGEX = /node_modules\/(?:\.pnpm\/[^/]+\/node_modules\/)?((?:@[^/]+\/)?[^/]+)/;
+const DEFAULT_EXPORT_REGEX = /var\s+_default\s*=\s*exports(?:\.default|\["default"\])\s*=/g;
+const DEPENDENCY_PLACEHOLDER_REGEX = /__HTYF_DEPENDENCY__/g;
+const LEADING_WHITESPACE_REGEX = /^[ \t]+/gm;
 
 // 白名单：这些包即使有 native 代码也不需要检查（系统级或已特殊处理）
-const WHITELIST = [];
+const WHITELIST = new Set();
+
+// 错误消息分隔线
+const ERROR_SEPARATOR = '═══════════════════════════════════════';
+
+// ==================== 缓存和配置 ====================
+const versionCache = new Map();
+const nativeCodeCache = new Map();
+
+// 延迟加载共享配置，避免启动时错误
+let sharedPkg = null;
+function getSharedConfig() {
+  if (sharedPkg === null) {
+    try {
+      const configPath = path.join(__dirname, './shared-output.json');
+      sharedPkg = fse.pathExistsSync(configPath) ? fse.readJSONSync(configPath) : {};
+    } catch (error) {
+      console.warn(`[HtyfModulesPlugin] 读取共享配置失败: ${error.message}`);
+      sharedPkg = {};
+    }
+  }
+  return sharedPkg;
+}
+
+// ==================== 工具函数 ====================
 
 /**
  * 从模块路径中提取包名
@@ -14,41 +46,68 @@ const WHITELIST = [];
  * @returns {string|null} 包名，如果无法提取则返回 null
  */
 function extractPackageName(moduleContext) {
-  if (!moduleContext || !moduleContext.includes('node_modules')) {
+  if (!moduleContext?.includes('node_modules')) {
     return null;
   }
 
-  const parts = moduleContext.split('node_modules/');
-  if (parts.length < 2) {
-    return null;
-  }
+  const match = moduleContext.match(PNPM_PACKAGE_REGEX);
+  return match?.[1] || null;
+}
 
-  const packagePath = parts[1];
-  const segments = packagePath.split('/').filter(Boolean);
-  
-  if (segments.length === 0) {
-    return null;
+/**
+ * 检查包是否包含 native 代码（带缓存）
+ * @param {string} packageName - 包名
+ * @returns {boolean} 是否包含 native 代码
+ */
+function hasNativeCode(packageName) {
+  if (!packageName) {
+    return false;
   }
 
-  // 处理 scoped packages (@scope/package)
-  if (segments[0].startsWith('@') && segments.length >= 2) {
-    return `${segments[0]}/${segments[1]}`;
+  // 使用缓存避免重复的文件系统访问
+  if (nativeCodeCache.has(packageName)) {
+    return nativeCodeCache.get(packageName);
   }
 
-  return segments[0];
+  const packagePath = path.join(nodeModulesPath, packageName);
+  const iosPath = path.join(packagePath, 'ios');
+  const androidPath = path.join(packagePath, 'android');
+  
+  const hasNative = fse.pathExistsSync(iosPath) || fse.pathExistsSync(androidPath);
+  nativeCodeCache.set(packageName, hasNative);
+  
+  return hasNative;
 }
 
 /**
- * 检查包是否包含 native 代码
+ * 获取包版本（带缓存）
  * @param {string} packageName - 包名
- * @returns {boolean} 是否包含 native 代码
+ * @returns {string|null} 包版本，如果无法获取则返回 null
  */
-function hasNativeCode(packageName) {
-  const nodeModulesPath = path.join(__dirname, '../node_modules');
-  const iosPath = path.join(nodeModulesPath, packageName, 'ios');
-  const androidPath = path.join(nodeModulesPath, packageName, 'android');
-  
-  return fse.pathExistsSync(iosPath) || fse.pathExistsSync(androidPath);
+function getPackageVersion(packageName) {
+  if (!packageName) {
+    return null;
+  }
+
+  if (versionCache.has(packageName)) {
+    return versionCache.get(packageName);
+  }
+
+  const pkgJsonPath = path.join(nodeModulesPath, packageName, 'package.json');
+  let version = null;
+
+  try {
+    if (fse.pathExistsSync(pkgJsonPath)) {
+      const pkgJson = fse.readJsonSync(pkgJsonPath);
+      version = pkgJson.version || null;
+    }
+  } catch (error) {
+    // 静默失败，返回 null
+    version = null;
+  }
+
+  versionCache.set(packageName, version);
+  return version;
 }
 
 /**
@@ -57,7 +116,8 @@ function hasNativeCode(packageName) {
  * @returns {boolean} 是否在共享配置中
  */
 function isInSharedConfig(packageName) {
-  return sharedPkg && sharedPkg.hasOwnProperty(packageName);
+  const config = getSharedConfig();
+  return packageName && Object.hasOwn(config, packageName);
 }
 
 /**
@@ -66,7 +126,7 @@ function isInSharedConfig(packageName) {
  * @returns {boolean} 是否在白名单中
  */
 function isWhitelisted(packageName) {
-  return WHITELIST.includes(packageName);
+  return packageName && WHITELIST.has(packageName);
 }
 
 /**
@@ -75,28 +135,66 @@ function isWhitelisted(packageName) {
  * @returns {string} 格式化的错误消息
  */
 function formatErrorMessage(unsupportedPackages) {
+  if (!unsupportedPackages?.length) {
+    return '';
+  }
+
   const lines = [
     '',
-    '═══════════════════════════════════════',
+    ERROR_SEPARATOR,
     '  红糖云服暂不支持以下第三方 native 组件',
-    '═══════════════════════════════════════',
+    ERROR_SEPARATOR,
+    '',
+    ...unsupportedPackages.map((pkg, index) => `  ${index + 1}. ${pkg}`),
+    '',
+    ERROR_SEPARATOR,
     '',
   ];
 
-  unsupportedPackages.forEach((pkg, index) => {
-    lines.push(`  ${index + 1}. ${pkg}`);
-  });
-
-  lines.push('');
-  lines.push('═══════════════════════════════════════');
-  lines.push('');
-
   return lines.join('\n');
 }
 
+/**
+ * 去除模板字符串中的前导空白
+ * @param {TemplateStringsArray} strings - 模板字符串数组
+ * @param {...any} values - 插值变量
+ * @returns {string} 处理后的字符串
+ */
 function trimTemplateStrings(strings, ...values) {
-  let fullString = strings.reduce((acc, str, i) => acc + str + (values[i] || ''), '');
-  return fullString.replace(/^[ \t]+/gm, '');
+  const fullString = strings.reduce((acc, str, i) => acc + str + (values[i] || ''), '');
+  return fullString.replace(LEADING_WHITESPACE_REGEX, '');
+}
+
+// ==================== Webpack Loader ====================
+
+/**
+ * Webpack自定义loader，用于在目标模块的源码前后插入额外的代码片段。
+ * 可通过options.prependCode / options.appendCode分别指定插入内容。
+ *
+ * @param {string|Buffer} source 原始模块内容
+ * @returns {string} 处理后的模块内容
+ */
+export default function injectAppInfoLoader(source) {
+  this.cacheable?.();
+  
+  // 将 Buffer 转换为字符串
+  const originalSource = Buffer.isBuffer(source) ? source.toString('utf-8') : source;
+  
+  // 注入依赖信息属性
+  return `
+    ${originalSource}
+    try {
+      Object.defineProperty(_default, '__HTYF_MP_DEPENDENCY__', {
+        value: JSON.parse(__HTYF_DEPENDENCY_STRING_DATA__),
+        writable: false,
+        enumerable: false,
+        configurable: false
+      });
+      _default = exports.default = _default;
+    } catch (error) {
+      console.error(error);
+    }
+  `;
 }
 
 export class HtyfModulesPlugin {
@@ -104,42 +202,31 @@ export class HtyfModulesPlugin {
     this.config = appConfig;
   }
 
+  /**
+   * 应用插件到 Webpack 编译器
+   * @param {Compiler} compiler - Webpack 编译器实例
+   */
   apply(compiler) {
     const config = this.config;
 
-    // 分析第三方 native 模块
+    // 分析第三方依赖并生成报告
     compiler.hooks.emit.tapAsync('AnalyzeThirdPartyModulesPlugin', (compilation, callback) => {
       try {
-        const nativeModules = new Set();
+        const { dependencies, nativeModules } = this.collectDependencyInfo(compilation);
 
-        // 收集所有包含 native 代码的第三方模块
-        compilation.modules.forEach(module => {
-          if (!module.context) {
-            return;
-          }
+        // 获取 manifest 路径，如果未配置则使用默认路径（webpack output 路径下的 manifest.json）
+        const outputPath = compilation.outputOptions.path || compiler.options.output?.path;
+        const manifestPath = this.config.manifest || (outputPath ? path.join(outputPath, 'manifest.json') : null);
 
-          const packageName = extractPackageName(module.context);
-          if (!packageName) {
-            return;
-          }
+        // 持久化依赖报告
+        this.persistDependencyReport(dependencies, manifestPath);
 
-          if (hasNativeCode(packageName)) {
-            nativeModules.add(packageName);
-          }
-        });
-
-        // 检查不支持的包
-        const unsupportedPackages = Array.from(nativeModules).filter(pkg => {
-          // 跳过白名单中的包
-          if (isWhitelisted(pkg)) {
-            return false;
-          }
+        // 筛选出不支持的 native 包
+        const unsupportedPackages = Array.from(nativeModules).filter(
+          pkg => !isWhitelisted(pkg) && !isInSharedConfig(pkg)
+        );
 
-          // 如果不在共享配置中，则不支持
-          return !isInSharedConfig(pkg);
-        });
-
-        // 如果有不支持的包，抛出错误
+        // 如果存在不支持的包，抛出错误
         if (unsupportedPackages.length > 0) {
           const errorMessage = formatErrorMessage(unsupportedPackages);
           console.error(errorMessage);
@@ -152,6 +239,8 @@ export class HtyfModulesPlugin {
           return;
         }
 
+        // 替换依赖占位符
+        this.replaceDependencyPlaceholders(compilation, dependencies);
         callback();
       } catch (error) {
         callback(error);
@@ -163,22 +252,22 @@ export class HtyfModulesPlugin {
       compiler.hooks.emit.tapAsync('WrapCodePlugin', (compilation, callback) => {
         try {
           // 遍历所有编译过的资源文件
-          for (const filename in compilation.assets) {
-            if (compilation.assets.hasOwnProperty(filename)) {
-              // 获取文件内容
-              const source = compilation.assets[filename].source();
+          for (const filename of Object.keys(compilation.assets)) {
+            const asset = compilation.assets[filename];
+            if (!asset || typeof asset.source !== 'function') {
+              continue;
+            }
 
-              // 包裹代码
-              const wrappedSource = trimTemplateStrings`
+            const source = asset.source();
+            const wrappedSource = trimTemplateStrings`
               ${source}
-              `;
+            `;
 
-              // 更新文件内容
-              compilation.assets[filename] = {
-                source: () => wrappedSource,
-                size: () => wrappedSource.length,
-              };
-            }
+            // 更新文件内容
+            compilation.assets[filename] = {
+              source: () => wrappedSource,
+              size: () => wrappedSource.length,
+            };
           }
           callback();
         } catch (error) {
@@ -187,4 +276,116 @@ export class HtyfModulesPlugin {
       });
     }
   }
+
+  /**
+   * 收集依赖信息
+   * @param {Compilation} compilation - Webpack 编译对象
+   * @returns {{dependencies: Object, nativeModules: Set<string>}} 依赖信息
+   */
+  collectDependencyInfo(compilation) {
+    const dependencyMap = new Map();
+    const nativeModules = new Set();
+
+    for (const module of compilation.modules) {
+      if (!module.context) {
+        continue;
+      }
+
+      const packageName = extractPackageName(module.context);
+      if (!packageName) {
+        continue;
+      }
+
+      // 如果已经处理过该包，跳过
+      if (dependencyMap.has(packageName)) {
+        const existing = dependencyMap.get(packageName);
+        // 如果之前不是 native 模块，再次检查（可能之前检查失败）
+        if (!existing.nativeModule && hasNativeCode(packageName)) {
+          existing.nativeModule = true;
+          nativeModules.add(packageName);
+        }
+        continue;
+      }
+
+      // 首次处理该包
+      const nativeModule = hasNativeCode(packageName);
+      const dependencyInfo = {
+        name: packageName,
+        version: getPackageVersion(packageName),
+        nativeModule,
+      };
+
+      dependencyMap.set(packageName, dependencyInfo);
+      
+      if (nativeModule) {
+        nativeModules.add(packageName);
+      }
+    }
+
+    // 将 Map 转换为普通对象
+    const dependencies = Object.fromEntries(dependencyMap);
+
+    return {
+      dependencies,
+      nativeModules,
+    };
+  }
+
+  /**
+   * 持久化依赖报告到文件
+   * @param {Object} dependencies - 依赖信息对象
+   * @param {string|null} manifestPath - manifest 文件路径，如果未提供则使用配置中的 manifest
+   */
+  persistDependencyReport(dependencies = {}, manifestPath = null) {
+    const manifest = manifestPath || this.config.manifest;
+    if (!manifest) {
+      return;
+    }
+
+    try {
+      const reportDir = path.dirname(manifest);
+      fse.ensureDirSync(reportDir);
+      fse.writeJsonSync(
+        manifest,
+        { packages: dependencies },
+        { spaces: 2 }
+      );
+    } catch (error) {
+      console.warn(`[HtyfModulesPlugin] 写入依赖报告失败: ${error.message}`);
+    }
+  }
+
+  /**
+   * 替换依赖占位符
+   * @param {Compilation} compilation - Webpack 编译对象
+   * @param {Object} dependencies - 依赖信息对象
+   */
+  replaceDependencyPlaceholders(compilation, dependencies = {}) {
+    // 将依赖信息序列化为 JSON 字符串，并进行安全的字符串转义
+    const jsonString = JSON.stringify(dependencies);
+    // 转义反斜杠和单引号，用于嵌入到单引号字符串中
+    const escapedString = jsonString
+      .replace(/\\/g, '\\\\')  // 转义反斜杠
+      .replace(/'/g, "\\'");   // 转义单引号
+    const stringLiteral = `'${escapedString}'`;
+
+    // 遍历所有资源文件，替换占位符
+    for (const filename of Object.keys(compilation.assets)) {
+      const asset = compilation.assets[filename];
+      if (!asset || typeof asset.source !== 'function') {
+        continue;
+      }
+
+      const source = asset.source().toString();
+      if (!source.includes('__HTYF_DEPENDENCY_STRING_DATA__')) {
+        continue;
+      }
+
+      const replacedSource = source.replace(DEPENDENCY_PLACEHOLDER_REGEX, stringLiteral);
+      compilation.assets[filename] = {
+        source: () => replacedSource,
+        size: () => replacedSource.length,
+      };
+    }
+  }
 }

package/src/build.mjs

@@ -119,6 +119,7 @@ export async function mpBuildShell(newAppInfo) {
     },
     outputPath: path.join(mpOutputPath, './build'),
     extraChunksPath: outputPath,
+    manifest: path.join(mpOutputPath, './build'),
   };
 
   const appJsonPath = path.join(mpOutputPath, 'app.json');

package/src/webpack.config.mjs

@@ -156,7 +156,10 @@ export default (env = {}) => {
         shareStrategy: 'loaded-first',
       }),
       new HtyfModulesPlugin({
-        codeSigning: true
+        codeSigning: true,
+        appid: mpOptions.appid,
+        version: mpOptions.version,
+        manifest: mpOptions.manifest,
       }),
       new webpack.optimize.LimitChunkCountPlugin({
         maxChunks: 2, // 限制最大chunk数，便于远程加载