From 6e2f8b7b28d92d1e5f190dbd430c7eb7198166ad Mon Sep 17 00:00:00 2001
From: Philippe Ozil <pozil@salesforce.com>
Date: Wed, 13 Sep 2023 10:01:42 -0700
Subject: [PATCH 1/3] fix: exclude .sf folder from prettier

---
 src/templates/project/.prettierignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/templates/project/.prettierignore b/src/templates/project/.prettierignore
index f3720b23..8cccc6e5 100755
--- a/src/templates/project/.prettierignore
+++ b/src/templates/project/.prettierignore
@@ -5,6 +5,7 @@
 **/staticresources/**
 .localdevserver
 .sfdx
+.sf
 .vscode
 
 coverage/
\ No newline at end of file

From 5c2a2972b08c6888ec38dfa22d3ab688a240cfd8 Mon Sep 17 00:00:00 2001
From: Philippe Ozil <pozil@salesforce.com>
Date: Wed, 13 Sep 2023 10:02:38 -0700
Subject: [PATCH 2/3] build: bump template dependencies

---
 src/templates/project/.eslintignore | 16 ---------------
 src/templates/project/.prettierrc   |  4 ++++
 src/templates/project/package.json  | 30 ++++++++++++++---------------
 3 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 src/templates/project/.eslintignore

diff --git a/src/templates/project/.eslintignore b/src/templates/project/.eslintignore
deleted file mode 100644
index 5f7b681a..00000000
--- a/src/templates/project/.eslintignore
+++ /dev/null
@@ -1,16 +0,0 @@
-**/lwc/**/*.css
-**/lwc/**/*.html
-**/lwc/**/*.json
-**/lwc/**/*.svg
-**/lwc/**/*.xml
-**/aura/**/*.auradoc
-**/aura/**/*.cmp
-**/aura/**/*.css
-**/aura/**/*.design
-**/aura/**/*.evt
-**/aura/**/*.json
-**/aura/**/*.svg
-**/aura/**/*.tokens
-**/aura/**/*.xml
-**/aura/**/*.app
-.sfdx
diff --git a/src/templates/project/.prettierrc b/src/templates/project/.prettierrc
index 15683b69..18039a03 100755
--- a/src/templates/project/.prettierrc
+++ b/src/templates/project/.prettierrc
@@ -1,5 +1,9 @@
 {
   "trailingComma": "none",
+  "plugins": [
+    "prettier-plugin-apex",
+    "@prettier/plugin-xml"
+  ],
   "overrides": [
     {
       "files": "**/lwc/**/*.html",
diff --git a/src/templates/project/package.json b/src/templates/project/package.json
index 4b616329..bcff2440 100644
--- a/src/templates/project/package.json
+++ b/src/templates/project/package.json
@@ -4,37 +4,37 @@
   "version": "1.0.0",
   "description": "Salesforce App",
   "scripts": {
-    "lint": "eslint **/{aura,lwc}/**",
+    "lint": "eslint **/{aura,lwc}/**/*.js",
     "test": "npm run test:unit",
     "test:unit": "sfdx-lwc-jest",
     "test:unit:watch": "sfdx-lwc-jest --watch",
     "test:unit:debug": "sfdx-lwc-jest --debug",
     "test:unit:coverage": "sfdx-lwc-jest --coverage",
     "prettier": "prettier --write \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"",
-    "prettier:verify": "prettier --list-different \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"",
+    "prettier:verify": "prettier --check \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"",
     "postinstall": "husky install",
     "precommit": "lint-staged"
   },
   "devDependencies": {
-    "@lwc/eslint-plugin-lwc": "^1.1.2",
-    "@prettier/plugin-xml": "^2.0.1",
-    "@salesforce/eslint-config-lwc": "^3.2.3",
-    "@salesforce/eslint-plugin-aura": "^2.0.0",
+    "@lwc/eslint-plugin-lwc": "^1.6.3",
+    "@prettier/plugin-xml": "^3.2.1",
+    "@salesforce/eslint-config-lwc": "^3.5.2",
+    "@salesforce/eslint-plugin-aura": "^2.1.0",
     "@salesforce/eslint-plugin-lightning": "^1.0.0",
-    "@salesforce/sfdx-lwc-jest": "^1.1.0",
-    "eslint": "^8.11.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jest": "^26.1.2",
-    "husky": "^7.0.4",
-    "lint-staged": "^12.3.7",
-    "prettier": "^2.6.0",
-    "prettier-plugin-apex": "^1.10.0"
+    "@salesforce/sfdx-lwc-jest": "^1.4.1",
+    "eslint": "^8.49.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jest": "^27.2.3",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1",
+    "prettier": "^3.0.3",
+    "prettier-plugin-apex": "^2.0.1"
   },
   "lint-staged": {
     "**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}": [
       "prettier --write"
     ],
-    "**/{aura,lwc}/**": [
+    "**/{aura,lwc}/**/*.js": [
       "eslint"
     ]
   }

From 49dc6344c4e06071e88dacae13aaa1f75ce0a91e Mon Sep 17 00:00:00 2001
From: Philippe Ozil <pozil@salesforce.com>
Date: Wed, 13 Sep 2023 10:14:05 -0700
Subject: [PATCH 3/3] feat: remove .eslintignore

---
 src/generators/projectGenerator.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/generators/projectGenerator.ts b/src/generators/projectGenerator.ts
index 67aef7a5..e2a8af6d 100644
--- a/src/generators/projectGenerator.ts
+++ b/src/generators/projectGenerator.ts
@@ -28,7 +28,6 @@ const standardfolderarray = [
   'triggers',
 ];
 const filestocopy = [
-  '.eslintignore',
   '.forceignore',
   GITIGNORE,
   '.prettierignore',