actually use dependsOn correctly

devcontainers-community · Aug 17, 2023 · 4443bb8 · 4443bb8
1 parent 720396e
commit 4443bb8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": {}
     }
   }