From 09c2e4ab78daf006bad46901de0f682d86e011ce Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 17 May 2024 21:39:38 +0530
Subject: [PATCH] [CPP, Typescript-Node] - Ubuntu-24.04 (noble) & 22-bookworm -
 updated (#256)

* [CPP, Typescript-Node] - Ubuntu-24.04 (noble) & 22-bookworm - updated

* more changes

* more changes

* misc change

* fileext change to js

* changes for comments ( review comments on PR )

* misc change

* changes as mentioned in comment
---
 src/cpp-mariadb/devcontainer-template.json    |  5 ++--
 src/cpp/devcontainer-template.json            |  5 ++--
 .../devcontainer-template.json                |  6 +++--
 test/typescript-node/.eslintrc.json           | 24 -------------------
 test/typescript-node/eslint.config.js         | 11 +++++++++
 test/typescript-node/test.sh                  |  2 +-
 6 files changed, 22 insertions(+), 31 deletions(-)
 delete mode 100644 test/typescript-node/.eslintrc.json
 create mode 100644 test/typescript-node/eslint.config.js

diff --git a/src/cpp-mariadb/devcontainer-template.json b/src/cpp-mariadb/devcontainer-template.json
index 1d13a85d..dabdae5a 100644
--- a/src/cpp-mariadb/devcontainer-template.json
+++ b/src/cpp-mariadb/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "cpp-mariadb",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "name": "C++ & MariaDB",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp-mariadb",
@@ -9,11 +9,12 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 22.04 on local arm64/Apple Silicon):",
+            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
             "proposals": [
 				"debian-12",
                 "debian-11",
                 "debian-10",
+				"ubuntu-24.04",
                 "ubuntu-22.04",
                 "ubuntu-20.04"
             ],
diff --git a/src/cpp/devcontainer-template.json b/src/cpp/devcontainer-template.json
index 7b3402c0..1016f616 100644
--- a/src/cpp/devcontainer-template.json
+++ b/src/cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "cpp",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "name": "C++",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp",
@@ -9,11 +9,12 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 22.04 on local arm64/Apple Silicon):",
+            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
             "proposals": [
 				"debian-12",
                 "debian-11",
                 "debian-10",
+				"ubuntu-24.04",
                 "ubuntu-22.04",
                 "ubuntu-20.04"
             ],
diff --git a/src/typescript-node/devcontainer-template.json b/src/typescript-node/devcontainer-template.json
index b8694f9a..5fcfe5d4 100644
--- a/src/typescript-node/devcontainer-template.json
+++ b/src/typescript-node/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "typescript-node",
-    "version": "3.1.0",
+    "version": "3.2.0",
     "name": "Node.js & TypeScript",
     "description": "Develop Node.js based applications in TypeScript. Includes Node.js, eslint, nvm, yarn, and the TypeScript compiler.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/typescript-node",
@@ -11,6 +11,8 @@
             "type": "string",
             "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+				"22-bookworm",
+				"22-bullseye",
 				"20-bookworm",
                 "18-bookworm",
 				"20-bullseye",
@@ -18,7 +20,7 @@
 				"20-buster",
                 "18-buster"
             ],
-            "default": "20-bullseye"
+            "default": "22-bookworm"
         }
     },
     "platforms": [
diff --git a/test/typescript-node/.eslintrc.json b/test/typescript-node/.eslintrc.json
deleted file mode 100644
index a3cfb273..00000000
--- a/test/typescript-node/.eslintrc.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-    }
-}
\ No newline at end of file
diff --git a/test/typescript-node/eslint.config.js b/test/typescript-node/eslint.config.js
new file mode 100644
index 00000000..571d5ce1
--- /dev/null
+++ b/test/typescript-node/eslint.config.js
@@ -0,0 +1,11 @@
+module.exports={
+    "rules": {
+        "no-console": 0,
+        "eqeqeq":"warn",
+        "no-cond-assign": 0,
+        "no-unused-vars": 1,
+        "no-extra-semi": "warn",
+        "semi": "warn"
+    },
+    ignorePatterns: ["**/node_modules/**"]
+};
\ No newline at end of file
diff --git a/test/typescript-node/test.sh b/test/typescript-node/test.sh
index 140b4452..c438519e 100755
--- a/test/typescript-node/test.sh
+++ b/test/typescript-node/test.sh
@@ -12,7 +12,7 @@ check "node" node --version
 sudo rm -f yarn.lock
 check "yarn" yarn install
 sudo rm -f package-lock.json
-check "eslint" eslint --no-eslintrc -c .eslintrc.json src/server.ts
+check "eslint" eslint --no-warn-ignored src/server.ts
 check "typescript" npm run compile
 check "test-project" npm run test
 npm config delete prefix