@htyf-mp/cli 0.7.6 → 0.7.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htyf-mp/cli",
-  "version": "0.7.6",
+  "version": "0.7.10",
   "description": "红糖云服app小程序模板-cli",
   "type": "module",
   "bin": {
@@ -38,8 +38,8 @@
     "pnpm": ">=9.0.0"
   },
   "peerDependencies": {
-    "react-native-reanimated": "4.6.0",
-    "react-native-worklets": "0.12.1"
+    "react-native-reanimated": "4.7.1",
+    "react-native-worklets": "0.13.0"
   },
   "dependencies": {
     "@babel/core": "7.29.0",
@@ -67,13 +67,13 @@
     "ora": "9.3.0",
     "portfinder": "1.0.38",
     "qrcode": "1.5.4",
-    "react-native-reanimated": "4.6.0",
-    "react-native-worklets": "0.12.1",
+    "react-native-reanimated": "4.7.1",
+    "react-native-worklets": "0.13.0",
     "shelljs": "0.10.0",
     "superstatic": "10.0.0",
     "systeminformation": "5.31.5",
     "terser-webpack-plugin": "5.4.0",
-    "typescript": "6.0.2",
+    "typescript": "5.7.3",
     "uuid": "9.0.1",
     "webpack": "5.105.4",
     "webpack-cli": "7.0.2"
@@ -82,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "81db7fd72da4f8f6c032af45be21698ed9ccb41b"
+  "gitHead": "0067e6e3177368dd7d4bd4dd4552f164e4ee20fa"
 }

package/src/build.mjs

@@ -281,6 +281,8 @@ export async function mpBuildShell(newAppInfo, isGodot = false, buildOptions = {
     outputPath: path.join(mpOutputPath, 'build'),  // webpack 构建输出目录
     extraChunksPath: outputPath,
     manifest: path.join(mpOutputPath, 'manifest.json'),
+    appid,
+    version,
   };
   Logger.info('mpOptions', mpOptions);
 

package/src/shared-output.json

@@ -1,14 +1,15 @@
 {
   "@boterop/react-native-background-timer": "2.6.0",
-  "@callstack/repack": "5.3.0",
+  "@callstack/repack": "5.4.0",
   "@d11/react-native-fast-image": "8.13.0",
   "@dr.pogodin/react-native-fs": "2.40.3",
-  "@expo/log-box": "57.0.4",
+  "@expo/dom-webview": "58.0.2",
+  "@expo/log-box": "58.0.13",
   "@htyf-mp/airhop-transport": "0.2.1",
   "@htyf-mp/react-native-godot": "1.0.5",
-  "@kesha-antonov/react-native-background-downloader": "4.6.2",
-  "@lodev09/react-native-true-sheet": "3.11.14",
-  "@react-native-async-storage/async-storage": "3.1.1",
+  "@kesha-antonov/react-native-background-downloader": "4.6.3",
+  "@lodev09/react-native-true-sheet": "3.11.18",
+  "@react-native-async-storage/async-storage": "2.2.0",
   "@react-native-camera-roll/camera-roll": "7.10.2",
   "@react-native-clipboard/clipboard": "1.16.3",
   "@react-native-community/blur": "4.4.1",
@@ -22,104 +23,104 @@
   "@react-native-picker/picker": "2.11.4",
   "@react-native-segmented-control/segmented-control": "2.5.7",
   "@sayem314/react-native-keep-awake": "2.0.0",
-  "@shopify/react-native-skia": "2.11.2",
-  "expo": "57.0.22",
-  "expo-asset": "57.0.17",
-  "expo-audio": "57.0.5",
-  "expo-brightness": "57.0.2",
-  "expo-camera": "57.0.4",
-  "expo-clipboard": "57.0.2",
-  "expo-constants": "57.0.18",
-  "expo-crypto": "57.0.3",
-  "expo-document-picker": "57.0.2",
-  "expo-file-system": "57.0.7",
-  "expo-font": "57.0.4",
-  "expo-image-manipulator": "57.0.17",
-  "expo-image-picker": "57.0.17",
-  "expo-keep-awake": "57.0.2",
-  "expo-linear-gradient": "57.0.2",
-  "expo-linking": "57.0.10",
-  "expo-location": "57.0.17",
-  "expo-modules-core": "57.0.18",
-  "expo-router": "57.0.21",
-  "expo-sensors": "57.0.3",
-  "expo-system-ui": "57.0.4",
-  "expo-video": "57.0.4",
+  "@shopify/react-native-skia": "2.14.0",
+  "expo": "58.0.21",
+  "expo-asset": "58.0.19",
+  "expo-audio": "58.0.10",
+  "expo-brightness": "58.0.2",
+  "expo-camera": "58.0.14",
+  "expo-clipboard": "58.0.4",
+  "expo-constants": "58.0.14",
+  "expo-crypto": "58.0.7",
+  "expo-document-picker": "58.0.4",
+  "expo-file-system": "58.0.13",
+  "expo-font": "58.0.11",
+  "expo-image-manipulator": "58.0.16",
+  "expo-image-picker": "58.0.10",
+  "expo-keep-awake": "58.0.3",
+  "expo-linear-gradient": "58.0.3",
+  "expo-linking": "58.0.15",
+  "expo-location": "58.0.20",
+  "expo-modules-core": "58.0.28",
+  "expo-router": "58.0.28",
+  "expo-sensors": "58.0.4",
+  "expo-system-ui": "58.0.7",
+  "expo-video": "58.0.13",
   "jcore-react-native": "2.3.7",
   "jpush-react-native": "3.2.8",
   "llama.rn": "0.12.9",
   "lottie-react-native": "7.5.0",
   "react-airplay": "2.0.2",
-  "react-native-audio-api": "0.13.3",
-  "react-native-avoid-softinput": "9.0.0",
+  "react-native-audio-api": "0.13.6",
+  "react-native-avoid-softinput": "9.0.1",
   "react-native-background-actions": "4.1.0",
-  "react-native-ble-manager": "12.5.2",
-  "react-native-blob-util": "0.24.11",
+  "react-native-ble-manager": "12.5.3",
+  "react-native-blob-util": "0.25.1",
   "react-native-camera-kit": "18.0.1",
   "react-native-config": "1.7.2",
   "react-native-device-info": "15.0.2",
-  "react-native-edge-to-edge": "1.8.1",
+  "react-native-edge-to-edge": "1.8.2",
   "react-native-enriched-html": "1.1.1",
-  "react-native-enriched-markdown": "1.0.2",
-  "react-native-file-access": "4.0.3",
-  "react-native-gesture-handler": "3.2.1",
+  "react-native-enriched-markdown": "1.1.0",
+  "react-native-file-access": "4.0.4",
+  "react-native-gesture-handler": "3.3.0",
   "react-native-get-random-values": "2.0.0",
   "react-native-global-exception-handler": "1.0.2",
-  "react-native-google-mobile-ads": "16.5.0",
-  "react-native-iap": "16.6.0",
+  "react-native-google-mobile-ads": "17.2.0",
+  "react-native-iap": "16.7.2",
   "react-native-image-code-scanner": "1.2.0",
   "react-native-image-colors": "2.6.0",
   "react-native-image-picker": "8.2.1",
-  "react-native-keyboard-controller": "1.22.5",
+  "react-native-keyboard-controller": "1.22.7",
   "react-native-linear-gradient": "2.8.3",
-  "react-native-localize": "3.7.0",
-  "react-native-maps": "1.29.0",
-  "react-native-media-toolkit": "2.3.6",
+  "react-native-localize": "3.7.2",
+  "react-native-maps": "1.29.11",
+  "react-native-media-toolkit": "2.3.7",
   "react-native-mmkv": "4.3.2",
   "react-native-nitro-bg-timer-plus": "0.3.3",
-  "react-native-nitro-buffer": "0.2.2",
+  "react-native-nitro-buffer": "0.3.0",
   "react-native-nitro-cookies": "1.2.1",
-  "react-native-nitro-fetch": "1.7.0",
+  "react-native-nitro-fetch": "1.8.0",
   "react-native-nitro-geolocation": "2.0.2",
   "react-native-nitro-haptics": "0.2.3",
-  "react-native-nitro-http-server": "1.9.2",
-  "react-native-nitro-markdown": "0.12.4",
+  "react-native-nitro-http-server": "1.10.0",
+  "react-native-nitro-markdown": "0.14.0",
   "react-native-nitro-modules": "0.37.1",
   "react-native-nitro-player": "1.6.1",
   "react-native-nitro-rtmp-publisher": "0.15.0",
   "react-native-nitro-sound": "0.2.20",
-  "react-native-nitro-sqlite": "9.7.0",
+  "react-native-nitro-sqlite": "10.1.0",
   "react-native-nitro-sse": "3.0.0",
   "react-native-nitro-text-decoder": "0.2.0",
   "react-native-nitro-unzip": "0.6.0",
   "react-native-nitro-websockets": "1.3.1",
   "react-native-orientation-locker": "1.7.0",
-  "react-native-pager-view": "9.0.4",
-  "react-native-permissions": "5.6.1",
+  "react-native-pager-view": "9.0.7",
+  "react-native-permissions": "5.6.2",
   "react-native-qr-kit": "1.1.6",
   "react-native-quick-base64": "3.0.1",
   "react-native-quick-crypto": "1.1.7",
   "react-native-quickjs-sandbox": "1.0.1",
-  "react-native-reanimated": "4.6.0",
+  "react-native-reanimated": "4.7.1",
   "react-native-restart": "0.0.29",
-  "react-native-safe-area-context": "5.9.1",
-  "react-native-screens": "4.27.0",
+  "react-native-safe-area-context": "5.10.1",
+  "react-native-screens": "4.30.0",
   "react-native-share": "12.3.1",
   "react-native-sherpa-onnx": "0.4.4",
   "react-native-splash-view": "0.0.22",
-  "react-native-svg": "15.15.5",
+  "react-native-svg": "15.16.0",
   "react-native-teleport": "1.2.2",
   "react-native-track-player": "5.0.0-alpha0-nightly-359af5a12d712d3b685530aed9b9625865a25d74",
   "react-native-vector-icons": "10.3.0",
-  "react-native-video": "6.19.2",
-  "react-native-view-shot": "5.1.1",
+  "react-native-video": "6.19.3",
+  "react-native-view-shot": "6.1.1",
   "react-native-vlc-media-player": "1.0.98",
   "react-native-volume-manager": "2.2.0",
-  "react-native-webgpu": "0.10.0",
+  "react-native-webgpu": "0.10.5",
   "react-native-webrtc": "124.0.8",
   "react-native-webview": "14.0.1",
   "react-native-wifi-reborn": "4.13.6",
-  "react-native-worklets": "0.12.2",
+  "react-native-worklets": "0.13.0",
   "react-native-worklets-core": "1.6.3",
-  "react-native": "0.86.3"
+  "react-native": "0.88.1"
 }

package/src/sync-deps.mjs

@@ -28,6 +28,12 @@ function normalizeVersion(version) {
   return String(version || '').replace(/^[~^>=<]+/, '');
 }
 
+const SKIP_VERSION_PREFIXES = ['workspace:', 'file:', 'link:', 'npm:', 'catalog:'];
+
+function shouldSkipVersion(version) {
+  return SKIP_VERSION_PREFIXES.some(prefix => String(version).startsWith(prefix));
+}
+
 /**
  * 收集 package.json 中与 shared-output.json 匹配的待同步项
  * @param {Record<string, string>} packageJson
@@ -48,6 +54,10 @@ function collectSyncChanges(packageJson, sharedVersions) {
         continue;
       }
 
+      if (shouldSkipVersion(version)) {
+        continue;
+      }
+
       const targetVersion = sharedVersions[name];
       if (normalizeVersion(version) !== targetVersion) {
         changes.push({

package/src/webpack.config.mjs

@@ -7,7 +7,7 @@ import TerserPlugin from 'terser-webpack-plugin';
 import * as Repack from '@callstack/repack';
 import { ExpoModulesPlugin } from '@callstack/repack-plugin-expo-modules';
 import { ReanimatedPlugin } from '@callstack/repack-plugin-reanimated';
-import { HtyfModulesPlugin } from '@htyf-mp/cli/HtyfImportsPlugin.mjs';
+import { HtyfModulesPlugin } from './HtyfImportsPlugin.mjs';
 import { getProjectRoot } from './utils.mjs';
 
 // 获取当前文件和目录路径
@@ -30,13 +30,13 @@ const appid = process.env.APP_ID;
 // 构建Module Federation共享依赖对象
 const sharedObj = {};
 for (const key in dependencies) {
-  const p = dependencies[key];
+  const version = dependencies[key];
   sharedObj[key] = {
     /** 是否运行为单例 */
     singleton: true,
     /** host模式下必须为true，微应用为false */
     eager: true,
-    version: p.version,
+    version,
   };
 }
 
@@ -53,7 +53,7 @@ export default (env = {}) => {
   const { entry = appRootIndexPath, platform = 'ios' } = env;
   const context = env.context || __dirname;
   // 获取Repack的resolve配置
-  const _options = Repack.getResolveOptions();
+  const _options = Repack.getResolveOptions(platform);
 
   // 解析微前端相关配置
   let mpOptions = {};
@@ -192,4 +192,4 @@ export default (env = {}) => {
   };
 
   return mpConfig;
-};
+};