From fa6a69ea600c44af30d0afad56dcff4f0b69a3ef Mon Sep 17 00:00:00 2001
From: Jordan Jensen <jordan.jensen@rstudio.com>
Date: Fri, 3 May 2024 16:42:14 -0700
Subject: [PATCH] Only use root level npm install

Remove vscode deps ref
---
 .github/workflows/lint.yaml                  |  1 -
 extensions/vscode/justfile                   | 19 -------------------
 extensions/vscode/webviews/homeView/justfile | 13 -------------
 justfile                                     |  6 +++---
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index f65e867ff..ab0e362cb 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -14,7 +14,6 @@ jobs:
       - run: just npm-install
       - run: just check-format
 
-      - run: just vscode deps
       - run: just vscode lint
 
       - run: just web install
diff --git a/extensions/vscode/justfile b/extensions/vscode/justfile
index 221ccb825..98b27e5fd 100644
--- a/extensions/vscode/justfile
+++ b/extensions/vscode/justfile
@@ -58,30 +58,11 @@ clean:
     rm -rf out
     just ./webviews/homeView/clean
 
-
-# Install dependencies
-deps:
-    #!/usr/bin/env bash
-    set -eou pipefail
-    {{ _with_debug }}
-
-    if [ {{ _ci }} = "true" ]; then
-        npm ci --no-audit --no-fund | sed 's/^/debug: /'
-        npm --prefix ./webviews/homeView ci --no-audit --no-fund | sed 's/^/debug: /'
-    else
-        npm install --no-audit --no-fund | sed 's/^/debug: /'
-        npm --prefix ./webviews/homeView install --no-audit --no-fund | sed 's/^/debug: /'
-    fi
-    just ./webviews/homeView/deps
-
-
 configure os="$(just ../../os)" arch="$(just ../../arch)":
     #!/usr/bin/env bash
     set -eou pipefail
     {{ _with_debug }}
 
-    just deps
-
     echo "info: checking for compatible binary executable..." 1>&2
     binary_executable=$(just ../../executable-path {{ os }} {{ arch }})
     if ! [ -f "$binary_executable" ]; then
diff --git a/extensions/vscode/webviews/homeView/justfile b/extensions/vscode/webviews/homeView/justfile
index de5a98cb2..19782708b 100644
--- a/extensions/vscode/webviews/homeView/justfile
+++ b/extensions/vscode/webviews/homeView/justfile
@@ -17,16 +17,3 @@ clean:
     {{ _with_debug }}
 
     rm -rf node_modules
-    
-
-# Install dependencies
-deps:
-    #!/usr/bin/env bash
-    set -eou pipefail
-    {{ _with_debug }}
-
-    if [ {{ _ci }} = "true" ]; then
-        npm ci --no-audit --no-fund | sed 's/^/debug: /'
-    else
-        npm install --no-audit --no-fund | sed 's/^/debug: /'
-    fi
diff --git a/justfile b/justfile
index bbd987bed..59c431d54 100644
--- a/justfile
+++ b/justfile
@@ -178,9 +178,9 @@ npm-install:
     {{ _with_debug }}
 
     if [ {{ _ci }} = "true" ]; then
-        npm ci --no-audit --no-fund
+        npm ci --no-audit --no-fund | sed 's/^/debug: /'
     else
-        npm install --no-audit --no-fund
+        npm install --no-audit --no-fund | sed 's/^/debug: /'
     fi
 
 # staticcheck, vet, and format check
@@ -215,7 +215,7 @@ name:
 
     basename {{ _cmd }}
 
-package:
+package: npm-install
     #!/usr/bin/env bash
     set -eou pipefail
     {{ _with_debug }}