@anvil-works/anvil-cli 0.8.0 → 0.9.0-canary.0
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/README.md +36 -2
- package/dist/CLILogger.d.ts +8 -41
- package/dist/CLILogger.d.ts.map +1 -1
- package/dist/WatchSession.d.ts.map +1 -1
- package/dist/cli.js +438 -376
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/convertTemplate.d.ts.map +1 -1
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/deps.d.ts.map +1 -1
- package/dist/commands/env.d.ts.map +1 -1
- package/dist/commands/gitAuth.d.ts.map +1 -1
- package/dist/commands/version.d.ts.map +1 -1
- package/dist/commands/watch.d.ts.map +1 -1
- package/dist/index.js +218 -77
- package/dist/logger.d.ts +61 -5
- package/dist/logger.d.ts.map +1 -1
- package/dist/program.d.ts.map +1 -1
- package/dist/programBase.d.ts.map +1 -1
- package/dist/services/node-runtime.d.ts +9 -0
- package/dist/services/node-runtime.d.ts.map +1 -0
- package/dist/services/oauth-login.d.ts.map +1 -1
- package/dist/watch/SaveProcessor.d.ts +3 -5
- package/dist/watch/SaveProcessor.d.ts.map +1 -1
- package/dist/watch/SyncManager.d.ts +2 -0
- package/dist/watch/SyncManager.d.ts.map +1 -1
- package/package.json +1 -1
- package/scripts/install/install.cmd +11 -1
- package/scripts/install/install.ps1 +59 -43
- package/scripts/install/install.sh +108 -33
|
@@ -4,9 +4,12 @@
|
|
|
4
4
|
set -eu
|
|
5
5
|
|
|
6
6
|
ANVIL_HOME="${ANVIL_HOME:-$HOME/.anvil-cli}"
|
|
7
|
-
|
|
7
|
+
mkdir -p "$ANVIL_HOME"
|
|
8
|
+
ANVIL_HOME="$(cd "$ANVIL_HOME" && pwd -P)"
|
|
9
|
+
NODE_DIR="$ANVIL_HOME/node-v24"
|
|
8
10
|
NPM_PREFIX="$ANVIL_HOME/npm-global"
|
|
9
|
-
|
|
11
|
+
USE_MANAGED_NODE=1
|
|
12
|
+
INSTALL_NODE=0
|
|
10
13
|
|
|
11
14
|
log() {
|
|
12
15
|
printf '%s\n' "$*"
|
|
@@ -29,7 +32,10 @@ is_windows_posix() {
|
|
|
29
32
|
}
|
|
30
33
|
|
|
31
34
|
windows_posix_node_error() {
|
|
32
|
-
fail "Windows Git Bash
|
|
35
|
+
fail "Windows Git Bash requires Node.js 22, 24 or 26 LTS and npm.
|
|
36
|
+
Install/update Node.js yourself: https://nodejs.org/en/download
|
|
37
|
+
Or use PowerShell to install a private Node.js 24 copy and add it to PATH:
|
|
38
|
+
& ([scriptblock]::Create((irm https://anvil.works/install-cli.ps1))) -InstallNode"
|
|
33
39
|
}
|
|
34
40
|
|
|
35
41
|
normalize_npm_prefix() {
|
|
@@ -66,15 +72,49 @@ cleanup_legacy_npm_prefix() {
|
|
|
66
72
|
append_path_export() {
|
|
67
73
|
profile_file="$1"
|
|
68
74
|
if is_windows_posix; then
|
|
69
|
-
line='export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-
|
|
75
|
+
line='export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v24/bin:$PATH"'
|
|
76
|
+
if [ "${USE_MANAGED_NODE:-1}" -eq 0 ]; then
|
|
77
|
+
line='export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$PATH"'
|
|
78
|
+
fi
|
|
70
79
|
else
|
|
71
|
-
line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-
|
|
80
|
+
line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v24/bin:$PATH"'
|
|
81
|
+
if [ "${USE_MANAGED_NODE:-1}" -eq 0 ]; then
|
|
82
|
+
line='export PATH="$HOME/.anvil-cli/npm-global/bin:$PATH"'
|
|
83
|
+
fi
|
|
84
|
+
fi
|
|
85
|
+
|
|
86
|
+
system_node_line="$line"
|
|
87
|
+
managed_node_line="$line"
|
|
88
|
+
if [ "$ANVIL_HOME" != "$(cd "$HOME" && pwd -P)/.anvil-cli" ]; then
|
|
89
|
+
saved_path="$NPM_PREFIX/bin"
|
|
90
|
+
if is_windows_posix; then
|
|
91
|
+
saved_path="$NPM_PREFIX:$saved_path"
|
|
92
|
+
fi
|
|
93
|
+
# Single-quote the actual custom location when saving it as shell code.
|
|
94
|
+
saved_path="$(printf '%s' "$saved_path" | sed "s/'/'\\\\''/g")"
|
|
95
|
+
saved_node_path="$(printf '%s' "$NODE_DIR/bin" | sed "s/'/'\\\\''/g")"
|
|
96
|
+
system_node_line="export PATH='$saved_path':\$PATH"
|
|
97
|
+
managed_node_line="export PATH='$saved_path:$saved_node_path':\$PATH"
|
|
98
|
+
line="$system_node_line"
|
|
99
|
+
if [ "${USE_MANAGED_NODE:-1}" -eq 1 ]; then
|
|
100
|
+
line="$managed_node_line"
|
|
101
|
+
fi
|
|
72
102
|
fi
|
|
73
103
|
|
|
74
104
|
[ -f "$profile_file" ] || touch "$profile_file"
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
105
|
+
profile_tmp="$(mktemp)"
|
|
106
|
+
# Replace only the exact PATH exports written by these installers.
|
|
107
|
+
grep -Fvx \
|
|
108
|
+
-e 'export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"' \
|
|
109
|
+
-e 'export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"' \
|
|
110
|
+
-e 'export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v24/bin:$PATH"' \
|
|
111
|
+
-e 'export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v24/bin:$PATH"' \
|
|
112
|
+
-e 'export PATH="$HOME/.anvil-cli/npm-global/bin:$PATH"' \
|
|
113
|
+
-e 'export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$PATH"' \
|
|
114
|
+
-e "$system_node_line" -e "$managed_node_line" "$profile_file" > "$profile_tmp" || [ "$?" -eq 1 ]
|
|
115
|
+
printf '%s\n' "$line" >> "$profile_tmp"
|
|
116
|
+
cat "$profile_tmp" > "$profile_file"
|
|
117
|
+
rm -f "$profile_tmp"
|
|
78
118
|
}
|
|
79
119
|
|
|
80
120
|
persist_path_hint() {
|
|
@@ -109,26 +149,29 @@ detect_platform() {
|
|
|
109
149
|
esac
|
|
110
150
|
}
|
|
111
151
|
|
|
112
|
-
|
|
113
|
-
node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/'
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
install_node_v20() {
|
|
152
|
+
install_node_v24() {
|
|
117
153
|
detect_platform
|
|
118
154
|
need_cmd curl
|
|
119
155
|
need_cmd tar
|
|
120
156
|
|
|
121
|
-
base_url="https://nodejs.org/dist/latest-
|
|
157
|
+
base_url="https://nodejs.org/dist/latest-v24.x"
|
|
122
158
|
sums_url="$base_url/SHASUMS256.txt"
|
|
123
159
|
tmp_dir="$(mktemp -d)"
|
|
124
160
|
trap 'rm -rf "$tmp_dir"' EXIT INT TERM
|
|
125
161
|
|
|
126
|
-
log "Installing Node.js v20 for $platform_os-$platform_arch..."
|
|
127
162
|
curl -fsSL "$sums_url" -o "$tmp_dir/SHASUMS256.txt"
|
|
128
163
|
|
|
129
|
-
archive_name="$(grep -E "node-
|
|
164
|
+
archive_name="$(grep -E "node-v24\\.[0-9]+\\.[0-9]+-$platform_os-$platform_arch\\.tar\\.xz$" "$tmp_dir/SHASUMS256.txt" | awk '{print $2}' | head -n1)"
|
|
130
165
|
[ -n "$archive_name" ] || fail "Could not resolve Node.js archive for $platform_os-$platform_arch"
|
|
131
166
|
|
|
167
|
+
latest_version="${archive_name#node-}"
|
|
168
|
+
latest_version="${latest_version%-$platform_os-$platform_arch.tar.xz}"
|
|
169
|
+
if [ -x "$NODE_DIR/bin/node" ] && [ "$("$NODE_DIR/bin/node" -v)" = "$latest_version" ]; then
|
|
170
|
+
log "Using current bundled Node.js $latest_version"
|
|
171
|
+
return
|
|
172
|
+
fi
|
|
173
|
+
|
|
174
|
+
log "Installing Node.js $latest_version for $platform_os-$platform_arch..."
|
|
132
175
|
archive_url="$base_url/$archive_name"
|
|
133
176
|
archive_path="$tmp_dir/$archive_name"
|
|
134
177
|
|
|
@@ -146,37 +189,61 @@ install_node_v20() {
|
|
|
146
189
|
log "Warning: no sha256 tool found; skipping checksum verification"
|
|
147
190
|
fi
|
|
148
191
|
|
|
192
|
+
mkdir -p "$tmp_dir/node"
|
|
193
|
+
tar -xJf "$archive_path" -C "$tmp_dir/node" --strip-components=1
|
|
149
194
|
rm -rf "$NODE_DIR"
|
|
150
|
-
|
|
151
|
-
tar -xJf "$archive_path" -C "$NODE_DIR" --strip-components=1
|
|
195
|
+
mv "$tmp_dir/node" "$NODE_DIR"
|
|
152
196
|
}
|
|
153
197
|
|
|
154
198
|
ensure_node() {
|
|
199
|
+
found_version="Node.js was not found"
|
|
155
200
|
if command -v node >/dev/null 2>&1; then
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
201
|
+
node_path="$(command -v node)"
|
|
202
|
+
case "$node_path" in
|
|
203
|
+
*/*) node_path="$(cd "${node_path%/*}" && pwd -P)/${node_path##*/}" ;;
|
|
204
|
+
esac
|
|
205
|
+
case "$node_path" in
|
|
206
|
+
"$NODE_DIR/bin/node"|"$ANVIL_HOME/node-v20/bin/node"|"$NODE_DIR/node"|"$NODE_DIR/node.exe"|"$ANVIL_HOME/node-v20/node"|"$ANVIL_HOME/node-v20/node.exe")
|
|
207
|
+
if is_windows_posix; then
|
|
208
|
+
fail "Updating bundled Node.js on Windows requires PowerShell: irm https://anvil.works/install-cli.ps1 | iex"
|
|
209
|
+
fi
|
|
210
|
+
install_node_v24
|
|
211
|
+
return
|
|
212
|
+
;;
|
|
213
|
+
esac
|
|
214
|
+
node_version="$(node -v 2>/dev/null)" || node_version=""
|
|
215
|
+
major="$(printf '%s\n' "$node_version" | sed -E 's/^v([0-9]+).*/\1/')"
|
|
216
|
+
case "$major" in
|
|
217
|
+
22|24|26)
|
|
218
|
+
USE_MANAGED_NODE=0
|
|
219
|
+
log "Using existing Node.js $node_version"
|
|
220
|
+
return
|
|
221
|
+
;;
|
|
222
|
+
esac
|
|
223
|
+
found_version="detected Node.js ${node_version:-(version unavailable)}"
|
|
167
224
|
fi
|
|
168
225
|
|
|
169
226
|
if is_windows_posix; then
|
|
170
227
|
windows_posix_node_error
|
|
171
228
|
fi
|
|
172
|
-
|
|
229
|
+
if [ "$INSTALL_NODE" -eq 1 ]; then
|
|
230
|
+
install_node_v24
|
|
231
|
+
return
|
|
232
|
+
fi
|
|
233
|
+
fail "Anvil CLI requires Node.js 22, 24 or 26 LTS; $found_version.
|
|
234
|
+
Install/update Node.js yourself: https://nodejs.org/en/download
|
|
235
|
+
Or install a private Node.js 24 copy and add it to PATH:
|
|
236
|
+
curl -fsSL https://anvil.works/install-cli.sh | sh -s -- --install-node"
|
|
173
237
|
}
|
|
174
238
|
|
|
175
239
|
configure_current_path() {
|
|
240
|
+
if [ "$USE_MANAGED_NODE" -eq 1 ]; then
|
|
241
|
+
PATH="$NODE_DIR/bin:$PATH"
|
|
242
|
+
fi
|
|
176
243
|
if is_windows_posix; then
|
|
177
|
-
export PATH="$NPM_PREFIX:$NPM_PREFIX/bin:$
|
|
244
|
+
export PATH="$NPM_PREFIX:$NPM_PREFIX/bin:$PATH"
|
|
178
245
|
else
|
|
179
|
-
export PATH="$NPM_PREFIX/bin:$
|
|
246
|
+
export PATH="$NPM_PREFIX/bin:$PATH"
|
|
180
247
|
fi
|
|
181
248
|
}
|
|
182
249
|
|
|
@@ -201,7 +268,13 @@ anvil_version() {
|
|
|
201
268
|
}
|
|
202
269
|
|
|
203
270
|
main() {
|
|
204
|
-
|
|
271
|
+
for arg in "$@"; do
|
|
272
|
+
case "$arg" in
|
|
273
|
+
--install-node) INSTALL_NODE=1 ;;
|
|
274
|
+
*) fail "Unknown option: $arg" ;;
|
|
275
|
+
esac
|
|
276
|
+
done
|
|
277
|
+
mkdir -p "$NPM_PREFIX"
|
|
205
278
|
|
|
206
279
|
ensure_node
|
|
207
280
|
|
|
@@ -219,6 +292,8 @@ main() {
|
|
|
219
292
|
fail "anvil installed but command not found on PATH"
|
|
220
293
|
fi
|
|
221
294
|
|
|
295
|
+
rm -rf "$ANVIL_HOME/node-v20"
|
|
296
|
+
|
|
222
297
|
log ""
|
|
223
298
|
log "anvil-cli installed successfully${version:+ (v$version)}"
|
|
224
299
|
log "Next steps: run 'anvil configure' or 'anvil checkout'"
|