From 023b9c8a10b7acc2927357b0dc14e8eb976aa507 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 9 May 2024 03:03:29 +0000
Subject: [PATCH 1/3] [node]-22-bookworm release changes

---
 src/javascript-node-mongo/devcontainer-template.json    | 3 ++-
 src/javascript-node-postgres/devcontainer-template.json | 3 ++-
 src/javascript-node/devcontainer-template.json          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/javascript-node-mongo/devcontainer-template.json b/src/javascript-node-mongo/devcontainer-template.json
index 4dad2a38..567dd311 100644
--- a/src/javascript-node-mongo/devcontainer-template.json
+++ b/src/javascript-node-mongo/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-mongo",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "name": "Node.js & Mongo DB",
     "description": "Develop applications in Node.js and Mongo DB. Includes Node.js, eslint, and yarn in a container linked to a Mongo DB.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-mongo",
@@ -11,6 +11,7 @@
             "type": "string",
             "description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+				"22-bookworm",
 				"20-bullseye",
                 "18-bullseye",
 				"20-buster",
diff --git a/src/javascript-node-postgres/devcontainer-template.json b/src/javascript-node-postgres/devcontainer-template.json
index 4270cfe7..f0fc2c2d 100644
--- a/src/javascript-node-postgres/devcontainer-template.json
+++ b/src/javascript-node-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-postgres",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "name": "Node.js & PostgreSQL",
     "description": "Develop applications in Node.js and PostgreSQL. Includes Node.js, eslint, and yarn in a container linked to a Postgres DB container",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-postgres",
@@ -11,6 +11,7 @@
             "type": "string",
             "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+				"22-bookworm",
 				"20-bookworm",
                 "18-bookworm",
 				"20-bullseye",
diff --git a/src/javascript-node/devcontainer-template.json b/src/javascript-node/devcontainer-template.json
index 354ba10f..26937d1c 100644
--- a/src/javascript-node/devcontainer-template.json
+++ b/src/javascript-node/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "name": "Node.js & JavaScript",
     "description": "Develop Node.js based applications. Includes Node.js, eslint, nvm, and yarn.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node",
@@ -11,6 +11,7 @@
             "type": "string",
             "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+				"22-bookworm",
 				"20-bookworm",
                 "18-bookworm",
 				"20-bullseye",

From 94a22733eaa358457a0e23afdcfdf954cd7b808c Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 10 May 2024 05:08:15 +0000
Subject: [PATCH 2/3] changes as required in comments

---
 src/javascript-node-mongo/devcontainer-template.json    | 6 ++++--
 src/javascript-node-postgres/devcontainer-template.json | 6 ++++--
 src/javascript-node/devcontainer-template.json          | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/javascript-node-mongo/devcontainer-template.json b/src/javascript-node-mongo/devcontainer-template.json
index 567dd311..6c93f8a9 100644
--- a/src/javascript-node-mongo/devcontainer-template.json
+++ b/src/javascript-node-mongo/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-mongo",
-    "version": "3.1.1",
+    "version": "3.2.0",
     "name": "Node.js & Mongo DB",
     "description": "Develop applications in Node.js and Mongo DB. Includes Node.js, eslint, and yarn in a container linked to a Mongo DB.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-mongo",
@@ -12,12 +12,14 @@
             "description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
 				"22-bookworm",
+				"22-bullseye",
+				"20-bookworm",
 				"20-bullseye",
                 "18-bullseye",
 				"20-buster",
                 "18-buster"
             ],
-            "default": "20-bullseye"
+            "default": "22-bookworm"
         }
     },
     "platforms": [
diff --git a/src/javascript-node-postgres/devcontainer-template.json b/src/javascript-node-postgres/devcontainer-template.json
index f0fc2c2d..2a4280ce 100644
--- a/src/javascript-node-postgres/devcontainer-template.json
+++ b/src/javascript-node-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-postgres",
-    "version": "3.1.1",
+    "version": "3.2.0",
     "name": "Node.js & PostgreSQL",
     "description": "Develop applications in Node.js and PostgreSQL. Includes Node.js, eslint, and yarn in a container linked to a Postgres DB container",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-postgres",
@@ -12,14 +12,16 @@
             "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
 				"22-bookworm",
+				"22-bullseye",
 				"20-bookworm",
+				"20-bullseye",
                 "18-bookworm",
 				"20-bullseye",
                 "18-bullseye",
 				"20-buster",
                 "18-buster"
             ],
-            "default": "20-bullseye"
+            "default": "22-bookworm"
         }
     },
     "platforms": [
diff --git a/src/javascript-node/devcontainer-template.json b/src/javascript-node/devcontainer-template.json
index 26937d1c..698847de 100644
--- a/src/javascript-node/devcontainer-template.json
+++ b/src/javascript-node/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node",
-    "version": "3.1.1",
+    "version": "3.2.0",
     "name": "Node.js & JavaScript",
     "description": "Develop Node.js based applications. Includes Node.js, eslint, nvm, and yarn.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node",
@@ -12,14 +12,16 @@
             "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
 				"22-bookworm",
+				"22-bullseye",
 				"20-bookworm",
+				"20-bullseye",
                 "18-bookworm",
 				"20-bullseye",
                 "18-bullseye",
 				"20-buster",
                 "18-buster"
             ],
-            "default": "20-bullseye"
+            "default": "22-bookworm"
         }
     },
     "platforms": [

From 8937a84dbe996a1cbffb74663aebe460ab14feab Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 10 May 2024 05:18:44 +0000
Subject: [PATCH 3/3] changes for tests failing

---
 test/javascript-node-mongo/.eslintrc.json     | 21 -------------------
 test/javascript-node-mongo/eslint.config.js   | 10 +++++++++
 test/javascript-node-postgres/.eslintrc.json  | 21 -------------------
 .../javascript-node-postgres/eslint.config.js | 10 +++++++++
 test/javascript-node/.eslintrc.json           | 21 -------------------
 test/javascript-node/eslint.config.js         | 10 +++++++++
 6 files changed, 30 insertions(+), 63 deletions(-)
 delete mode 100644 test/javascript-node-mongo/.eslintrc.json
 create mode 100644 test/javascript-node-mongo/eslint.config.js
 delete mode 100644 test/javascript-node-postgres/.eslintrc.json
 create mode 100644 test/javascript-node-postgres/eslint.config.js
 delete mode 100644 test/javascript-node/.eslintrc.json
 create mode 100644 test/javascript-node/eslint.config.js

diff --git a/test/javascript-node-mongo/.eslintrc.json b/test/javascript-node-mongo/.eslintrc.json
deleted file mode 100644
index 998c6b91..00000000
--- a/test/javascript-node-mongo/.eslintrc.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"root": true,
-	"env": {
-		"node":true
-	},
-	"rules": {
-		"no-console": 0,
-		"eqeqeq":"warn",
-		"no-cond-assign": 0,
-		"no-unused-vars": 1,
-		"no-extra-semi": "warn",
-		"semi": "warn"
-	},
-	"extends": "eslint:recommended",
-	"parserOptions": {
-		"ecmaVersion": 2017,
-		"ecmaFeatures": {
-			"experimentalObjectRestSpread": true
-		}
-	}
-}
diff --git a/test/javascript-node-mongo/eslint.config.js b/test/javascript-node-mongo/eslint.config.js
new file mode 100644
index 00000000..b54e0189
--- /dev/null
+++ b/test/javascript-node-mongo/eslint.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+    "rules": {
+        "no-console": 0,
+        "eqeqeq":"warn",
+        "no-cond-assign": 0,
+        "no-unused-vars": 1,
+        "no-extra-semi": "warn",
+        "semi": "warn"
+    }
+};
\ No newline at end of file
diff --git a/test/javascript-node-postgres/.eslintrc.json b/test/javascript-node-postgres/.eslintrc.json
deleted file mode 100644
index 998c6b91..00000000
--- a/test/javascript-node-postgres/.eslintrc.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"root": true,
-	"env": {
-		"node":true
-	},
-	"rules": {
-		"no-console": 0,
-		"eqeqeq":"warn",
-		"no-cond-assign": 0,
-		"no-unused-vars": 1,
-		"no-extra-semi": "warn",
-		"semi": "warn"
-	},
-	"extends": "eslint:recommended",
-	"parserOptions": {
-		"ecmaVersion": 2017,
-		"ecmaFeatures": {
-			"experimentalObjectRestSpread": true
-		}
-	}
-}
diff --git a/test/javascript-node-postgres/eslint.config.js b/test/javascript-node-postgres/eslint.config.js
new file mode 100644
index 00000000..b54e0189
--- /dev/null
+++ b/test/javascript-node-postgres/eslint.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+    "rules": {
+        "no-console": 0,
+        "eqeqeq":"warn",
+        "no-cond-assign": 0,
+        "no-unused-vars": 1,
+        "no-extra-semi": "warn",
+        "semi": "warn"
+    }
+};
\ No newline at end of file
diff --git a/test/javascript-node/.eslintrc.json b/test/javascript-node/.eslintrc.json
deleted file mode 100644
index 6144597b..00000000
--- a/test/javascript-node/.eslintrc.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"root": true,
-	"env": {
-		"node": true,
-		"es6": true
-	},
-	"rules": {
-		"no-console": 0,
-		"eqeqeq":"warn",
-		"no-cond-assign": 0,
-		"no-unused-vars": 1,
-		"no-extra-semi": "warn",
-		"semi": "warn"
-	},
-	"extends": "eslint:recommended",
-	"parserOptions": {
-		"ecmaFeatures": {
-			"experimentalObjectRestSpread": true
-		}
-	}
-}
diff --git a/test/javascript-node/eslint.config.js b/test/javascript-node/eslint.config.js
new file mode 100644
index 00000000..b54e0189
--- /dev/null
+++ b/test/javascript-node/eslint.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+    "rules": {
+        "no-console": 0,
+        "eqeqeq":"warn",
+        "no-cond-assign": 0,
+        "no-unused-vars": 1,
+        "no-extra-semi": "warn",
+        "semi": "warn"
+    }
+};
\ No newline at end of file