@htyf-mp/cli 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": {

package/src/HtyfImportsPlugin.mjs

@@ -40,59 +40,64 @@ function getSharedConfig() {
 // ==================== 工具函数 ====================
 
 /**
- * 从模块路径中提取包名
+ * 从 module.context 中提取包名与真实包根目录
  * @param {string} moduleContext - 模块上下文路径
- * @returns {string|null} 包名，如果无法提取则返回 null
+ * @returns {{ packageName: string, packageRoot: string }|null}
  */
-function extractPackageName(moduleContext) {
+function extractPackageInfo(moduleContext) {
   if (!moduleContext?.includes('node_modules')) {
     return null;
   }
 
   const match = moduleContext.match(PNPM_PACKAGE_REGEX);
-  return match?.[1] || null;
+  if (!match?.[1]) {
+    return null;
+  }
+
+  return {
+    packageName: match[1],
+    packageRoot: moduleContext.slice(0, match.index + match[0].length),
+  };
 }
 
 /**
  * 检查包是否包含 native 代码（带缓存）
- * @param {string} packageName - 包名
+ * @param {string} packageRoot - 包在 node_modules 中的真实根目录
  * @returns {boolean} 是否包含 native 代码
  */
-function hasNativeCode(packageName) {
-  if (!packageName) {
+function hasNativeCode(packageRoot) {
+  if (!packageRoot) {
     return false;
   }
 
-  // 使用缓存避免重复的文件系统访问
-  if (nativeCodeCache.has(packageName)) {
-    return nativeCodeCache.get(packageName);
+  if (nativeCodeCache.has(packageRoot)) {
+    return nativeCodeCache.get(packageRoot);
   }
 
-  const packagePath = path.join(nodeModulesPath, packageName);
-  const iosPath = path.join(packagePath, 'ios');
-  const androidPath = path.join(packagePath, 'android');
-  
+  const iosPath = path.join(packageRoot, 'ios');
+  const androidPath = path.join(packageRoot, 'android');
+
   const hasNative = fse.pathExistsSync(iosPath) || fse.pathExistsSync(androidPath);
-  nativeCodeCache.set(packageName, hasNative);
-  
+  nativeCodeCache.set(packageRoot, hasNative);
+
   return hasNative;
 }
 
 /**
  * 获取包版本（带缓存）
- * @param {string} packageName - 包名
+ * @param {string} packageRoot - 包在 node_modules 中的真实根目录
  * @returns {string|null} 包版本，如果无法获取则返回 null
  */
-function getPackageVersion(packageName) {
-  if (!packageName) {
+function getPackageVersion(packageRoot) {
+  if (!packageRoot) {
     return null;
   }
 
-  if (versionCache.has(packageName)) {
-    return versionCache.get(packageName);
+  if (versionCache.has(packageRoot)) {
+    return versionCache.get(packageRoot);
   }
 
-  const pkgJsonPath = path.join(nodeModulesPath, packageName, 'package.json');
+  const pkgJsonPath = path.join(packageRoot, 'package.json');
   let version = null;
 
   try {
@@ -101,11 +106,10 @@ function getPackageVersion(packageName) {
       version = pkgJson.version || null;
     }
   } catch (error) {
-    // 静默失败，返回 null
     version = null;
   }
 
-  versionCache.set(packageName, version);
+  versionCache.set(packageRoot, version);
   return version;
 }
 
@@ -290,29 +294,31 @@ export class HtyfModulesPlugin {
         continue;
       }
 
-      const packageName = extractPackageName(module.context);
-      if (!packageName) {
+      const packageInfo = extractPackageInfo(module.context);
+      if (!packageInfo) {
         continue;
       }
 
+      const { packageName, packageRoot } = packageInfo;
+
       // 如果已经处理过该包，跳过
       if (dependencyMap.has(packageName)) {
         const existing = dependencyMap.get(packageName);
-        // 如果之前不是 native 模块，再次检查（可能之前检查失败）
-        if (!existing.nativeModule && hasNativeCode(packageName)) {
+        // 如果之前不是 native 模块，基于当前 module 的真实路径再次检查
+        if (!existing.nativeModule && hasNativeCode(packageRoot)) {
           existing.nativeModule = true;
           nativeModules.add(packageName);
         }
         continue;
       }
 
-      // 首次处理该包
+      // 首次处理该包，version / nativeModule 均基于 module.context 解析出的真实路径
       // react-native 必须视为原生依赖，无论是否检测到 ios/android 目录
       const nativeModule =
-        packageName === "react-native" ? true : hasNativeCode(packageName);
+        packageName === "react-native" ? true : hasNativeCode(packageRoot);
       const dependencyInfo = {
         name: packageName,
-        version: getPackageVersion(packageName),
+        version: getPackageVersion(packageRoot),
         nativeModule,
       };
 

package/src/constants.mjs

@@ -39,6 +39,7 @@ export const ACTION_TYPES = {
   INIT: 'init',
   MP_BUILD: 'mp-build',
   MP_DEBUG: 'mp-debug',
+  SYNC_DEPS: 'sync-deps',
   CLEAN: 'clean',
   QUIT: 'quit'
 };

package/src/index.mjs

@@ -33,6 +33,7 @@ import { ProjectInitializer } from './project-initializer.mjs';
 import { mpBuildShell } from './build.mjs';
 import { mpDebugShell } from './debug.mjs';
 import { cleanShell } from './clean.mjs';
+import { syncDepsShell } from './sync-deps.mjs';
 import { incrementVersion, updateAppConfig } from './utils-functions.mjs';
 
 const projectPath = getProjectRoot();
@@ -101,6 +102,7 @@ async function Start(action) {
   const actionNames = {
     [ACTION_TYPES.MP_BUILD]: '小程序构建',
     [ACTION_TYPES.MP_DEBUG]: '小程序调试',
+    [ACTION_TYPES.SYNC_DEPS]: '同步依赖版本',
     [ACTION_TYPES.CLEAN]: '清理模式',
     [ACTION_TYPES.QUIT]: '退出'
   };
@@ -113,6 +115,12 @@ async function Start(action) {
     return;
   }
 
+  // ========== 同步依赖版本 ==========
+  if (action === ACTION_TYPES.SYNC_DEPS) {
+    await syncDepsShell();
+    return;
+  }
+
   // ========== 清理操作 ==========
   if (action === ACTION_TYPES.CLEAN) {
     const { cleanType } = await inquirer.prompt([
@@ -267,6 +275,12 @@ if (process.argv.includes('--debug')) {
 // 记录启动日志
 Logger.writeToFile('CLI 工具启动', 'INFO');
 
+// 处理依赖同步参数（命令行直接同步，不进入交互界面）
+if (process.argv.includes('--sync-deps')) {
+  await syncDepsShell({ skipConfirm: true });
+  process.exit(0);
+}
+
 // 处理清理参数（命令行直接清理，不进入交互界面）
 if (process.argv.includes('--clean')) {
   const cleanIndex = process.argv.indexOf('--clean');
@@ -297,10 +311,12 @@ if (process.argv.includes('--help') || process.argv.includes('-h')) {
     chalk.gray('  node index.mjs --clean temp      # 清理临时目录') + '\n' +
     chalk.gray('  node index.mjs --clean logs      # 清理日志文件') + '\n' +
     chalk.gray('  node index.mjs --clean cache     # 清理缓存文件') + '\n\n' +
+    chalk.gray('  node index.mjs --sync-deps       # 同步依赖版本') + '\n\n' +
     chalk.white('功能说明:') + '\n' +
     chalk.gray('  🆕 初始化新小程序项目 - 创建新的小程序项目') + '\n' +
     chalk.gray('  🔍 小程序打包 - 构建小程序包') + '\n' +
     chalk.gray('  📦 小程序调试 - 启动真机调试服务') + '\n' +
+    chalk.gray('  🔄 同步依赖版本 - 将 package.json 依赖对齐 shared-output.json') + '\n' +
     chalk.gray('  🧹 清理模式 - 清理临时文件') + '\n',
     {
       padding: 1,
@@ -322,6 +338,7 @@ inquirer
         { name: '🆕 初始化新小程序项目', value: ACTION_TYPES.INIT },
         { name: '🔍 小程序 - 打包小程序', value: ACTION_TYPES.MP_BUILD },
         { name: '📦 小程序 - 真机调试', value: ACTION_TYPES.MP_DEBUG },
+        { name: '🔄 同步依赖版本 - 对齐 shared-output.json', value: ACTION_TYPES.SYNC_DEPS },
         { name: '🧹 清理模式 - 清理临时文件', value: ACTION_TYPES.CLEAN },
         { name: '👋 退出', value: ACTION_TYPES.QUIT },
       ],

package/src/shared-output.json

@@ -1,101 +1,115 @@
 {
-  "@bam.tech/react-native-image-resizer": "3.0.11",
   "@borndotcom/react-native-godot": "1.0.1",
   "@boterop/react-native-background-timer": "2.6.0",
-  "@callstack/repack": "5.2.3",
+  "@callstack/repack": "5.2.5",
   "@d11/react-native-fast-image": "8.13.0",
-  "@dr.pogodin/react-native-fs": "2.36.1",
-  "@dr.pogodin/react-native-static-server": "0.25.3",
-  "@openim/rn-client-sdk": "3.8.3-patch.10.2",
-  "@react-native-async-storage/async-storage": "2.2.0",
+  "@dr.pogodin/react-native-fs": "2.39.1",
+  "@kesha-antonov/react-native-background-downloader": "4.5.6",
+  "@lodev09/react-native-true-sheet": "3.11.1",
+  "@react-native-async-storage/async-storage": "3.1.1",
   "@react-native-camera-roll/camera-roll": "7.10.2",
   "@react-native-clipboard/clipboard": "1.16.3",
   "@react-native-community/blur": "4.4.1",
   "@react-native-community/checkbox": "0.5.20",
-  "@react-native-community/datetimepicker": "8.5.1",
-  "@react-native-community/geolocation": "3.4.0",
-  "@react-native-community/netinfo": "11.4.1",
-  "@react-native-community/slider": "5.1.1",
-  "@react-native-cookies/cookies": "6.2.1",
-  "@react-native-documents/picker": "11.0.3",
+  "@react-native-community/datetimepicker": "9.1.0",
+  "@react-native-community/netinfo": "12.0.1",
+  "@react-native-community/slider": "5.2.0",
+  "@react-native-documents/picker": "12.0.1",
+  "@react-native-documents/viewer": "4.0.0",
   "@react-native-masked-view/masked-view": "0.3.2",
   "@react-native-picker/picker": "2.11.4",
   "@react-native-segmented-control/segmented-control": "2.5.7",
-  "@sayem314/react-native-keep-awake": "1.4.0",
-  "@shopify/react-native-skia": "2.4.7",
-  "expo": "54.0.29",
-  "expo-asset": "12.0.11",
-  "expo-audio": "1.1.0",
-  "expo-brightness": "14.0.8",
-  "expo-camera": "17.0.10",
-  "expo-clipboard": "8.0.8",
-  "expo-constants": "18.0.12",
-  "expo-crypto": "15.0.8",
-  "expo-document-picker": "14.0.8",
-  "expo-font": "14.0.10",
-  "expo-linear-gradient": "15.0.8",
-  "expo-linking": "8.0.10",
-  "expo-modules-autolinking": "3.0.23",
-  "expo-modules-core": "3.0.29",
-  "expo-router": "6.0.19",
-  "expo-system-ui": "6.0.9",
-  "expo-video": "3.0.15",
-  "jcore-react-native": "2.3.2",
-  "jpush-react-native": "3.2.1",
-  "llama.rn": "0.9.3",
-  "lottie-react-native": "7.3.4",
-  "react-airplay": "1.2.0",
-  "react-native-agora": "4.5.3",
-  "react-native-avoid-softinput": "8.0.2",
-  "react-native-background-actions": "4.0.1",
-  "react-native-ble-manager": "12.4.1",
-  "react-native-blob-util": "0.24.5",
-  "react-native-compressor": "1.13.0",
+  "@sayem314/react-native-keep-awake": "2.0.0",
+  "@shopify/react-native-skia": "2.6.8",
+  "expo": "56.0.12",
+  "expo-asset": "56.0.17",
+  "expo-audio": "56.0.12",
+  "expo-brightness": "56.0.5",
+  "expo-camera": "56.0.8",
+  "expo-clipboard": "56.0.4",
+  "expo-constants": "56.0.18",
+  "expo-crypto": "56.0.4",
+  "expo-document-picker": "56.0.4",
+  "expo-file-system": "56.0.8",
+  "expo-font": "56.0.7",
+  "expo-keep-awake": "56.0.3",
+  "expo-linear-gradient": "56.0.4",
+  "expo-linking": "56.0.14",
+  "expo-modules-autolinking": "56.0.16",
+  "expo-modules-core": "56.0.17",
+  "expo-router": "56.2.11",
+  "expo-system-ui": "56.0.5",
+  "expo-video": "56.1.4",
+  "jcore-react-native": "2.3.6",
+  "jpush-react-native": "3.2.7",
+  "llama.rn": "0.12.5",
+  "lottie-react-native": "7.3.8",
+  "react-airplay": "2.0.2",
+  "react-native-agora": "4.6.2",
+  "react-native-avoid-softinput": "9.0.0",
+  "react-native-background-actions": "4.1.0",
+  "react-native-ble-manager": "12.5.0",
+  "react-native-blob-util": "0.24.10",
+  "react-native-camera-kit": "18.0.0",
   "react-native-config": "1.6.1",
-  "react-native-device-info": "15.0.1",
-  "react-native-edge-to-edge": "1.7.0",
-  "react-native-enriched": "0.2.0",
-  "react-native-file-access": "3.2.0",
-  "react-native-gesture-handler": "2.29.1",
+  "react-native-device-info": "15.0.2",
+  "react-native-edge-to-edge": "1.8.1",
+  "react-native-enriched-html": "1.0.0",
+  "react-native-enriched-markdown": "0.6.0",
+  "react-native-file-access": "4.0.3",
+  "react-native-gesture-handler": "3.0.2",
   "react-native-get-random-values": "2.0.0",
-  "react-native-global-exception-handler": "1.0.1",
-  "react-native-google-mobile-ads": "16.0.1",
-  "react-native-haptic-feedback": "2.3.3",
-  "react-native-iap": "14.5.0",
-  "react-native-image-colors": "2.5.1",
+  "react-native-global-exception-handler": "1.0.2",
+  "react-native-google-mobile-ads": "16.4.0",
+  "react-native-iap": "15.3.4",
+  "react-native-image-colors": "2.6.0",
   "react-native-image-picker": "8.2.1",
-  "react-native-keyboard-controller": "1.20.1",
-  "react-native-keychain": "10.0.0",
+  "react-native-keyboard-controller": "1.21.12",
   "react-native-linear-gradient": "2.8.3",
-  "react-native-localize": "3.6.0",
-  "react-native-mmkv": "4.1.0",
-  "react-native-nitro-modules": "0.31.10",
+  "react-native-localize": "3.7.0",
+  "react-native-media-toolkit": "2.3.6",
+  "react-native-mmkv": "4.3.2",
+  "react-native-nitro-bg-timer-plus": "0.3.2",
+  "react-native-nitro-buffer": "0.2.2",
+  "react-native-nitro-cookies": "1.2.0",
+  "react-native-nitro-fetch": "1.4.2",
+  "react-native-nitro-geolocation": "1.4.1",
+  "react-native-nitro-haptics": "0.2.3",
+  "react-native-nitro-http-server": "1.9.2",
+  "react-native-nitro-markdown": "0.8.1",
+  "react-native-nitro-modules": "0.35.10",
+  "react-native-nitro-player": "1.4.3",
+  "react-native-nitro-sound": "0.2.15",
+  "react-native-nitro-sqlite": "9.6.0",
+  "react-native-nitro-sse": "2.3.1",
+  "react-native-nitro-text-decoder": "0.2.0",
+  "react-native-nitro-unzip": "0.5.3",
+  "react-native-nitro-websockets": "1.0.3",
   "react-native-orientation-locker": "1.7.0",
-  "react-native-pager-view": "7.0.2",
-  "react-native-permissions": "5.4.4",
-  "react-native-quick-base64": "2.2.2",
-  "react-native-quick-crypto": "1.0.0",
-  "react-native-reanimated": "4.2.0",
-  "react-native-restart": "0.0.27",
-  "react-native-safe-area-context": "5.6.2",
-  "react-native-screens": "4.18.0",
-  "react-native-share": "12.2.1",
-  "react-native-sound": "0.13.0",
-  "react-native-splash-view": "0.0.19",
-  "react-native-svg": "15.15.1",
+  "react-native-pager-view": "8.0.2",
+  "react-native-permissions": "5.6.0",
+  "react-native-qr-kit": "1.1.6",
+  "react-native-quick-base64": "3.0.0",
+  "react-native-quick-crypto": "1.1.5",
+  "react-native-reanimated": "4.5.0",
+  "react-native-restart": "0.0.28",
+  "react-native-safe-area-context": "5.8.0",
+  "react-native-screens": "4.25.2",
+  "react-native-share": "12.3.1",
+  "react-native-splash-view": "0.0.21",
+  "react-native-svg": "15.15.5",
+  "react-native-teleport": "1.1.9",
   "react-native-track-player": "5.0.0-alpha0-nightly-359af5a12d712d3b685530aed9b9625865a25d74",
   "react-native-vector-icons": "10.3.0",
-  "react-native-video": "6.18.0",
-  "react-native-view-shot": "4.0.3",
-  "react-native-vision-camera": "4.7.3",
+  "react-native-video": "6.19.2",
+  "react-native-view-shot": "5.1.1",
   "react-native-vlc-media-player": "1.0.98",
   "react-native-volume-manager": "2.0.8",
   "react-native-webrtc": "124.0.7",
-  "react-native-webview": "13.16.0",
-  "react-native-wgpu": "0.4.1",
+  "react-native-webview": "14.0.1",
   "react-native-wifi-reborn": "4.13.6",
-  "react-native-worklets": "0.7.1",
-  "react-native-worklets-core": "1.6.2",
-  "react-native-zip-archive": "7.0.2",
-  "react-native": "0.83.0"
+  "react-native-worklets": "0.10.0",
+  "react-native-worklets-core": "1.6.3",
+  "whisper.rn": "0.6.0",
+  "react-native": "0.86.0"
 }

package/src/sync-deps.mjs

@@ -0,0 +1,117 @@
+import path from 'path';
+import fse from 'fs-extra';
+import chalk from 'chalk';
+import { fileURLToPath } from 'node:url';
+import { confirm } from '@inquirer/prompts';
+import { Logger } from './logger.mjs';
+import { getProjectRoot } from './utils.mjs';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const projectPath = getProjectRoot();
+const sharedOutputPath = path.join(__dirname, './shared-output.json');
+
+const DEPENDENCY_SECTIONS = [
+  'dependencies',
+  'devDependencies',
+  'peerDependencies',
+  'optionalDependencies',
+];
+
+/**
+ * 规范化版本号，去除前缀符号以便比较
+ * @param {string} version
+ * @returns {string}
+ */
+function normalizeVersion(version) {
+  return String(version || '').replace(/^[~^>=<]+/, '');
+}
+
+/**
+ * 收集 package.json 中与 shared-output.json 匹配的待同步项
+ * @param {Record<string, string>} packageJson
+ * @param {Record<string, string>} sharedVersions
+ * @returns {Array<{ name: string, section: string, from: string, to: string }>}
+ */
+function collectSyncChanges(packageJson, sharedVersions) {
+  const changes = [];
+
+  for (const section of DEPENDENCY_SECTIONS) {
+    const deps = packageJson[section];
+    if (!deps) {
+      continue;
+    }
+
+    for (const [name, version] of Object.entries(deps)) {
+      if (!Object.hasOwn(sharedVersions, name)) {
+        continue;
+      }
+
+      const targetVersion = sharedVersions[name];
+      if (normalizeVersion(version) !== targetVersion) {
+        changes.push({
+          name,
+          section,
+          from: version,
+          to: targetVersion,
+        });
+      }
+    }
+  }
+
+  return changes;
+}
+
+/**
+ * 将 shared-output.json 中的版本同步到项目根目录 package.json
+ * @param {{ skipConfirm?: boolean }} [options]
+ */
+export async function syncDepsShell(options = {}) {
+  const { skipConfirm = false } = options;
+  const packageJsonPath = path.join(projectPath, 'package.json');
+
+  if (!fse.pathExistsSync(packageJsonPath)) {
+    Logger.error(`未找到 package.json: ${packageJsonPath}`);
+    return;
+  }
+
+  if (!fse.pathExistsSync(sharedOutputPath)) {
+    Logger.error(`未找到 shared-output.json: ${sharedOutputPath}`);
+    return;
+  }
+
+  const sharedVersions = fse.readJsonSync(sharedOutputPath);
+  const packageJson = fse.readJsonSync(packageJsonPath);
+  const changes = collectSyncChanges(packageJson, sharedVersions);
+
+  if (changes.length === 0) {
+    Logger.success('所有相关依赖版本已与 shared-output.json 一致，无需同步');
+    return;
+  }
+
+  Logger.info(`发现 ${changes.length} 个依赖需要同步：`);
+  for (const change of changes) {
+    console.log(
+      `  ${chalk.cyan(change.name)} ` +
+      `[${chalk.gray(change.section)}] ` +
+      `${chalk.yellow(change.from)} -> ${chalk.green(change.to)}`
+    );
+  }
+
+  const confirmed = skipConfirm || await confirm({
+    message: '确认将以上依赖版本同步为 shared-output.json 中的版本？',
+    default: true,
+  });
+
+  if (!confirmed) {
+    Logger.info('已取消同步操作');
+    return;
+  }
+
+  for (const change of changes) {
+    packageJson[change.section][change.name] = change.to;
+  }
+
+  fse.writeJsonSync(packageJsonPath, packageJson, { spaces: 2 });
+  Logger.success(`已同步 ${changes.length} 个依赖版本到 ${packageJsonPath}`);
+  Logger.info('请运行 npm install 或 pnpm install 安装更新后的依赖');
+}