Accenture · JoernBerkefeld · Aug 30, 2024 · Aug 29, 2024 · Aug 29, 2024 · Aug 29, 2024
diff --git a/.github/PULL_REQUEST_TEMPLATE/pr_template_release.md b/.github/PULL_REQUEST_TEMPLATE/pr_template_release.md
@@ -5,9 +5,8 @@
 ### Before merge
 
 - [ ] Wiki updated with info in ticket listed under **Documentation**
-- [ ] ran `npm audit fix`
-- [ ] ran `npm run lint-ts`
-- [ ] ran `npm run lint:fix`
+- [ ] ran `npm run prepare-release` (which runs `npm audit fix`, `npm run lint-ts`, `npm run lint:fix`, `git add`, `git commit`)
+- [ ] pushed potential changes made by prepare-release
 
 ### After merge
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -20,7 +20,7 @@
     "sql-formatter.indent": "    ",
     "sql-formatter.uppercase": true,
     "[html]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "FiB.beautyAmp"
     },
     "[javascript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

diff --git a/@types/lib/metadataTypes/Event.d.ts b/@types/lib/metadataTypes/Event.d.ts
diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map
diff --git a/@types/lib/metadataTypes/Journey.d.ts b/@types/lib/metadataTypes/Journey.d.ts
diff --git a/@types/lib/metadataTypes/Journey.d.ts.map b/@types/lib/metadataTypes/Journey.d.ts.map
diff --git a/@types/lib/metadataTypes/Role.d.ts b/@types/lib/metadataTypes/Role.d.ts
diff --git a/@types/lib/metadataTypes/Role.d.ts.map b/@types/lib/metadataTypes/Role.d.ts.map
diff --git a/boilerplate/files/.vscode/settings.json b/boilerplate/files/.vscode/settings.json
@@ -37,7 +37,8 @@
     },
     "editor.formatOnSave": true,
     "files.associations": {
-        "*.ssjs": "javascript"
+        "*.ssjs": "javascript",
+        "*.html": "ampscript"
     },
     "files.eol": "\n",
     "files.exclude": {
@@ -48,7 +49,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[html]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "FiB.beautyAmp"
     },
     "[javascript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

diff --git a/boilerplate/forcedUpdates.json b/boilerplate/forcedUpdates.json
@@ -1,4 +1,8 @@
 [
+    {
+        "version": "7.3.1",
+        "files": [".vscode/settings.json"]
+    },
     {
         "version": "7.3.0",
         "files": [".vscode/settings.json"]