From 254a22e080084b24820c72329bef761710f716f5 Mon Sep 17 00:00:00 2001
From: Don Kirkham <donkirkham@live.com>
Date: Thu, 20 Oct 2022 11:07:11 -0500
Subject: [PATCH] fix build error

---
 .../.devcontainer/devcontainer.json           | 72 +++++++++----------
 .../.devcontainer/spfx-startup.sh             |  2 +-
 samples/react-add-js-css-ref/tslint.json      | 55 +++++++-------
 3 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/samples/react-add-js-css-ref/.devcontainer/devcontainer.json b/samples/react-add-js-css-ref/.devcontainer/devcontainer.json
index 0ae90252f..9b82154f7 100644
--- a/samples/react-add-js-css-ref/.devcontainer/devcontainer.json
+++ b/samples/react-add-js-css-ref/.devcontainer/devcontainer.json
@@ -1,39 +1,39 @@
 // 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.14.0",
-	"image": "docker.io/m365pnp/spfx:1.14.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.
-	"forwardPorts": [
-		4321,
-		35729,
-		5432
-	],
-	"portsAttributes": {
-		"4321": {
-			"protocol": "https",
-			"label": "Manifest",
-			"onAutoForward": "silent",
-			"requireLocalPort": true
-		},
-		"5432": {
-			"protocol": "https",
-			"label": "Workbench",
-			"onAutoForward": "silent"
-		},
-		"35729": {
-			"protocol": "https",
-			"label": "LiveReload",
-			"onAutoForward": "silent",
-			"requireLocalPort": true
-		}
-	},
-	"postCreateCommand": "bash .devcontainer/spfx-startup.sh",
-	"remoteUser": "node"
+  "name": "SPFx 1.14.0",
+  "image": "docker.io/m365pnp/spfx:1.14.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.
+  "forwardPorts": [
+    4321,
+    35729
+  ],
+  "portsAttributes": {
+    "4321": {
+      "protocol": "https",
+      "label": "Manifest",
+      "onAutoForward": "silent",
+      "requireLocalPort": true
+    },
+    // Not needed for SPFx>= 1.12.1
+    // "5432": {
+    // 	"protocol": "https",
+    // 	"label": "Workbench",
+    // 	"onAutoForward": "silent"
+    // },
+    "35729": {
+      "protocol": "https",
+      "label": "LiveReload",
+      "onAutoForward": "silent",
+      "requireLocalPort": true
+    }
+  },
+  "postCreateCommand": "bash .devcontainer/spfx-startup.sh",
+  "remoteUser": "node"
 }
diff --git a/samples/react-add-js-css-ref/.devcontainer/spfx-startup.sh b/samples/react-add-js-css-ref/.devcontainer/spfx-startup.sh
index 5c1b3c649..8e7450b28 100644
--- a/samples/react-add-js-css-ref/.devcontainer/spfx-startup.sh
+++ b/samples/react-add-js-css-ref/.devcontainer/spfx-startup.sh
@@ -26,7 +26,7 @@ if ! grep -Fxq '*.pem' ./.gitignore
     echo "# .PEM Certificates" >> .gitignore
     echo "*.pem" >> .gitignore
 fi
-npm i -g @pnp/cli-microsoft365
+
 echo
 echo -e "\e[1;92mReady!\e[0m"
 
diff --git a/samples/react-add-js-css-ref/tslint.json b/samples/react-add-js-css-ref/tslint.json
index 8ff9eac69..4623bd8a8 100644
--- a/samples/react-add-js-css-ref/tslint.json
+++ b/samples/react-add-js-css-ref/tslint.json
@@ -1,30 +1,29 @@
 {
   "extends": "./node_modules/@microsoft/sp-tslint-rules/base-tslint.json",
-    "rules": {
-      "class-name": false,
-      "export-name": false,
-      "forin": false,
-      "label-position": false,
-      "member-access": true,
-      "no-arg": false,
-      "no-console": false,
-      "no-construct": false,
-      "no-duplicate-variable": true,
-      "no-eval": false,
-      "no-function-expression": true,
-      "no-internal-module": true,
-      "no-shadowed-variable": true,
-      "no-switch-case-fall-through": true,
-      "no-unnecessary-semicolons": true,
-      "no-unused-expression": true,
-      "no-use-before-declare": true,
-      "no-with-statement": true,
-      "semicolon": true,
-      "trailing-comma": false,
-      "typedef": false,
-      "typedef-whitespace": false,
-      "use-named-parameter": true,
-      "variable-name": false,
-      "whitespace": false
-    }
-  }
\ No newline at end of file
+  "rules": {
+    "class-name": false,
+    "export-name": false,
+    "forin": false,
+    "label-position": false,
+    "member-access": true,
+    "no-arg": false,
+    "no-console": false,
+    "no-construct": false,
+    "no-duplicate-variable": true,
+    "no-eval": false,
+    "no-function-expression": true,
+    "no-internal-module": true,
+    "no-shadowed-variable": true,
+    "no-switch-case-fall-through": false,
+    "no-unnecessary-semicolons": true,
+    "no-unused-expression": true,
+    "no-with-statement": true,
+    "semicolon": true,
+    "trailing-comma": false,
+    "typedef": false,
+    "typedef-whitespace": false,
+    "use-named-parameter": true,
+    "variable-name": false,
+    "whitespace": false
+  }
+}