Merge remote-tracking branch 'boilerplate/main'

.nvmrc

@@ -1 +1 @@
-12
+14

package.json

@@ -8,7 +8,7 @@
     "lib"
   ],
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "scripts": {
     "build": "npm run clean && tsc --project tsconfig.release.json && node scripts/bundle-declaration-references.js",

tsconfig.json

@@ -1,9 +1,9 @@
 {
   "include": ["src"],
   "compilerOptions": {
-    "lib": ["es6"],
+    "lib": ["es2020"],
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2020",
     "isolatedModules": true,
     "declaration": true,
     "removeComments": false,

update-project-boilerplate.sh

@@ -31,7 +31,7 @@ To continue with the update write yes and press Enter.
 
   git fetch boilerplate $git_branch
 
-  git merge "boilerplate/${git_branch}"
+  git merge "boilerplate/${git_branch}" --no-commit
 
   echo "
 -----
@@ -43,11 +43,13 @@ To continue with the update write yes and press Enter.
   - Confirm that new commits from the project boilerplate are in the project's git history by running 'git log'
     - If no new commits from the project boilerplate are present, you can try running the update script again
 
-- If there are git conflicts present, resolve the conflicts by picking the updates you want to add to the project
+- Review and pick the updates you want to add to the project
 
-- Run 'npm install', in case any dependencies were changed or added
+- Run 'npm run install:all', in case any dependencies were changed or added
 
-- Run 'npm run integrity-check' to make sure the updates didn't break any part of your project
+- Check if any of the changes made by the updates require a new migration to be written
+
+- Run 'npm run integrity-check:all' to make sure the updates didn't break any part of your project
 
 - Run 'git add .' to stage all the accepted updates