@coze-arch/cli 0.0.1-alpha.d85d9d → 0.0.1-alpha.de5a13

package/lib/__templates__/expo/.cozeproj/scripts/dev_run.sh

@@ -1,7 +1,7 @@
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 PREVIEW_DIR="${COZE_PREVIEW_DIR:-/source/preview}"
 LOG_DIR="${COZE_LOG_DIR:-$ROOT_DIR/logs}"
-LOG_FILE="$LOG_DIR/app.log"
+LOG_CLIENT_FILE="$LOG_DIR/client.log"
 mkdir -p "$LOG_DIR"
 
 # ==================== 配置项 ====================
@@ -89,14 +89,17 @@ ensure_port() {
 pipe_to_log() {
   local source="${1:-CLIENT}"
   local raw_log="${2:-}"
-  local line timestamp ts msg record
+  local line clean_line timestamp
   while IFS= read -r line || [ -n "$line" ]; do
+    clean_line=$(printf '%s' "$line" | sed 's/\x1b\[[0-9;]*[mA-Za-z]//g')
+    if echo "$clean_line" | grep -qE '(^(Web|iOS|Android) node_modules/.*expo-router.*entry\.js.*%|^(Web|iOS|Android) Bundled [0-9]+ms node_modules/.*expo-router.*entry\.js|Logs will appear in the browser)'; then
+      continue
+    fi
     if [ -n "$raw_log" ]; then
-      echo "$line" >> "$raw_log"
+      timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+      echo "[$timestamp] $clean_line" >> "$raw_log"
     fi
-    line=$(echo "[$source] $line" | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\x1b\[[0-9;]*m//g')
-    msg="${line}"
-    echo "$msg"
+    printf '[%s] %s\n' "$source" "$clean_line"
   done
 }
 
@@ -116,10 +119,10 @@ start_expo() {
 
   if [ "$offline" = "1" ]; then
     ( EXPO_OFFLINE=1 EXPO_NO_DEPENDENCY_VALIDATION=1 EXPO_PUBLIC_BACKEND_BASE_URL="$EXPO_PUBLIC_BACKEND_BASE_URL" EXPO_PACKAGER_PROXY_URL="$EXPO_PACKAGER_PROXY_URL" EXPO_PUBLIC_COZE_PROJECT_ID="$EXPO_PUBLIC_COZE_PROJECT_ID" \
-      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$ROOT_DIR/logs/client.log" ) &
+      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$LOG_CLIENT_FILE" ) &
   else
     ( EXPO_NO_DEPENDENCY_VALIDATION=1 EXPO_PUBLIC_BACKEND_BASE_URL="$EXPO_PUBLIC_BACKEND_BASE_URL" EXPO_PACKAGER_PROXY_URL="$EXPO_PACKAGER_PROXY_URL" EXPO_PUBLIC_COZE_PROJECT_ID="$EXPO_PUBLIC_COZE_PROJECT_ID" \
-      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$ROOT_DIR/logs/client.log" ) &
+      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$LOG_CLIENT_FILE" ) &
   fi
   EXPO_PID=$!
   disown $EXPO_PID 2>/dev/null || true
@@ -130,9 +133,9 @@ start_expo() {
 detect_expo_fetch_failed() {
   local timeout="${1:-8}"
   local waited=0
-  local log_file="$ROOT_DIR/logs/client.log"
+  local log_file="$LOG_CLIENT_FILE"
   while [ "$waited" -lt "$timeout" ]; do
-    if [ -f "$log_file" ] && grep -q "TypeError: fetch failed" "$log_file" 2>/dev/null; then
+    if [ -f "$log_file" ] && tail -n 100 "$log_file" 2>/dev/null | grep -q "TypeError: fetch failed"; then
       return 0
     fi
     sleep 1
@@ -166,8 +169,6 @@ check_command "pnpm"
 check_command "lsof"
 check_command "bash"
 
-echo "准备日志目录：$ROOT_DIR/logs"
-mkdir -p "$ROOT_DIR/logs"
 # 端口占用预检查与处理
 ensure_port SERVER_PORT "$SERVER_PORT"
 ensure_port EXPO_PORT "$EXPO_PORT"

package/lib/__templates__/expo/.cozeproj/scripts/server_dev_run.sh

@@ -2,8 +2,8 @@
 
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 SERVER_DIR="$ROOT_DIR/server"
-LOG_DIR="$ROOT_DIR/logs"
-LOG_FILE="$LOG_DIR/server.log"
+LOG_DIR="${COZE_LOG_DIR:-$ROOT_DIR/logs}"
+LOG_SERVER_FILE="$LOG_DIR/server.log"
 SERVER_PORT="${SERVER_PORT:-9091}"
 
 mkdir -p "$LOG_DIR"
@@ -11,13 +11,14 @@ mkdir -p "$LOG_DIR"
 pipe_to_log() {
   local source="${1:-SERVER}"
   local raw_log="${2:-}"
-  local line
+  local line clean_line timestamp
   while IFS= read -r line || [ -n "$line" ]; do
+    clean_line=$(printf '%s' "$line" | sed 's/\x1b\[[0-9;]*[mA-Za-z]//g')
     if [ -n "$raw_log" ]; then
-      echo "$line" >> "$raw_log"
+      timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+      echo "[$timestamp] $clean_line" >> "$raw_log"
     fi
-    line=$(echo "[$source] $line" | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\x1b\[[0-9;]*m//g')
-    echo "$line"
+    printf '[%s] %s\n' "$source" "$clean_line"
   done
 }
 
@@ -36,10 +37,10 @@ kill_old_server() {
 echo "==================== Server Dev Run ===================="
 echo "Server 目录：$SERVER_DIR"
 echo "Server 端口：$SERVER_PORT"
-echo "日志文件：$LOG_FILE"
+echo "日志文件：$LOG_SERVER_FILE"
 
 kill_old_server
 
 echo "启动 server 服务..."
 cd "$SERVER_DIR"
-NODE_ENV=development PORT="$SERVER_PORT" npx tsx ./src/index.ts 2>&1 | pipe_to_log "SERVER" "$LOG_FILE"
+NODE_ENV=development PORT="$SERVER_PORT" npx tsx ./src/index.ts 2>&1 | pipe_to_log "SERVER" "$LOG_SERVER_FILE"

package/lib/__templates__/expo/client/package.json

@@ -15,38 +15,38 @@
     "preset": "jest-expo"
   },
   "dependencies": {
-    "@expo/metro-runtime": "^6.1.2",
-    "@expo/vector-icons": "^15.0.0",
-    "@react-native-async-storage/async-storage": "^2.2.0",
-    "@react-native-community/datetimepicker": "^8.5.0",
-    "@react-native-community/slider": "^5.0.1",
-    "@react-native-masked-view/masked-view": "^0.3.2",
-    "@react-native-picker/picker": "^2.11.0",
+    "@expo/metro-runtime": "~6.1.2",
+    "@expo/vector-icons": "^15.0.3",
+    "@react-native-async-storage/async-storage": "2.2.0",
+    "@react-native-community/datetimepicker": "8.4.4",
+    "@react-native-community/slider": "5.0.1",
+    "@react-native-masked-view/masked-view": "0.3.2",
+    "@react-native-picker/picker": "2.11.1",
     "@react-navigation/bottom-tabs": "^7.2.0",
     "@react-navigation/native": "^7.0.14",
     "dayjs": "^1.11.19",
-    "expo": "54.0.32",
-    "expo-auth-session": "^7.0.9",
-    "expo-av": "~16.0.6",
-    "expo-blur": "~15.0.6",
+    "expo": "54.0.33",
+    "expo-auth-session": "~7.0.10",
+    "expo-av": "~16.0.8",
+    "expo-blur": "~15.0.8",
     "expo-camera": "~17.0.10",
-    "expo-constants": "~18.0.8",
-    "expo-crypto": "^15.0.7",
+    "expo-constants": "~18.0.13",
+    "expo-crypto": "~15.0.8",
     "expo-file-system": "~19.0.21",
-    "expo-font": "~14.0.7",
-    "expo-haptics": "~15.0.6",
-    "expo-image-picker": "~17.0.7",
-    "expo-linear-gradient": "~15.0.6",
-    "expo-linking": "~8.0.7",
-    "expo-location": "~19.0.7",
-    "expo-image": "^3.0.11",
-    "js-base64": "^3.7.7",
-    "expo-router": "~6.0.0",
-    "expo-splash-screen": "~31.0.8",
-    "expo-status-bar": "~3.0.7",
-    "expo-symbols": "~1.0.6",
+    "expo-font": "~14.0.11",
+    "expo-haptics": "~15.0.8",
+    "expo-image": "~3.0.11",
+    "expo-image-picker": "~17.0.10",
+    "expo-linear-gradient": "~15.0.8",
+    "expo-linking": "~8.0.11",
+    "expo-location": "~19.0.8",
+    "expo-router": "~6.0.23",
+    "expo-splash-screen": "~31.0.13",
+    "expo-status-bar": "~3.0.9",
+    "expo-symbols": "~1.0.8",
     "expo-system-ui": "~6.0.9",
     "expo-web-browser": "~15.0.10",
+    "js-base64": "^3.7.7",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-native": "0.81.5",
@@ -54,25 +54,26 @@
     "react-native-gesture-handler": "~2.28.0",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-modal-datetime-picker": "18.0.0",
-    "react-native-reanimated": "~4.1.0",
+    "react-native-reanimated": "~4.1.1",
     "react-native-safe-area-context": "~5.6.0",
     "react-native-screens": "~4.16.0",
-    "react-native-svg": "15.15.0",
+    "react-native-svg": "15.12.1",
     "react-native-toast-message": "^2.3.3",
-    "react-native-web": "^0.21.2",
-    "react-native-webview": "~13.15.0",
+    "react-native-web": "~0.21.0",
+    "react-native-webview": "13.15.0",
     "react-native-worklets": "0.5.1",
     "zod": "^4.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
-    "babel-plugin-module-resolver": "^5.0.2",
-    "babel-preset-expo": "^54.0.9",
     "@eslint/js": "^9.27.0",
     "@types/jest": "^29.5.12",
     "@types/react": "~19.1.0",
     "@types/react-test-renderer": "19.1.0",
+    "babel-plugin-module-resolver": "^5.0.2",
+    "babel-preset-expo": "^54.0.9",
     "chalk": "^4.1.2",
+    "connect": "^3.7.0",
     "depcheck": "^1.4.7",
     "esbuild": "0.27.2",
     "eslint": "^9.39.2",
@@ -83,13 +84,12 @@
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-regexp": "^2.10.0",
     "globals": "^16.1.0",
+    "http-proxy-middleware": "^3.0.5",
     "jest": "^29.2.1",
-    "jest-expo": "~54.0.10",
+    "jest-expo": "~54.0.17",
     "react-test-renderer": "19.1.0",
     "tsx": "^4.21.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1",
-    "connect": "^3.7.0",
-    "http-proxy-middleware": "^3.0.5"
+    "typescript-eslint": "^8.32.1"
   }
 }

package/lib/__templates__/expo/client/screens/demo/index.tsx

@@ -15,10 +15,10 @@ export default function DemoPage() {
       >
         <Image
           style={styles.logo}
-          source="https://lf-coze-web-cdn.coze.cn/obj/eden-cn/lm-lgvj/ljhwZthlaukjlkulzlp/coze-coding/expo/coze-loading.gif"
+          source="https://lf-coze-web-cdn.coze.cn/obj/eden-cn/lm-lgvj/ljhwZthlaukjlkulzlp/coze-coding/icon/coze-coding.gif"
         ></Image>
-        <Text style={{...styles.title, color: theme.textPrimary}}>APP 开发中</Text>
-        <Text style={{...styles.description, color: theme.textSecondary}}>即将为您呈现应用界面</Text>
+        <Text style={{...styles.title, color: theme.textPrimary}}>应用开发中</Text>
+        <Text style={{...styles.description, color: theme.textSecondary}}>请稍候，界面即将呈现</Text>
       </View>
     </Screen>
   );

package/lib/__templates__/expo/package.json

@@ -19,7 +19,7 @@
       "esbuild": "0.27.2"
     },
     "patchedDependencies": {
-      "expo@54.0.32": "patches/expo@54.0.32.patch"
+      "expo@54.0.33": "patches/expo@54.0.33.patch"
     }
   }
 }

package/lib/__templates__/expo/patches/{expo@54.0.32.patch → expo@54.0.33.patch}

@@ -1,8 +1,8 @@
 diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
-index 33ce50ee2950c40d2b0553b148710f1e24e44f3d..a13d6f2da10dea858019cc991c21753f64f01fd0 100644
+index 33ce50ee2950c40d2b0553b148710f1e24e44f3d..3d78cb02dd7e96ac9727a2935d8178f2c7e95982 100644
 --- a/src/async-require/hmr.ts
 +++ b/src/async-require/hmr.ts
-@@ -216,6 +216,39 @@ const HMRClient: HMRClientNativeInterface = {
+@@ -216,6 +216,40 @@ const HMRClient: HMRClientNativeInterface = {
 
      client.on('update-done', () => {
        hideLoading();
@@ -39,6 +39,7 @@ index 33ce50ee2950c40d2b0553b148710f1e24e44f3d..a13d6f2da10dea858019cc991c21753f
 +          checkServerAndReload(6);
 +        }, 35_000);
 +      }
++      console.log('[HMR] Update done.');
      });
 
      client.on('error', (data: { type: string; message: string }) => {