@anvil-works/anvil-cli 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "CLI tool for developing Anvil apps locally",
   "main": "dist/index.js",
   "types": "dist/api.d.ts",

package/scripts/install/install.ps1

@@ -151,6 +151,42 @@ function Warn-IfMissingGit {
     }
 }
 
+function Repair-LegacyNpmPrefix([string] $NpmCommand) {
+    try {
+        $currentPrefix = (& $NpmCommand config get prefix).Trim()
+    }
+    catch {
+        return
+    }
+
+    if ($currentPrefix -eq $NpmPrefix) {
+        Write-Info "Detected legacy anvil npm prefix in user config; restoring npm default prefix behavior."
+        try {
+            & $NpmCommand config delete prefix --location=user | Out-Null
+        }
+        catch {
+            # Best effort cleanup; install proceeds with process-local prefix either way.
+        }
+    }
+}
+
+function Install-AnvilCli([string] $NpmCommand) {
+    $previousPrefix = $env:NPM_CONFIG_PREFIX
+    $env:NPM_CONFIG_PREFIX = $NpmPrefix
+
+    try {
+        & $NpmCommand install -g @anvil-works/anvil-cli@latest
+    }
+    finally {
+        if ($null -eq $previousPrefix) {
+            Remove-Item Env:NPM_CONFIG_PREFIX -ErrorAction SilentlyContinue
+        }
+        else {
+            $env:NPM_CONFIG_PREFIX = $previousPrefix
+        }
+    }
+}
+
 function Main {
     Ensure-Directory -Path $AnvilHome
     Ensure-Directory -Path $NpmPrefix
@@ -164,10 +200,10 @@ function Main {
     Warn-IfMissingGit
 
     $npm = Ensure-Npm
+    Repair-LegacyNpmPrefix -NpmCommand $npm
 
     Write-Info 'Installing anvil-cli...'
-    & $npm config set prefix "$NpmPrefix"
-    & $npm install -g @anvil-works/anvil-cli@latest
+    Install-AnvilCli -NpmCommand $npm
 
     $anvilCmd = Join-Path $NpmPrefix 'anvil.cmd'
     if (-not (Test-Path -LiteralPath $anvilCmd)) {

package/scripts/install/install.sh

@@ -21,6 +21,27 @@ need_cmd() {
     command -v "$1" >/dev/null 2>&1 || fail "Required command not found: $1"
 }
 
+is_windows_posix() {
+    case "$(uname -s 2>/dev/null || true)" in
+        MINGW*|MSYS*|CYGWIN*) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+windows_posix_node_error() {
+    fail "Windows Git Bash installs require existing Node.js v20+ and npm. Use PowerShell instead: irm https://anvil.works/install-cli.ps1 | iex"
+}
+
+normalize_npm_prefix() {
+    prefix="$1"
+    if is_windows_posix && command -v cygpath >/dev/null 2>&1; then
+        cygpath -u "$prefix" 2>/dev/null || printf '%s\n' "$prefix"
+        return
+    fi
+
+    printf '%s\n' "$prefix"
+}
+
 warn_if_missing_git() {
     if ! command -v git >/dev/null 2>&1; then
         log "Warning: git was not found on PATH."
@@ -29,9 +50,26 @@ warn_if_missing_git() {
     fi
 }
 
+cleanup_legacy_npm_prefix() {
+    current_prefix="$(npm config get prefix 2>/dev/null | tr -d '\r' || true)"
+    [ -n "$current_prefix" ] || return 0
+
+    legacy_prefix="$NPM_PREFIX"
+    normalized_current_prefix="$(normalize_npm_prefix "$current_prefix")"
+    normalized_legacy_prefix="$(normalize_npm_prefix "$legacy_prefix")"
+    if [ "$current_prefix" = "$legacy_prefix" ] || [ "$normalized_current_prefix" = "$normalized_legacy_prefix" ]; then
+        log "Detected legacy anvil npm prefix in user config; restoring npm default prefix behavior."
+        npm config delete prefix --location=user >/dev/null 2>&1 || true
+    fi
+}
+
 append_path_export() {
     profile_file="$1"
-    line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+    if is_windows_posix; then
+        line='export PATH="$HOME/.anvil-cli/npm-global:$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+    else
+        line='export PATH="$HOME/.anvil-cli/npm-global/bin:$HOME/.anvil-cli/node-v20/bin:$PATH"'
+    fi
 
     [ -f "$profile_file" ] || touch "$profile_file"
     grep -F "$line" "$profile_file" >/dev/null 2>&1 || {
@@ -120,37 +158,64 @@ ensure_node() {
             log "Using existing Node.js $(node -v)"
             return
         fi
+        if is_windows_posix; then
+            windows_posix_node_error
+        fi
         log "Existing Node.js $(node -v) is too old; installing Node.js v20 user-local"
         install_node_v20
         return
     fi
 
+    if is_windows_posix; then
+        windows_posix_node_error
+    fi
     install_node_v20
 }
 
-main() {
-    need_cmd curl
-    need_cmd tar
+configure_current_path() {
+    if is_windows_posix; then
+        export PATH="$NPM_PREFIX:$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    else
+        export PATH="$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    fi
+}
+
+anvil_version() {
+    if command -v anvil >/dev/null 2>&1 && anvil --version 2>/dev/null; then
+        return 0
+    fi
+
+    if [ -f "$NPM_PREFIX/anvil" ] && "$NPM_PREFIX/anvil" --version 2>/dev/null; then
+        return 0
+    fi
+
+    if [ -f "$NPM_PREFIX/anvil.cmd" ] && "$NPM_PREFIX/anvil.cmd" --version 2>/dev/null; then
+        return 0
+    fi
+
+    if [ -x "$NPM_PREFIX/bin/anvil" ] && "$NPM_PREFIX/bin/anvil" --version 2>/dev/null; then
+        return 0
+    fi
 
+    return 1
+}
+
+main() {
     mkdir -p "$ANVIL_HOME" "$NPM_PREFIX"
 
     ensure_node
 
-    export PATH="$NPM_PREFIX/bin:$NODE_DIR/bin:$PATH"
+    configure_current_path
     persist_path_hint
 
     need_cmd npm
+    cleanup_legacy_npm_prefix
     warn_if_missing_git
 
     log "Installing anvil-cli..."
-    npm config set prefix "$NPM_PREFIX" >/dev/null
     NPM_CONFIG_PREFIX="$NPM_PREFIX" npm install -g @anvil-works/anvil-cli@latest
 
-    if command -v anvil >/dev/null 2>&1; then
-        version="$(anvil --version 2>/dev/null || true)"
-    elif [ -x "$NPM_PREFIX/bin/anvil" ]; then
-        version="$($NPM_PREFIX/bin/anvil --version 2>/dev/null || true)"
-    else
+    if ! version="$(anvil_version)"; then
         fail "anvil installed but command not found on PATH"
     fi