From 3a158a8f454255b11e385cda69e3c9f583265aa6 Mon Sep 17 00:00:00 2001
From: Neil Enns <info@neilenns.com>
Date: Tue, 29 Apr 2025 10:24:09 +0000
Subject: [PATCH] fix(deps): Update devcontainer.json to node 18

---
 .devcontainer/Dockerfile        | 16 ----------------
 .devcontainer/devcontainer.json | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 3960a783..00000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.222.0/containers/javascript-node/.devcontainer/base.Dockerfile
-
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
-ARG VARIANT="16-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment if you want to install an additional version of node using nvm
-# ARG EXTRA_NODE_VERSION=10
-# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
-
-# [Optional] Uncomment if you want to install more global node modules
-RUN su node -c "npm install -g pnpm"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e5dcaeae..b8c009ce 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,19 +2,20 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.222.0/containers/javascript-node
 {
   "name": "Node.js",
-  "build": {
-    "dockerfile": "Dockerfile",
-    // Update 'VARIANT' to pick a Node version: 16, 14, 12.
-    // Append -bullseye or -buster to pin to an OS version.
-    // Use -bullseye variants on local arm64/Apple Silicon.
-    "args": { "VARIANT": "16-bullseye" }
-  },
+ 
+  "image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
+
+  "customizations": {
+    // Set *default* container specific settings.json values on container create.
+    "settings": {},
 
-  // Set *default* container specific settings.json values on container create.
-  "settings": {},
+    // Add the IDs of extensions you want installed when the container is created.
+    "extensions": ["dbaeumer.vscode-eslint"],
 
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": ["dbaeumer.vscode-eslint"],
+    "features": {
+      "ghcr.io/devcontainers-extra/features/pnpm:2": {}
+    }
+  },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],