From 29de45d41b9138050cb5847b8f6a1c9f1d3b32df Mon Sep 17 00:00:00 2001
From: Peter Solnica <peter@solnica.online>
Date: Fri, 9 Jan 2026 15:37:04 +0000
Subject: [PATCH 1/2] chore(devcontainer): use node from features

---
 .devcontainer/Dockerfile                | 9 ---------
 .devcontainer/devcontainer.json         | 7 +++----
 spec/apps/svelte-mini/package-lock.json | 5 +++++
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4108d189f..d083a7abc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -24,15 +24,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash -
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  nodejs \
-  chromium \
-  chromium-driver \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
 RUN echo "sentry ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/sentry \
   && chmod 0440 /etc/sudoers.d/sentry
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bf21c8d74..ee3f06219 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,17 +6,16 @@
   "features": {
     "ghcr.io/devcontainers/features/github-cli": {},
     "ghcr.io/nils-geistmann/devcontainers-features/zsh": {},
+    "ghcr.io/devcontainers/features/node:1": {},
     "ghcr.io/devcontainers-extra/features/npm-packages": {},
+    "ghcr.io/devcontainers/features/copilot-cli:1": {},
     "ghcr.io/rocker-org/devcontainer-features/apt-packages": {
       "packages": "inotify-tools"
     }
   },
   "customizations": {
     "vscode": {
-      "extensions": [
-        "sleistner.vscode-fileutils",
-        "Shopify.ruby-lsp"
-      ],
+      "extensions": ["sleistner.vscode-fileutils", "Shopify.ruby-lsp"],
       "editor.formatOnSaveMode": "modifications",
       "editor.formatOnSave": true,
       "rubyLsp.rubyVersionManager": {
diff --git a/spec/apps/svelte-mini/package-lock.json b/spec/apps/svelte-mini/package-lock.json
index 46ea6a5e3..38f5b0f33 100644
--- a/spec/apps/svelte-mini/package-lock.json
+++ b/spec/apps/svelte-mini/package-lock.json
@@ -827,6 +827,7 @@
       "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.1.2.tgz",
       "integrity": "sha512-7v+7OkUYelC2dhhYDAgX1qO2LcGscZ18Hi5kKzJQq7tQeXpH215dd0+J/HnX2zM5B3QKcIrTVqCGkZXAy5awYw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0",
         "debug": "^4.4.1",
@@ -869,6 +870,7 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1076,6 +1078,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -1163,6 +1166,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.3.2.tgz",
       "integrity": "sha512-a0vmqDZt91jRocPB4U+/o03w5p7ujknsSNvImeNRpfI06Rc/V8ObHmud9VomVlk2k2XnPTZcomtxb2H0kp5E6Q==",
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -1203,6 +1207,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.3.tgz",
       "integrity": "sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",

From 0c9231c4325824c7969b1d6d2a5974622d726e4b Mon Sep 17 00:00:00 2001
From: Peter Solnica <peter@solnica.online>
Date: Fri, 9 Jan 2026 15:42:06 +0000
Subject: [PATCH 2/2] chore(devcontainer): add 4.0 and update the rest

---
 .github/workflows/build_images.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index 943477cb1..444ac1f3a 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -28,9 +28,10 @@ jobs:
           - ruby:2.7.8-slim-bullseye
           - ruby:3.0.7-slim-bullseye
           - ruby:3.1.7-slim-bookworm
-          - ruby:3.2.9-slim-bookworm
-          - ruby:3.3.9-slim-bookworm
-          - ruby:3.4.5-slim-bookworm
+          - ruby:3.2.9-slim-trixie
+          - ruby:3.3.10-slim-trixie
+          - ruby:3.4.8-slim-trixie
+          - ruby:4.0.0-slim-trixie
 
     steps:
       - name: Check out current commit
@@ -67,8 +68,8 @@ jobs:
         id: build
         uses: getsentry/action-build-and-push-images@main
         with:
-          image_name: '${{ steps.image_name.outputs.short_name }}'
-          dockerfile_path: '.devcontainer/Dockerfile'
+          image_name: "${{ steps.image_name.outputs.short_name }}"
+          dockerfile_path: ".devcontainer/Dockerfile"
           ghcr: true
           publish_on_pr: true
           build_args: |