From 57b59b5bf209837db3ae911f2ca181f8f1dc2df7 Mon Sep 17 00:00:00 2001
From: Kyle Gottfried <6462596+Spitfire1900@users.noreply.github.com>
Date: Sun, 19 Apr 2026 20:07:12 -0400
Subject: [PATCH] Devcontainer / IDE updates (#2208)

---
 .devcontainer/devcontainer.json | 15 +++++++++++----
 .oxfmtrc.json                   | 10 +++++++++-
 .vscode/settings.json           |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0c4c30240ca6799e19f1d9c6aadec4d8e021e9ca..cc1f11cd8bafd74353d082567b86305fe625f46d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,15 +2,22 @@
   "name": "T3 Code Dev",
   "image": "debian:bookworm",
   "features": {
-    "ghcr.io/devcontainers-extra/features/bun:1": {},
+    "ghcr.io/devcontainers/features/git:1": {},
+    "ghcr.io/devcontainers-extra/features/bun:1": {
+      "version": "1.3.11"
+    },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "24",
-      "nodeGypDependencies": true
+      "version": "24.13.1"
     },
     "ghcr.io/devcontainers/features/python:1": {
-      "version": "3.12"
+      "version": "3.10",
+      "installTools": false
     }
   },
+  "overrideFeatureInstallOrder": [
+    "ghcr.io/devcontainers/features/git",
+    "ghcr.io/devcontainers-extra/features/bun"
+  ],
   "postCreateCommand": {
     "bun-install": "bun install --backend=copyfile --frozen-lockfile"
   },
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index dded6b0acde9f27a5f10300e624444acb35c4fa6..3d65d9c93bba0cd8732a5fd89c768bcb54ae13c4 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -13,5 +13,13 @@
     "apps/web/src/lib/vendor/qrcodegen.ts",
     "*.icon/**"
   ],
-  "sortPackageJson": {}
+  "sortPackageJson": {},
+  "overrides": [
+    {
+      "files": [".devcontainer/devcontainer.json"],
+      "options": {
+        "trailingComma": "none"
+      }
+    }
+  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 752d9a90713e78fab605774a1976117166b672bd..8a1b614ddd97fbb6d04b6f805517b3292f18a594 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,5 @@
     "source.fixAll.oxc": "always"
   },
   "oxc.unusedDisableDirectives": "warn",
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "js/ts.tsdk.path": "node_modules/typescript/lib"
 }
-- 
2.54.0