From 4443bb85e684e411f8caab3e4b5ebe6c3b6513d0 Mon Sep 17 00:00:00 2001
From: Jacob Hummer <jcbhmr@outlook.com>
Date: Thu, 17 Aug 2023 10:34:34 -0500
Subject: [PATCH] actually use dependsOn correctly

---
 .github/workflows/test-features.yml      | 2 +-
 src/prettier/devcontainer-feature.json   | 6 +++---
 src/prettier/install.sh                  | 1 -
 src/typescript/devcontainer-feature.json | 6 +++---
 src/typescript/install.sh                | 1 -
 test/prettier/scenarios.json             | 2 --
 test/typescript/scenarios.json           | 2 --
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test-features.yml b/.github/workflows/test-features.yml
index a1322b7..dd5ce59 100644
--- a/.github/workflows/test-features.yml
+++ b/.github/workflows/test-features.yml
@@ -36,4 +36,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: npm install -g @devcontainers/cli
-      - run: devcontainer features test -f ${{ matrix.id }} --skip-autogenerated
+      - run: devcontainer features test -f ${{ matrix.id }}
diff --git a/src/prettier/devcontainer-feature.json b/src/prettier/devcontainer-feature.json
index b08cd2f..bc0478b 100644
--- a/src/prettier/devcontainer-feature.json
+++ b/src/prettier/devcontainer-feature.json
@@ -19,7 +19,7 @@
             "type": "string"
         }
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/node"
-    ]
+    "dependsOn": {
+        "ghcr.io/devcontainers/features/node": {}
+    }
 }
diff --git a/src/prettier/install.sh b/src/prettier/install.sh
index 7bd69d4..6d50dbd 100644
--- a/src/prettier/install.sh
+++ b/src/prettier/install.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -ex
-command -v npm || echo "Needs ghcr.io/devcontainers/features/node or similar"
 
 npm install -g prettier@$VERSION
 
diff --git a/src/typescript/devcontainer-feature.json b/src/typescript/devcontainer-feature.json
index bef47b5..7f6efef 100644
--- a/src/typescript/devcontainer-feature.json
+++ b/src/typescript/devcontainer-feature.json
@@ -14,7 +14,7 @@
             "type": "string"
         }
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/node"
-    ]
+    "dependsOn": {
+        "ghcr.io/devcontainers/features/node": {}
+    }
 }
diff --git a/src/typescript/install.sh b/src/typescript/install.sh
index 072f291..c0956a9 100644
--- a/src/typescript/install.sh
+++ b/src/typescript/install.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 set -ex
-command -v npm || echo "Needs ghcr.io/devcontainers/features/node or similar"
 
 npm install -g typescript@$VERSION
diff --git a/test/prettier/scenarios.json b/test/prettier/scenarios.json
index c340f3f..3359975 100644
--- a/test/prettier/scenarios.json
+++ b/test/prettier/scenarios.json
@@ -2,14 +2,12 @@
   "base_ubuntu": {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
-      "ghcr.io/devcontainers/features/node": {},
       "prettier": {}
     }
   },
   "debian_slim": {
     "image": "debian:bookworm-slim",
     "features": {
-      "ghcr.io/devcontainers/features/node": {},
       "prettier": {}
     }
   }
diff --git a/test/typescript/scenarios.json b/test/typescript/scenarios.json
index f7d4183..370f6a6 100644
--- a/test/typescript/scenarios.json
+++ b/test/typescript/scenarios.json
@@ -2,14 +2,12 @@
   "base_ubuntu": {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
-      "ghcr.io/devcontainers/features/node": {},
       "typescript": {}
     }
   },
   "debian_slim": {
     "image": "debian:bookworm-slim",
     "features": {
-      "ghcr.io/devcontainers/features/node": {},
       "typescript": {}
     }
   }