@coze-arch/cli 0.1.4-alpha.fb90f3 → 0.1.5-alpha.2e246f

package/lib/__templates__/expo/.cozeproj/scripts/dev_build.ps1

@@ -6,5 +6,5 @@ Set-Location $workspace
 Write-Host "Installing Expo project dependencies..."
 & pnpm install --registry=https://registry.npmmirror.com
 if ($LASTEXITCODE -ne 0) {
-  Write-Warning "Expo 项目依赖安装失败"
+  Write-Warning "Expo project dependency installation failed."
 }

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ -z "${BASH_VERSION:-}" ]; then exec /usr/bin/env bash "$0" "$@"; fi
 set -euo pipefail
-ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+ROOT_DIR="$(pwd)"
 PREVIEW_DIR="/source/preview"
 SOURCE_DIR="/source"
 
@@ -34,8 +34,8 @@ echo "==================== 安装项目依赖 ===================="
 if [ ! -f "package.json" ]; then
   echo "项目目录下无 package.json，不是合法的 Node.js 项目"
 fi
-# 步骤 2.1/2.2：通过受管入口安装项目依赖
-bash "$ROOT_DIR/.cozeproj/scripts/prepare-node-modules.sh" --registry=https://registry.npmmirror.com
+# 步骤 2.1/2.2：安装项目依赖
+pnpm install --registry=https://registry.npmmirror.com || echo "Expo 项目依赖安装失败（pnpm 执行出错）"
 
 echo "检查根目录 post_install.py"
 if [ -f "$PREVIEW_DIR/post_install.py" ]; then

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

@@ -42,7 +42,7 @@ Stop-ListeningProcess $expoPort
 $webUrl = if ($env:COZE_PROJECT_DOMAIN_DEFAULT) {
   $env:COZE_PROJECT_DOMAIN_DEFAULT
 } elseif ($env:COZE_HARDWARE_DID) {
-  "https://cozedaemon-$($env:COZE_HARDWARE_DID)-$expoPort.dev.coze.site"
+  "https://preview-$($env:COZE_HARDWARE_DID)-$expoPort.dev.coze.site"
 } else {
   "http://127.0.0.1:$serverPort"
 }
@@ -64,11 +64,11 @@ $expo = Start-LoggedProcess (Join-Path $workspace "client") $clientLog @("exec",
 
 Start-Sleep -Seconds 8
 if ((Test-Path $clientLog) -and (Select-String -Path $clientLog -Pattern "TypeError: fetch failed" -Quiet)) {
-  Write-Host "Expo 启动检测到网络错误，启用离线模式重试"
+  Write-Host "Expo startup detected a network error; retrying in offline mode."
   Stop-ProcessTree $expo.Id
   $expoEnvironment.EXPO_OFFLINE = "1"
   $expo = Start-LoggedProcess (Join-Path $workspace "client") $clientLog @("exec", "expo", "start", "--web", "--clear", "--port", "$expoPort") $expoEnvironment
 }
 
-Write-Host "服务已启动。Server PID: $($server.Id), Expo PID: $($expo.Id)"
+Write-Host "Services started. Server PID: $($server.Id), Expo PID: $($expo.Id)"
 Write-Host "EXPO_PUBLIC_BACKEND_BASE_URL=$webUrl"

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

@@ -135,7 +135,6 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
-if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -143,7 +142,6 @@ if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
   sleep 5
   kill -KILL -- "-$$" 2>/dev/null || true
 ) &
-fi
 
 wait "${child_pid}"
 kill -KILL -- "-$$" 2>/dev/null || true

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ -z "${BASH_VERSION:-}" ]; then exec /usr/bin/env bash "$0" "$@"; fi
 set -euo pipefail
-ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+ROOT_DIR="$(pwd)"
 
 # ==================== 工具函数 ====================
 info() {
@@ -32,8 +32,8 @@ info "==================== 安装 Node 依赖 ===================="
 info "开始安装 Node 依赖"
 if [ -f "$ROOT_DIR/package.json" ]; then
   info "进入目录：$ROOT_DIR"
-  info "正在执行受管依赖准备入口"
-  bash "$ROOT_DIR/.cozeproj/scripts/prepare-node-modules.sh" --registry=https://registry.npmmirror.com || error "Node 依赖安装失败"
+  info "正在执行：pnpm install"
+  (cd "$ROOT_DIR" && pnpm install --registry=https://registry.npmmirror.com) || error "Node 依赖安装失败"
 else
   warn "未找到 $ROOT_DIR/package.json 文件，请检查路径是否正确"
 fi

package/lib/__templates__/expo/client/components/Screen.tsx

@@ -6,19 +6,13 @@ import {
   View,
   TouchableWithoutFeedback,
   Keyboard,
-  type ViewStyle,
+  ViewStyle,
   FlatList,
-  type FlatListProps,
   SectionList,
-  type SectionListProps,
-  type ScrollViewProps,
   Modal,
 } from 'react-native';
 import { withUniwind } from 'uniwind';
-import {
-  useSafeAreaInsets,
-  type Edge,
-} from 'react-native-safe-area-context';
+import { useSafeAreaInsets, Edge } from 'react-native-safe-area-context';
 import { StatusBar } from 'expo-status-bar';
 // 引入 KeyboardAware 系列组件
 import {
@@ -92,92 +86,58 @@ type KeyboardAwareProps = {
   contentInsetBehaviorIOS: 'automatic' | 'never';
 };
 
-type NativeScrollableProps = Pick<
-  ScrollViewProps,
-  | 'contentContainerStyle'
-  | 'keyboardShouldPersistTaps'
-  | 'keyboardDismissMode'
-  | 'contentInsetAdjustmentBehavior'
->;
-
 const KeyboardAwareScrollable = ({
   element,
   extraPadding,
   contentInsetBehaviorIOS,
 }: KeyboardAwareProps) => {
-  const createEnhancedContentStyle = (
-    contentContainerStyle: ScrollViewProps['contentContainerStyle'],
-  ) => {
-    const mergedStyle = StyleSheet.flatten(contentContainerStyle) ?? {};
-    const currentPaddingBottom =
-      typeof mergedStyle.paddingBottom === 'number'
-        ? mergedStyle.paddingBottom
-        : 0;
+  // 获取原始组件的 props
+  const childAttrs = ((element as React.ReactElement).props ?? {}) as Record<string, unknown>;
+  const originStyle = childAttrs['contentContainerStyle'];
+  const styleArray = Array.isArray(originStyle) ? originStyle : originStyle ? [originStyle] : [];
+  const merged = Object.assign({}, ...styleArray);
+  const currentPB = typeof merged.paddingBottom === 'number' ? merged.paddingBottom : 0;
 
-    return [
-      {
-        ...mergedStyle,
-        paddingBottom: currentPaddingBottom + extraPadding,
-      },
-    ];
-  };
+  // 合并 paddingBottom (安全区 + 额外留白)
+  const enhancedContentStyle = [{ ...merged, paddingBottom: currentPB + extraPadding }];
 
-  const createKeyboardAwareProps = <Props extends NativeScrollableProps>(
-    childProps: Props,
-  ) => ({
-    ...childProps,
-    contentContainerStyle: createEnhancedContentStyle(
-      childProps.contentContainerStyle,
-    ),
-    keyboardShouldPersistTaps:
-      childProps.keyboardShouldPersistTaps ?? 'handled',
-    keyboardDismissMode: childProps.keyboardDismissMode ?? 'on-drag',
+  // 基础配置 props，用于传递给 KeyboardAware 组件
+  const commonProps = {
+    ...childAttrs,
+    contentContainerStyle: enhancedContentStyle,
+    keyboardShouldPersistTaps: childAttrs['keyboardShouldPersistTaps'] ?? 'handled',
+    keyboardDismissMode: childAttrs['keyboardDismissMode'] ?? 'on-drag',
     enableOnAndroid: true,
     // 类似于原代码中的 setTimeout/scrollToEnd 逻辑，这里设置额外的滚动高度确保输入框可见
     extraHeight: 100,
     // 禁用自带的 ScrollView 自动 inset，由外部 padding 控制
     enableAutomaticScroll: true,
     ...(Platform.OS === 'ios'
-      ? {
-          contentInsetAdjustmentBehavior:
-            childProps.contentInsetAdjustmentBehavior ??
-            contentInsetBehaviorIOS,
-        }
+      ? { contentInsetAdjustmentBehavior: childAttrs['contentInsetAdjustmentBehavior'] ?? contentInsetBehaviorIOS }
       : {}),
-  });
+  };
 
-  const t = element.type;
+  const t = (element as React.ReactElement).type;
 
   // 根据组件类型返回对应的 KeyboardAware 版本
   // 注意：不再使用 KeyboardAvoidingView，直接替换为增强版 ScrollView
   if (t === ScrollView) {
-    const childProps = element.props as ScrollViewProps;
-    return (
-      <KeyboardAwareScrollView {...createKeyboardAwareProps(childProps)} />
-    );
+    return <KeyboardAwareScrollView {...commonProps} />;
   }
 
   if (t === FlatList) {
-    const childProps = element.props as FlatListProps<unknown>;
-    return <KeyboardAwareFlatList {...createKeyboardAwareProps(childProps)} />;
+    return <KeyboardAwareFlatList {...commonProps} />;
   }
 
   if (t === SectionList) {
-    const childProps = element.props as SectionListProps<unknown>;
-    return (
-      <KeyboardAwareSectionList {...createKeyboardAwareProps(childProps)} />
-    );
+    return <KeyboardAwareSectionList {...commonProps} />;
   }
 
   // 理论上不应运行到这里，如果是非标准组件则原样返回，仅修改样式
-  const childProps = element.props as NativeScrollableProps;
   return React.cloneElement(element, {
-    contentContainerStyle: createEnhancedContentStyle(
-      childProps.contentContainerStyle,
-    ),
-    keyboardShouldPersistTaps:
-      childProps.keyboardShouldPersistTaps ?? 'handled',
-    keyboardDismissMode: childProps.keyboardDismissMode ?? 'on-drag',
+    contentContainerStyle: enhancedContentStyle,
+    keyboardShouldPersistTaps: childAttrs['keyboardShouldPersistTaps'] ?? 'handled',
+    keyboardDismissMode: childAttrs['keyboardDismissMode'] ?? 'on-drag',
   });
 };
 

package/lib/__templates__/expo/client/heroui/components/toast/toast.tsx

@@ -1,9 +1,5 @@
 import React, { forwardRef, useMemo } from 'react';
-import {
-  type GestureResponderEvent,
-  View,
-  Text as RNText,
-} from 'react-native';
+import { View, Text as RNText } from 'react-native';
 import { GestureDetector } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
 import { useThemeColor } from '../../helpers/external/hooks';
@@ -343,7 +339,7 @@ const ToastClose = forwardRef<View, ToastCloseProps>((props, ref) => {
    * If hide and id are available from context, use them to hide the toast
    * Otherwise, use the provided onPress handler
    */
-  const handlePress = (event: GestureResponderEvent) => {
+  const handlePress = (event: Parameters<NonNullable<React.ComponentProps<typeof Button>['onPress']>>[0]) => {
     if (hide && id) {
       hide(id);
     }

package/lib/__templates__/expo/client/heroui/helpers/internal/hooks/use-controllable-state.ts

@@ -108,7 +108,7 @@ function useUncontrolledState<T>({
  * A custom hook that converts a callback to a ref to avoid triggering re-renders when passed as a
  * prop or avoid re-executing effects when passed as a dependency
  */
-function useCallbackRef<T extends (...args: never[]) => unknown>(
+function useCallbackRef<T extends (...args: unknown[]) => unknown>(
   callback: T | undefined
 ): T {
   const callbackRef = useRef(callback);

package/lib/__templates__/nextjs/.babelrc

@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "next/babel",
+      {
+        "preset-react": {
+          "development": true
+        }
+      }
+    ]
+  ],
+  "plugins": [
+    "@react-dev-inspector/babel-plugin"
+  ]
+}

package/lib/__templates__/nextjs/eslint.config.mjs

@@ -23,11 +23,6 @@ const eslintConfig = defineConfig([
   ...nextVitals,
   ...nextTs,
   {
-    settings: {
-      // node_modules 里的 barrel 包（lucide-react 等）不参与 ExportMap 构建，
-      // import/no-cycle 只需要项目源码的依赖图。
-      'import/ignore': ['/node_modules/'],
-    },
     rules: {
       'import/no-cycle': ['error', { ignoreExternal: true }],
       'react-hooks/set-state-in-effect': 'off',
@@ -42,15 +37,14 @@ const eslintConfig = defineConfig([
   },
   // Override default ignores of eslint-config-next.
   globalIgnores([
-    // Default ignores of eslint-config-next (trailing slash prunes the whole
-    // directory instead of walking into it):
-    '.next/',
-    'out/',
-    'build/',
+    // Default ignores of eslint-config-next:
+    '.next/**',
+    'out/**',
+    'build/**',
     'next-env.d.ts',
     // Build artifacts:
     'server.js',
-    'dist/',
+    'dist/**',
     // Script files (CommonJS):
     'scripts/**/*.js',
   ]),

package/lib/__templates__/nextjs/next.config.ts

@@ -1,18 +1,8 @@
 import type { NextConfig } from 'next';
-import path from 'path';
 
 const nextConfig: NextConfig = {
   // outputFileTracingRoot: path.resolve(__dirname, '../../'),  // Uncomment and add 'import path from "path"' if needed
   /* config options here */
-  serverExternalPackages: ['coze-coding-dev-sdk'],
-  webpack: (config, { dev }) => {
-    if (dev && config.cache && config.cache.type === 'filesystem') {
-      config.cache.cacheDirectory = path.resolve(
-        'node_modules/.cache/next-webpack',
-      );
-    }
-    return config;
-  },
   allowedDevOrigins: ['*.dev.coze.site'],
   images: {
     remotePatterns: [

package/lib/__templates__/nextjs/package.json

@@ -6,7 +6,7 @@
     "build": "bash ./scripts/build.sh",
     "dev": "bash ./scripts/dev.sh",
     "preinstall": "npx only-allow pnpm",
-    "lint": "eslint --cache --cache-location node_modules/.cache/eslint/",
+    "lint": "eslint",
     "lint:build": "eslint . --quiet",
     "lint:style": "stylelint \"src/**/*.css\"",
     "start": "bash ./scripts/start.sh",
@@ -73,14 +73,17 @@
     "zod": "^4.3.5"
   },
   "devDependencies": {
+    "@react-dev-inspector/babel-plugin": "^2.0.1",
+    "@react-dev-inspector/middleware": "^2.0.1",
     "@tailwindcss/postcss": "^4",
     "@types/node": "^20",
     "@types/pg": "^8.16.0",
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "eslint": "^9",
-    "eslint-config-next": "16.1.1",
+    "eslint-config-next": "16.3.3",
     "only-allow": "^1.2.2",
+    "react-dev-inspector": "^2.0.1",
     "shadcn": "latest",
     "stylelint": "^16.4.0",
     "stylelint-config-standard": "^38.0.0",
@@ -95,7 +98,7 @@
   },
   "pnpm": {
     "overrides": {
-      "sharp": "0.35.3"
+      "sharp": "^0.35.4"
     }
   }
 }