From df2bab6af3ad04ed74f1ec4a3fc98cb1e9e3ef81 Mon Sep 17 00:00:00 2001
From: Hugo Bernier <hugoabernier@live.ca>
Date: Sat, 6 Jan 2024 12:36:27 -0800
Subject: [PATCH] Updated devcontainers

---
 .../.devcontainer/devcontainer.json           | 34 +++++++++----------
 .../.devcontainer/devcontainer.json           | 20 +++++------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/templates/containers/post-1.12.1/.devcontainer/devcontainer.json b/templates/containers/post-1.12.1/.devcontainer/devcontainer.json
index 59bee0f75..1d500d525 100644
--- a/templates/containers/post-1.12.1/.devcontainer/devcontainer.json
+++ b/templates/containers/post-1.12.1/.devcontainer/devcontainer.json
@@ -1,18 +1,19 @@
 // For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer
 {
-	"name": "SPFx 1.18.1",
-	"image": "docker.io/m365pnp/spfx:1.18.1",
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"editorconfig.editorconfig",
-		"dbaeumer.vscode-eslint"
-	],
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"name": "SPFx 1.18.2",
+	"image": "docker.io/m365pnp/spfx:1.18.2",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"editorconfig.editorconfig",
+				"dbaeumer.vscode-eslint"
+			]
+		}
+	},
 	"forwardPorts": [
 		4321,
-		35729
+		35729,
+		5432
 	],
 	"portsAttributes": {
 		"4321": {
@@ -21,12 +22,11 @@
 			"onAutoForward": "silent",
 			"requireLocalPort": true
 		},
-		// Not needed for SPFx>= 1.12.1 
-		// "5432": {
-		// 	"protocol": "https",
-		// 	"label": "Workbench",
-		// 	"onAutoForward": "silent"
-		// },
+		"5432": {
+			"protocol": "https",
+			"label": "Workbench",
+			"onAutoForward": "silent"
+		},
 		"35729": {
 			"protocol": "https",
 			"label": "LiveReload",
diff --git a/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json b/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json
index 1c92f1353..1d500d525 100644
--- a/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json
+++ b/templates/containers/pre-1.12.1/.devcontainer/devcontainer.json
@@ -1,15 +1,15 @@
 // For more information on how to run this SPFx project in a VS Code Remote Container, please visit https://aka.ms/spfx-devcontainer
 {
-	"name": "SPFx 1.11.0",
-	"image": "docker.io/m365pnp/spfx:1.11.0",
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"editorconfig.editorconfig",
-		"dbaeumer.vscode-eslint"
-	],
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"name": "SPFx 1.18.2",
+	"image": "docker.io/m365pnp/spfx:1.18.2",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"editorconfig.editorconfig",
+				"dbaeumer.vscode-eslint"
+			]
+		}
+	},
 	"forwardPorts": [
 		4321,
 		35729,