@anvil-works/anvil-cli 0.6.1-canary.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anvil-works/anvil-cli",
-  "version": "0.6.1-canary.0",
+  "version": "0.6.2",
   "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

@@ -29,6 +29,17 @@ warn_if_missing_git() {
     fi
 }
 
+cleanup_legacy_npm_prefix() {
+    current_prefix="$(npm config get prefix 2>/dev/null || true)"
+    [ -n "$current_prefix" ] || return 0
+
+    legacy_prefix="$NPM_PREFIX"
+    if [ "$current_prefix" = "$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"'
@@ -42,7 +53,8 @@ append_path_export() {
 persist_path_hint() {
     append_path_export "$HOME/.profile"
 
-    shell_name="${SHELL##*/}"
+    shell_name="${SHELL:-}"
+    shell_name="${shell_name##*/}"
 
     if [ -n "${ZSH_VERSION:-}" ] || [ "$shell_name" = "zsh" ] || [ -f "$HOME/.zshrc" ]; then
         append_path_export "$HOME/.zshrc"
@@ -139,10 +151,10 @@ main() {
     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