@coze-arch/cli 0.1.4-alpha.e6e18e → 0.1.4-alpha.f69bb1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/__templates__/expo/.cozeproj/scripts/dev_build.ps1 +1 -1
- package/lib/__templates__/expo/.cozeproj/scripts/dev_build.sh +3 -3
- package/lib/__templates__/expo/.cozeproj/scripts/dev_run.ps1 +2 -2
- package/lib/__templates__/expo/.cozeproj/scripts/dev_run.sh +2 -0
- package/lib/__templates__/expo/.cozeproj/scripts/prepare-node-modules.sh +114 -0
- package/lib/__templates__/expo/.cozeproj/scripts/prod_build.sh +3 -3
- package/lib/__templates__/expo/client/components/Screen.tsx +65 -25
- package/lib/__templates__/expo/client/heroui/components/toast/toast.tsx +6 -2
- package/lib/__templates__/expo/client/heroui/helpers/internal/hooks/use-controllable-state.ts +1 -1
- package/lib/__templates__/expo/pnpm-lock.yaml +5 -5
- package/lib/__templates__/expo/server/package.json +1 -1
- package/lib/__templates__/nextjs/eslint.config.mjs +11 -5
- package/lib/__templates__/nextjs/next.config.ts +10 -0
- package/lib/__templates__/nextjs/package.json +3 -6
- package/lib/__templates__/nextjs/pnpm-lock.yaml +19 -950
- package/lib/__templates__/nextjs/scripts/build.ps1 +1 -1
- package/lib/__templates__/nextjs/scripts/build.sh +3 -2
- package/lib/__templates__/nextjs/scripts/dev.ps1 +2 -2
- package/lib/__templates__/nextjs/scripts/dev.sh +10 -5
- package/lib/__templates__/nextjs/scripts/prepare-next-output.sh +62 -0
- package/lib/__templates__/nextjs/scripts/prepare-node-modules.sh +114 -0
- package/lib/__templates__/nextjs/scripts/prepare.sh +1 -4
- package/lib/__templates__/nextjs/src/app/layout.tsx +0 -4
- package/lib/__templates__/nextjs/src/server.ts +1 -1
- package/lib/__templates__/nextjs/template.config.js +0 -59
- package/lib/__templates__/nuxt-vue/package.json +1 -1
- package/lib/__templates__/nuxt-vue/pnpm-lock.yaml +5 -5
- package/lib/__templates__/nuxt-vue/scripts/build.sh +1 -1
- package/lib/__templates__/nuxt-vue/scripts/dev.sh +2 -0
- package/lib/__templates__/nuxt-vue/scripts/prepare-node-modules.sh +114 -0
- package/lib/__templates__/nuxt-vue/scripts/prepare.sh +1 -4
- package/lib/__templates__/pi-agent/package.json +1 -1
- package/lib/__templates__/pi-agent/pnpm-lock.yaml +5 -5
- package/lib/__templates__/taro/.cozeproj/scripts/deploy_build.sh +3 -2
- package/lib/__templates__/taro/.cozeproj/scripts/dev_build.sh +3 -0
- package/lib/__templates__/taro/.cozeproj/scripts/dev_run.sh +3 -1
- package/lib/__templates__/taro/.cozeproj/scripts/prepare-node-modules.sh +114 -0
- package/lib/__templates__/taro/pnpm-lock.yaml +5 -5
- package/lib/__templates__/taro/server/package.json +1 -1
- package/lib/__templates__/vite/package.json +1 -1
- package/lib/__templates__/vite/pnpm-lock.yaml +5 -5
- package/lib/__templates__/vite/scripts/build.ps1 +4 -1
- package/lib/__templates__/vite/scripts/build.sh +1 -1
- package/lib/__templates__/vite/scripts/dev.ps1 +7 -23
- package/lib/__templates__/vite/scripts/dev.sh +2 -0
- package/lib/__templates__/vite/scripts/prepare-node-modules.sh +114 -0
- package/lib/__templates__/vite/scripts/prepare.ps1 +6 -1
- package/lib/__templates__/vite/scripts/prepare.sh +1 -4
- package/lib/__templates__/vite/template.config.js +0 -59
- package/lib/cli.js +34 -12
- package/package.json +1 -1
- package/lib/__templates__/nextjs/.babelrc +0 -15
- package/lib/__templates__/vite/scripts/ensure-deps.ps1 +0 -33
|
@@ -43,6 +43,7 @@ shift
|
|
|
43
43
|
child_pid=$!
|
|
44
44
|
|
|
45
45
|
# 先忽略 TERM,才能在向整组发 TERM(自己也在组里)之后存活下来补一发 KILL。
|
|
46
|
+
if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
|
|
46
47
|
( trap "" TERM
|
|
47
48
|
sleep "${timeout_seconds}"
|
|
48
49
|
echo "[dev] 后台进程运行超过 ${timeout_seconds}s,回收进程组 $$。"
|
|
@@ -50,6 +51,7 @@ child_pid=$!
|
|
|
50
51
|
sleep 5
|
|
51
52
|
kill -KILL -- "-$$" 2>/dev/null || true
|
|
52
53
|
) &
|
|
54
|
+
fi
|
|
53
55
|
|
|
54
56
|
wait "${child_pid}"
|
|
55
57
|
kill -KILL -- "-$$" 2>/dev/null || true
|
|
@@ -194,7 +196,7 @@ cleanup_previous_run() {
|
|
|
194
196
|
# ---------------------------------------------------------
|
|
195
197
|
echo "📦 Installing dependencies..."
|
|
196
198
|
PNPM_BIN="$(command -v pnpm)"
|
|
197
|
-
"$
|
|
199
|
+
bash "$ROOT_DIR/.cozeproj/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline
|
|
198
200
|
echo "✅ Dependencies installed successfully!"
|
|
199
201
|
|
|
200
202
|
# ---------------------------------------------------------
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
# Install dependencies on local disk and expose them to the source tree by symlink.
|
|
3
|
+
set -euo pipefail
|
|
4
|
+
|
|
5
|
+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
6
|
+
if [ "$(basename "$(dirname "$SCRIPT_DIR")")" = ".cozeproj" ]; then
|
|
7
|
+
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd -P)"
|
|
8
|
+
else
|
|
9
|
+
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|
10
|
+
fi
|
|
11
|
+
|
|
12
|
+
command -v pnpm >/dev/null 2>&1 || {
|
|
13
|
+
echo "[node_modules] pnpm is required" >&2
|
|
14
|
+
exit 1
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
DRIVE_ROOT="${COZE_DRIVE_ROOT:-/Coze/Drive}"
|
|
18
|
+
if [ -d "$DRIVE_ROOT" ]; then
|
|
19
|
+
DRIVE_ROOT="$(cd "$DRIVE_ROOT" && pwd -P)"
|
|
20
|
+
else
|
|
21
|
+
DRIVE_ROOT="${DRIVE_ROOT%/}"
|
|
22
|
+
fi
|
|
23
|
+
case "$PROJECT_ROOT" in
|
|
24
|
+
"$DRIVE_ROOT"|"$DRIVE_ROOT"/*) ;;
|
|
25
|
+
*)
|
|
26
|
+
(cd "$PROJECT_ROOT" && pnpm install "$@")
|
|
27
|
+
exit 0
|
|
28
|
+
;;
|
|
29
|
+
esac
|
|
30
|
+
|
|
31
|
+
NM_ROOT="/tmp/nm"
|
|
32
|
+
PROJECT_ID="$(basename "$PROJECT_ROOT")-$(printf '%s' "$PROJECT_ROOT" | cksum | awk '{print $1}')"
|
|
33
|
+
mkdir -p "$NM_ROOT"
|
|
34
|
+
WORK_DIR="$NM_ROOT/$PROJECT_ID"
|
|
35
|
+
case "$WORK_DIR" in
|
|
36
|
+
"$DRIVE_ROOT"|"$DRIVE_ROOT"/*)
|
|
37
|
+
echo "[node_modules] local dependency directory must not be on Coze Drive: $WORK_DIR" >&2
|
|
38
|
+
exit 1
|
|
39
|
+
;;
|
|
40
|
+
esac
|
|
41
|
+
|
|
42
|
+
LOCK_DIR="$NM_ROOT/$PROJECT_ID.lock"
|
|
43
|
+
while ! mkdir "$LOCK_DIR" 2>/dev/null; do
|
|
44
|
+
echo "[node_modules] Waiting for another dependency preparation for this project..."
|
|
45
|
+
sleep 1
|
|
46
|
+
done
|
|
47
|
+
trap 'rmdir "$LOCK_DIR" 2>/dev/null || true' EXIT
|
|
48
|
+
|
|
49
|
+
mkdir -p "$WORK_DIR"
|
|
50
|
+
|
|
51
|
+
# Previous versions mirrored the whole project into WORK_DIR. That gives pnpm
|
|
52
|
+
# and framework dev servers two paths for the same source tree, which breaks
|
|
53
|
+
# file watching and on-demand compilation. Keep only managed local outputs.
|
|
54
|
+
cleanup_legacy_workspace() {
|
|
55
|
+
local workspace_dir="$1" entry name
|
|
56
|
+
if [ -L "$workspace_dir" ] || { [ -e "$workspace_dir" ] && [ ! -d "$workspace_dir" ]; }; then
|
|
57
|
+
rm -rf "$workspace_dir"
|
|
58
|
+
return
|
|
59
|
+
fi
|
|
60
|
+
[ -d "$workspace_dir" ] || return
|
|
61
|
+
|
|
62
|
+
while IFS= read -r -d '' entry; do
|
|
63
|
+
name="$(basename "$entry")"
|
|
64
|
+
[ "$name" = "node_modules" ] || rm -rf "$entry"
|
|
65
|
+
done < <(find "$workspace_dir" -mindepth 1 -maxdepth 1 -print0)
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
cleanup_legacy_shadow_project() {
|
|
69
|
+
local entry name
|
|
70
|
+
while IFS= read -r -d '' entry; do
|
|
71
|
+
name="$(basename "$entry")"
|
|
72
|
+
case "$name" in
|
|
73
|
+
node_modules|.next|client|server) continue ;;
|
|
74
|
+
esac
|
|
75
|
+
rm -rf "$entry"
|
|
76
|
+
done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
|
|
77
|
+
|
|
78
|
+
for workspace in client server; do
|
|
79
|
+
cleanup_legacy_workspace "$WORK_DIR/$workspace"
|
|
80
|
+
done
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
link_node_modules() {
|
|
84
|
+
local source_dir="$1" target_dir="$2"
|
|
85
|
+
local current=""
|
|
86
|
+
mkdir -p "$target_dir"
|
|
87
|
+
if [ -L "$source_dir/node_modules" ]; then
|
|
88
|
+
current="$(readlink "$source_dir/node_modules")"
|
|
89
|
+
case "$current" in
|
|
90
|
+
"$NM_ROOT"/*/node_modules|"$NM_ROOT"/*/*/node_modules) ;;
|
|
91
|
+
*)
|
|
92
|
+
echo "[node_modules] refusing to replace unmanaged symlink: $source_dir/node_modules" >&2
|
|
93
|
+
exit 1
|
|
94
|
+
;;
|
|
95
|
+
esac
|
|
96
|
+
rm "$source_dir/node_modules"
|
|
97
|
+
elif [ -e "$source_dir/node_modules" ]; then
|
|
98
|
+
rm -rf "$source_dir/node_modules"
|
|
99
|
+
fi
|
|
100
|
+
ln -s "$target_dir" "$source_dir/node_modules"
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
cleanup_legacy_shadow_project
|
|
104
|
+
link_node_modules "$PROJECT_ROOT" "$WORK_DIR/node_modules"
|
|
105
|
+
for workspace in client server; do
|
|
106
|
+
if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
|
|
107
|
+
link_node_modules "$PROJECT_ROOT/$workspace" "$WORK_DIR/$workspace/node_modules"
|
|
108
|
+
fi
|
|
109
|
+
done
|
|
110
|
+
|
|
111
|
+
echo "[node_modules] Installing dependencies for $PROJECT_ROOT with node_modules at $WORK_DIR"
|
|
112
|
+
(cd "$PROJECT_ROOT" && pnpm install "$@")
|
|
113
|
+
|
|
114
|
+
echo "[node_modules] Dependencies ready"
|
|
@@ -204,8 +204,8 @@ importers:
|
|
|
204
204
|
specifier: 2.95.3
|
|
205
205
|
version: 2.95.3
|
|
206
206
|
coze-coding-dev-sdk:
|
|
207
|
-
specifier: ^0.7.
|
|
208
|
-
version: 0.7.
|
|
207
|
+
specifier: ^0.7.28
|
|
208
|
+
version: 0.7.28(openai@6.16.0(ws@8.19.0)(zod@4.3.5))(ws@8.19.0)
|
|
209
209
|
dotenv:
|
|
210
210
|
specifier: ^17.2.3
|
|
211
211
|
version: 17.2.3
|
|
@@ -5416,8 +5416,8 @@ packages:
|
|
|
5416
5416
|
typescript:
|
|
5417
5417
|
optional: true
|
|
5418
5418
|
|
|
5419
|
-
coze-coding-dev-sdk@0.7.
|
|
5420
|
-
resolution: {integrity: sha512-
|
|
5419
|
+
coze-coding-dev-sdk@0.7.28:
|
|
5420
|
+
resolution: {integrity: sha512-ku7AiVWUmgCrUuMT1m2iTmHIwG39EfmcAhPASd8M7XyKxIC6A1cjIIe/3YpStRsj8pMF9LU+pxHWxisf+F44oQ==}
|
|
5421
5421
|
engines: {node: '>=18.0.0'}
|
|
5422
5422
|
hasBin: true
|
|
5423
5423
|
|
|
@@ -17159,7 +17159,7 @@ snapshots:
|
|
|
17159
17159
|
optionalDependencies:
|
|
17160
17160
|
typescript: 5.9.3
|
|
17161
17161
|
|
|
17162
|
-
coze-coding-dev-sdk@0.7.
|
|
17162
|
+
coze-coding-dev-sdk@0.7.28(openai@6.16.0(ws@8.19.0)(zod@4.3.5))(ws@8.19.0):
|
|
17163
17163
|
dependencies:
|
|
17164
17164
|
'@langchain/core': 1.1.16(openai@6.16.0(ws@8.19.0)(zod@4.3.5))
|
|
17165
17165
|
'@langchain/openai': 1.2.3(@langchain/core@1.1.16(openai@6.16.0(ws@8.19.0)(zod@4.3.5)))(ws@8.19.0)
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@nestjs/core": "^10.4.15",
|
|
18
18
|
"@nestjs/platform-express": "^10.4.15",
|
|
19
19
|
"@supabase/supabase-js": "2.95.3",
|
|
20
|
-
"coze-coding-dev-sdk": "^0.7.
|
|
20
|
+
"coze-coding-dev-sdk": "^0.7.28",
|
|
21
21
|
"dotenv": "^17.2.3",
|
|
22
22
|
"drizzle-kit": "^0.31.8",
|
|
23
23
|
"drizzle-orm": "^0.45.1",
|
|
@@ -32,8 +32,8 @@ importers:
|
|
|
32
32
|
specifier: ^10.4.20
|
|
33
33
|
version: 10.4.23(postcss@8.5.6)
|
|
34
34
|
coze-coding-dev-sdk:
|
|
35
|
-
specifier: ^0.7.
|
|
36
|
-
version: 0.7.
|
|
35
|
+
specifier: ^0.7.28
|
|
36
|
+
version: 0.7.28(openai@6.16.0(ws@8.19.0)(zod@4.3.5))(ws@8.19.0)
|
|
37
37
|
esbuild:
|
|
38
38
|
specifier: ^0.27.2
|
|
39
39
|
version: 0.27.2
|
|
@@ -910,8 +910,8 @@ packages:
|
|
|
910
910
|
typescript:
|
|
911
911
|
optional: true
|
|
912
912
|
|
|
913
|
-
coze-coding-dev-sdk@0.7.
|
|
914
|
-
resolution: {integrity: sha512-
|
|
913
|
+
coze-coding-dev-sdk@0.7.28:
|
|
914
|
+
resolution: {integrity: sha512-ku7AiVWUmgCrUuMT1m2iTmHIwG39EfmcAhPASd8M7XyKxIC6A1cjIIe/3YpStRsj8pMF9LU+pxHWxisf+F44oQ==}
|
|
915
915
|
engines: {node: '>=18.0.0'}
|
|
916
916
|
hasBin: true
|
|
917
917
|
|
|
@@ -3281,7 +3281,7 @@ snapshots:
|
|
|
3281
3281
|
optionalDependencies:
|
|
3282
3282
|
typescript: 5.9.3
|
|
3283
3283
|
|
|
3284
|
-
coze-coding-dev-sdk@0.7.
|
|
3284
|
+
coze-coding-dev-sdk@0.7.28(openai@6.16.0(ws@8.19.0)(zod@4.3.5))(ws@8.19.0):
|
|
3285
3285
|
dependencies:
|
|
3286
3286
|
'@langchain/core': 1.1.16(openai@6.16.0(ws@8.19.0)(zod@4.3.5))
|
|
3287
3287
|
'@langchain/openai': 1.2.3(@langchain/core@1.1.16(openai@6.16.0(ws@8.19.0)(zod@4.3.5)))(ws@8.19.0)
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
$ErrorActionPreference = "Stop"
|
|
2
2
|
|
|
3
3
|
$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { (Get-Location).Path }
|
|
4
|
-
& "$PSScriptRoot/ensure-deps.ps1"
|
|
5
4
|
Set-Location $workspace
|
|
6
5
|
|
|
6
|
+
Write-Host "Installing dependencies..."
|
|
7
|
+
& pnpm install --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
|
|
8
|
+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
|
|
9
|
+
|
|
7
10
|
Write-Host "Building frontend with Vite..."
|
|
8
11
|
& pnpm vite build
|
|
9
12
|
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
|
|
@@ -6,7 +6,7 @@ COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
|
|
|
6
6
|
cd "${COZE_WORKSPACE_PATH}"
|
|
7
7
|
|
|
8
8
|
echo "Installing dependencies..."
|
|
9
|
-
|
|
9
|
+
bash "$COZE_WORKSPACE_PATH/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
|
|
10
10
|
|
|
11
11
|
echo "Building frontend with Vite..."
|
|
12
12
|
pnpm vite build
|
|
@@ -51,29 +51,13 @@ try {
|
|
|
51
51
|
}
|
|
52
52
|
|
|
53
53
|
$process.Id | Set-Content $pidFile
|
|
54
|
-
|
|
55
|
-
$
|
|
56
|
-
$
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
Write-Error "Dev server exited before listening on port $port."
|
|
60
|
-
Get-Content $errorLogFile -Tail 20 -ErrorAction SilentlyContinue
|
|
61
|
-
Remove-Item $pidFile -Force -ErrorAction SilentlyContinue
|
|
62
|
-
exit 1
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
if (Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue) {
|
|
66
|
-
Write-Host "Dev server is listening on port $port (PID: $($process.Id))."
|
|
67
|
-
Write-Host "Log file: $logFile"
|
|
68
|
-
exit 0
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
Start-Sleep -Milliseconds 200
|
|
54
|
+
Start-Sleep -Seconds 1
|
|
55
|
+
if ($process.HasExited) {
|
|
56
|
+
Get-Content $errorLogFile -Tail 20 -ErrorAction SilentlyContinue
|
|
57
|
+
Remove-Item $pidFile -Force -ErrorAction SilentlyContinue
|
|
58
|
+
exit 1
|
|
72
59
|
}
|
|
73
60
|
|
|
74
|
-
Write-
|
|
75
|
-
|
|
76
|
-
Get-Content $errorLogFile -Tail 20 -ErrorAction SilentlyContinue
|
|
77
|
-
Remove-Item $pidFile -Force -ErrorAction SilentlyContinue
|
|
78
|
-
exit 1
|
|
61
|
+
Write-Host "Dev server started (PID: $($process.Id))."
|
|
62
|
+
Write-Host "Log file: $logFile"
|
|
79
63
|
<% } %>
|
|
@@ -57,6 +57,7 @@ shift
|
|
|
57
57
|
child_pid=$!
|
|
58
58
|
|
|
59
59
|
# 先忽略 TERM,才能在向整组发 TERM(自己也在组里)之后存活下来补一发 KILL。
|
|
60
|
+
if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
|
|
60
61
|
( trap "" TERM
|
|
61
62
|
sleep "${timeout_seconds}"
|
|
62
63
|
echo "[dev] 后台进程运行超过 ${timeout_seconds}s,回收进程组 $$。"
|
|
@@ -64,6 +65,7 @@ child_pid=$!
|
|
|
64
65
|
sleep 5
|
|
65
66
|
kill -KILL -- "-$$" 2>/dev/null || true
|
|
66
67
|
) &
|
|
68
|
+
fi
|
|
67
69
|
|
|
68
70
|
wait "${child_pid}"
|
|
69
71
|
kill -KILL -- "-$$" 2>/dev/null || true
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
# Install dependencies on local disk and expose them to the source tree by symlink.
|
|
3
|
+
set -euo pipefail
|
|
4
|
+
|
|
5
|
+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
6
|
+
if [ "$(basename "$(dirname "$SCRIPT_DIR")")" = ".cozeproj" ]; then
|
|
7
|
+
PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd -P)"
|
|
8
|
+
else
|
|
9
|
+
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
|
10
|
+
fi
|
|
11
|
+
|
|
12
|
+
command -v pnpm >/dev/null 2>&1 || {
|
|
13
|
+
echo "[node_modules] pnpm is required" >&2
|
|
14
|
+
exit 1
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
DRIVE_ROOT="${COZE_DRIVE_ROOT:-/Coze/Drive}"
|
|
18
|
+
if [ -d "$DRIVE_ROOT" ]; then
|
|
19
|
+
DRIVE_ROOT="$(cd "$DRIVE_ROOT" && pwd -P)"
|
|
20
|
+
else
|
|
21
|
+
DRIVE_ROOT="${DRIVE_ROOT%/}"
|
|
22
|
+
fi
|
|
23
|
+
case "$PROJECT_ROOT" in
|
|
24
|
+
"$DRIVE_ROOT"|"$DRIVE_ROOT"/*) ;;
|
|
25
|
+
*)
|
|
26
|
+
(cd "$PROJECT_ROOT" && pnpm install "$@")
|
|
27
|
+
exit 0
|
|
28
|
+
;;
|
|
29
|
+
esac
|
|
30
|
+
|
|
31
|
+
NM_ROOT="/tmp/nm"
|
|
32
|
+
PROJECT_ID="$(basename "$PROJECT_ROOT")-$(printf '%s' "$PROJECT_ROOT" | cksum | awk '{print $1}')"
|
|
33
|
+
mkdir -p "$NM_ROOT"
|
|
34
|
+
WORK_DIR="$NM_ROOT/$PROJECT_ID"
|
|
35
|
+
case "$WORK_DIR" in
|
|
36
|
+
"$DRIVE_ROOT"|"$DRIVE_ROOT"/*)
|
|
37
|
+
echo "[node_modules] local dependency directory must not be on Coze Drive: $WORK_DIR" >&2
|
|
38
|
+
exit 1
|
|
39
|
+
;;
|
|
40
|
+
esac
|
|
41
|
+
|
|
42
|
+
LOCK_DIR="$NM_ROOT/$PROJECT_ID.lock"
|
|
43
|
+
while ! mkdir "$LOCK_DIR" 2>/dev/null; do
|
|
44
|
+
echo "[node_modules] Waiting for another dependency preparation for this project..."
|
|
45
|
+
sleep 1
|
|
46
|
+
done
|
|
47
|
+
trap 'rmdir "$LOCK_DIR" 2>/dev/null || true' EXIT
|
|
48
|
+
|
|
49
|
+
mkdir -p "$WORK_DIR"
|
|
50
|
+
|
|
51
|
+
# Previous versions mirrored the whole project into WORK_DIR. That gives pnpm
|
|
52
|
+
# and framework dev servers two paths for the same source tree, which breaks
|
|
53
|
+
# file watching and on-demand compilation. Keep only managed local outputs.
|
|
54
|
+
cleanup_legacy_workspace() {
|
|
55
|
+
local workspace_dir="$1" entry name
|
|
56
|
+
if [ -L "$workspace_dir" ] || { [ -e "$workspace_dir" ] && [ ! -d "$workspace_dir" ]; }; then
|
|
57
|
+
rm -rf "$workspace_dir"
|
|
58
|
+
return
|
|
59
|
+
fi
|
|
60
|
+
[ -d "$workspace_dir" ] || return
|
|
61
|
+
|
|
62
|
+
while IFS= read -r -d '' entry; do
|
|
63
|
+
name="$(basename "$entry")"
|
|
64
|
+
[ "$name" = "node_modules" ] || rm -rf "$entry"
|
|
65
|
+
done < <(find "$workspace_dir" -mindepth 1 -maxdepth 1 -print0)
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
cleanup_legacy_shadow_project() {
|
|
69
|
+
local entry name
|
|
70
|
+
while IFS= read -r -d '' entry; do
|
|
71
|
+
name="$(basename "$entry")"
|
|
72
|
+
case "$name" in
|
|
73
|
+
node_modules|.next|client|server) continue ;;
|
|
74
|
+
esac
|
|
75
|
+
rm -rf "$entry"
|
|
76
|
+
done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
|
|
77
|
+
|
|
78
|
+
for workspace in client server; do
|
|
79
|
+
cleanup_legacy_workspace "$WORK_DIR/$workspace"
|
|
80
|
+
done
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
link_node_modules() {
|
|
84
|
+
local source_dir="$1" target_dir="$2"
|
|
85
|
+
local current=""
|
|
86
|
+
mkdir -p "$target_dir"
|
|
87
|
+
if [ -L "$source_dir/node_modules" ]; then
|
|
88
|
+
current="$(readlink "$source_dir/node_modules")"
|
|
89
|
+
case "$current" in
|
|
90
|
+
"$NM_ROOT"/*/node_modules|"$NM_ROOT"/*/*/node_modules) ;;
|
|
91
|
+
*)
|
|
92
|
+
echo "[node_modules] refusing to replace unmanaged symlink: $source_dir/node_modules" >&2
|
|
93
|
+
exit 1
|
|
94
|
+
;;
|
|
95
|
+
esac
|
|
96
|
+
rm "$source_dir/node_modules"
|
|
97
|
+
elif [ -e "$source_dir/node_modules" ]; then
|
|
98
|
+
rm -rf "$source_dir/node_modules"
|
|
99
|
+
fi
|
|
100
|
+
ln -s "$target_dir" "$source_dir/node_modules"
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
cleanup_legacy_shadow_project
|
|
104
|
+
link_node_modules "$PROJECT_ROOT" "$WORK_DIR/node_modules"
|
|
105
|
+
for workspace in client server; do
|
|
106
|
+
if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
|
|
107
|
+
link_node_modules "$PROJECT_ROOT/$workspace" "$WORK_DIR/$workspace/node_modules"
|
|
108
|
+
fi
|
|
109
|
+
done
|
|
110
|
+
|
|
111
|
+
echo "[node_modules] Installing dependencies for $PROJECT_ROOT with node_modules at $WORK_DIR"
|
|
112
|
+
(cd "$PROJECT_ROOT" && pnpm install "$@")
|
|
113
|
+
|
|
114
|
+
echo "[node_modules] Dependencies ready"
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
$ErrorActionPreference = "Stop"
|
|
2
2
|
|
|
3
3
|
$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { (Get-Location).Path }
|
|
4
|
-
& "$PSScriptRoot/ensure-deps.ps1"
|
|
5
4
|
Set-Location $workspace
|
|
6
5
|
|
|
6
|
+
Write-Host "Installing dependencies..."
|
|
7
|
+
& pnpm install --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
|
|
8
|
+
if ($LASTEXITCODE -ne 0) {
|
|
9
|
+
exit $LASTEXITCODE
|
|
10
|
+
}
|
|
11
|
+
|
|
7
12
|
if (Get-Command coze-dev -ErrorAction SilentlyContinue) {
|
|
8
13
|
& coze-dev check-bins --help *> $null
|
|
9
14
|
if ($LASTEXITCODE -eq 0) {
|
|
@@ -6,7 +6,4 @@ COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
|
|
|
6
6
|
cd "${COZE_WORKSPACE_PATH}"
|
|
7
7
|
|
|
8
8
|
echo "Installing dependencies..."
|
|
9
|
-
|
|
10
|
-
if command -v coze-dev > /dev/null 2>&1 && coze-dev check-bins --help > /dev/null 2>&1; then
|
|
11
|
-
coze-dev check-bins --fix
|
|
12
|
-
fi
|
|
9
|
+
bash "$COZE_WORKSPACE_PATH/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
|
|
@@ -1,8 +1,4 @@
|
|
|
1
1
|
|
|
2
|
-
import { spawn } from 'child_process';
|
|
3
|
-
import { resolve, join, basename } from 'path';
|
|
4
|
-
import { appendFileSync, openSync, closeSync, mkdirSync } from 'fs';
|
|
5
|
-
import { homedir } from 'os';
|
|
6
2
|
|
|
7
3
|
|
|
8
4
|
|
|
@@ -64,61 +60,6 @@ const config = {
|
|
|
64
60
|
onAfterRender: async (_context, _outputPath) => {
|
|
65
61
|
// 输出由 init 命令统一处理
|
|
66
62
|
},
|
|
67
|
-
|
|
68
|
-
onComplete: async (_context, outputPath) => {
|
|
69
|
-
// Skip pnpm update in test environment to avoid monorepo workspace issues
|
|
70
|
-
if (process.env.NODE_ENV === 'test') {
|
|
71
|
-
console.log('⊘ Skipping dependency update in test environment');
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
const cmd = 'pnpm';
|
|
76
|
-
const args = ['update', 'coze-coding-dev-sdk@^0.7.25'];
|
|
77
|
-
console.log(
|
|
78
|
-
`\nTriggering: ${cmd} ${args.join(' ')} (running in background)`,
|
|
79
|
-
);
|
|
80
|
-
|
|
81
|
-
try {
|
|
82
|
-
const projectRoot = resolve(outputPath);
|
|
83
|
-
|
|
84
|
-
// Determine log directory
|
|
85
|
-
const cozeHome = process.env.COZE_HOME || join(homedir(), '.coze');
|
|
86
|
-
const logDir = process.env.COZE_LOG_DIR || join(cozeHome, 'logs');
|
|
87
|
-
mkdirSync(logDir, { recursive: true });
|
|
88
|
-
|
|
89
|
-
// Use project name in log file to avoid conflicts
|
|
90
|
-
const projectName = basename(projectRoot);
|
|
91
|
-
const logFile = join(logDir, `${projectName}-init.log`);
|
|
92
|
-
|
|
93
|
-
// Write log header
|
|
94
|
-
const timestamp = new Date().toISOString();
|
|
95
|
-
appendFileSync(
|
|
96
|
-
logFile,
|
|
97
|
-
`\n=== [${timestamp}] ${cmd} ${args.join(' ')} ===\n`,
|
|
98
|
-
);
|
|
99
|
-
|
|
100
|
-
// Open log file for appending
|
|
101
|
-
const logFd = openSync(logFile, 'a');
|
|
102
|
-
|
|
103
|
-
// Spawn in detached mode
|
|
104
|
-
const child = spawn(cmd, args, {
|
|
105
|
-
cwd: projectRoot,
|
|
106
|
-
detached: true,
|
|
107
|
-
stdio: ['ignore', logFd, logFd],
|
|
108
|
-
});
|
|
109
|
-
|
|
110
|
-
child.unref();
|
|
111
|
-
closeSync(logFd);
|
|
112
|
-
|
|
113
|
-
console.log(
|
|
114
|
-
'✓ coze-coding-dev-sdk update triggered (running in background)',
|
|
115
|
-
);
|
|
116
|
-
console.log(` Log file: ${logFile}`);
|
|
117
|
-
} catch (error) {
|
|
118
|
-
console.error('✗ Failed to trigger coze-coding-dev-sdk update:', error);
|
|
119
|
-
console.log(' You can manually run: pnpm update coze-coding-dev-sdk');
|
|
120
|
-
}
|
|
121
|
-
},
|
|
122
63
|
};
|
|
123
64
|
|
|
124
65
|
export default config;
|
package/lib/cli.js
CHANGED
|
@@ -2114,7 +2114,7 @@ const EventBuilder = {
|
|
|
2114
2114
|
};
|
|
2115
2115
|
|
|
2116
2116
|
var name = "@coze-arch/cli";
|
|
2117
|
-
var version = "0.1.4-alpha.
|
|
2117
|
+
var version = "0.1.4-alpha.f69bb1";
|
|
2118
2118
|
var description = "coze coding devtools cli";
|
|
2119
2119
|
var license = "MIT";
|
|
2120
2120
|
var author = "fanwenjie.fe@bytedance.com";
|
|
@@ -9883,18 +9883,38 @@ const execute = async (
|
|
|
9883
9883
|
};
|
|
9884
9884
|
|
|
9885
9885
|
function _nullishCoalesce$2(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
|
|
9886
|
+
const getDependencyPreparationCommand = (projectPath) => {
|
|
9887
|
+
if (fs.existsSync(path.join(projectPath, 'scripts', 'prepare.sh'))) {
|
|
9888
|
+
return 'bash ./scripts/prepare.sh';
|
|
9889
|
+
}
|
|
9890
|
+
if (
|
|
9891
|
+
fs.existsSync(
|
|
9892
|
+
path.join(
|
|
9893
|
+
projectPath,
|
|
9894
|
+
'.cozeproj',
|
|
9895
|
+
'scripts',
|
|
9896
|
+
'prepare-node-modules.sh',
|
|
9897
|
+
),
|
|
9898
|
+
)
|
|
9899
|
+
) {
|
|
9900
|
+
return 'bash ./.cozeproj/scripts/prepare-node-modules.sh';
|
|
9901
|
+
}
|
|
9902
|
+
return 'pnpm install';
|
|
9903
|
+
};
|
|
9904
|
+
|
|
9886
9905
|
/**
|
|
9887
|
-
*
|
|
9906
|
+
* 优先通过模板提供的 wrapper 准备依赖。
|
|
9888
9907
|
*/
|
|
9889
|
-
const
|
|
9890
|
-
logger.info('\
|
|
9908
|
+
const prepareDependencies = (projectPath) => {
|
|
9909
|
+
logger.info('\nPreparing dependencies with the project wrapper...');
|
|
9891
9910
|
|
|
9892
|
-
const
|
|
9911
|
+
const command = getDependencyPreparationCommand(projectPath);
|
|
9912
|
+
const result = shelljs.exec(command, {
|
|
9893
9913
|
cwd: projectPath,
|
|
9894
9914
|
silent: true,
|
|
9895
9915
|
});
|
|
9896
9916
|
|
|
9897
|
-
// verbose
|
|
9917
|
+
// verbose 模式下输出依赖准备命令的详细日志
|
|
9898
9918
|
if (result.stdout) {
|
|
9899
9919
|
logger.verbose(result.stdout);
|
|
9900
9920
|
}
|
|
@@ -9903,11 +9923,11 @@ const runPnpmInstall = (projectPath) => {
|
|
|
9903
9923
|
}
|
|
9904
9924
|
|
|
9905
9925
|
if (result.code === 0) {
|
|
9906
|
-
logger.success('Dependencies
|
|
9926
|
+
logger.success('Dependencies prepared successfully!');
|
|
9907
9927
|
} else {
|
|
9908
9928
|
// 仅在失败时输出详细信息以便排查
|
|
9909
9929
|
const errorMessage = [
|
|
9910
|
-
|
|
9930
|
+
`${command} failed with exit code ${result.code}`,
|
|
9911
9931
|
result.stderr ? `\nStderr:\n${result.stderr}` : '',
|
|
9912
9932
|
result.stdout ? `\nStdout:\n${result.stdout}` : '',
|
|
9913
9933
|
]
|
|
@@ -10132,7 +10152,7 @@ const installDependenciesStep = ctx => {
|
|
|
10132
10152
|
try {
|
|
10133
10153
|
if (!skipInstall) {
|
|
10134
10154
|
if (ctx.hasPackageJson) {
|
|
10135
|
-
|
|
10155
|
+
prepareDependencies(ctx.absoluteOutputPath);
|
|
10136
10156
|
ctx.timer.logPhase('Dependencies installation');
|
|
10137
10157
|
} else {
|
|
10138
10158
|
logger.info(
|
|
@@ -10141,7 +10161,7 @@ const installDependenciesStep = ctx => {
|
|
|
10141
10161
|
}
|
|
10142
10162
|
}
|
|
10143
10163
|
} catch (error) {
|
|
10144
|
-
//
|
|
10164
|
+
// 捕获依赖准备失败的情况
|
|
10145
10165
|
installSuccess = false;
|
|
10146
10166
|
installErrorCode = 1;
|
|
10147
10167
|
installErrorType = 'execution_failed';
|
|
@@ -10228,7 +10248,9 @@ const startDevServerStep = ctx => {
|
|
|
10228
10248
|
logger.info('\nNext steps:');
|
|
10229
10249
|
logger.info(` cd ${ctx.outputPath}`);
|
|
10230
10250
|
if (skipInstall && ctx.hasPackageJson) {
|
|
10231
|
-
logger.info(
|
|
10251
|
+
logger.info(
|
|
10252
|
+
` ${getDependencyPreparationCommand(ctx.absoluteOutputPath)}`,
|
|
10253
|
+
);
|
|
10232
10254
|
}
|
|
10233
10255
|
if (skipGit) {
|
|
10234
10256
|
logger.info(' git init');
|
|
@@ -10340,7 +10362,7 @@ const registerCommand$1 = program => {
|
|
|
10340
10362
|
.argument('[directory]', 'Output directory for the project')
|
|
10341
10363
|
.requiredOption('-t, --template <name>', 'Template name')
|
|
10342
10364
|
.option('-o, --output <path>', 'Output directory', process.cwd())
|
|
10343
|
-
.option('--skip-install', 'Skip automatic
|
|
10365
|
+
.option('--skip-install', 'Skip automatic dependency preparation', false)
|
|
10344
10366
|
.option('--skip-git', 'Skip automatic git initialization', false)
|
|
10345
10367
|
.option(
|
|
10346
10368
|
'--skip-commit',
|
package/package.json
CHANGED