From 720b2320c5012d36c6f8039235afd884d3bfb6d9 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Wed, 10 Jun 2026 15:13:18 +0100
Subject: [PATCH] chore: update Dockerfile and devcontainer configuration to
 include NX version and enhance VSCode settings

---
 .devcontainer/Dockerfile        | 10 +++++++++-
 .devcontainer/devcontainer.json | 23 ++++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3f1188972a..b10e168d26 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,7 +2,15 @@ ARG VARIANT=24-bookworm
 FROM mcr.microsoft.com/devcontainers/javascript-node:${VARIANT}
 
 ARG PNPM_VERSION=11.5.0
+ARG NX_VERSION=22.7.4
+
+ENV PNPM_HOME=/home/node/.local/share/pnpm
+ENV PNPM_GLOBAL_BIN=/home/node/.local/share/pnpm/bin
+ENV PATH=${PNPM_HOME}:${PNPM_GLOBAL_BIN}:${PATH}
 
 # Configure Corepack-managed pnpm globally at image build time.
 RUN corepack enable \
-    && corepack prepare pnpm@${PNPM_VERSION} --activate
+    && corepack prepare pnpm@${PNPM_VERSION} --activate \
+    && mkdir -p ${PNPM_HOME} ${PNPM_GLOBAL_BIN} \
+    && chown -R node:node /home/node/.local \
+    && su node -c "pnpm config set global-bin-dir ${PNPM_GLOBAL_BIN} && pnpm add --global nx@${NX_VERSION}"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 143d0964f7..fed5017669 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,7 +8,8 @@
     "context": "..",
     "args": {
       "VARIANT": "24-bookworm",
-      "PNPM_VERSION": "11.5.0"
+      "PNPM_VERSION": "11.5.0",
+      "NX_VERSION": "22.7.4"
     }
   },
 
@@ -22,8 +23,24 @@
 
   "customizations": {
     "vscode": {
-      "settings": {},
-      "extensions": ["streetsidesoftware.code-spell-checker"]
+      "settings": {
+        "stylelint.enable": true,
+        "css.validate": false,
+        "scss.validate": false,
+        "stylelint.configFile": "${workspaceFolder}/.stylelintrc.json",
+        "stylelint.configBasedir": "${workspaceFolder}",
+        "stylelint.validate": ["css", "less", "postcss", "scss"],
+        "editor.guides.indentation": true
+      },
+      "extensions": [
+        "streetsidesoftware.code-spell-checker",
+        "dbaeumer.vscode-eslint",
+        "angular.ng-template",
+        "esbenp.prettier-vscode",
+        "nrwl.angular-console",
+        "editorconfig.editorconfig",
+        "stylelint.vscode-stylelint"
+      ]
     }
   },