Merge pull request #4314 from luke-h1/main

merge main into dev

.eslintignore

@@ -11,3 +11,4 @@ node_modules/
 *.min.css
 *.min.js
 @sanity
+playwright-report/

.github/workflows/build.yml

@@ -67,7 +67,7 @@ jobs:
           sync-labels: true
 
       - name: Check commit message
-        run: pnpm commitlint --from=HEAD~1
+        run: pnpm commitlint --from=HEAD^1
 
       - name: format:check
         run: pnpm format:check

.github/workflows/deploy.yml

@@ -72,7 +72,7 @@ jobs:
           sync-labels: true
 
       - name: Check commit message
-        run: pnpm commitlint --from=HEAD~1
+        run: pnpm commitlint --from=HEAD^1
 
       - name: format:check
         run: pnpm format:check

.github/workflows/dev-ui-tests.yml

@@ -63,7 +63,7 @@ jobs:
           sync-labels: true
 
       - name: Check commit message
-        run: pnpm commitlint --from=HEAD~1
+        run: pnpm commitlint --from=HEAD^1
 
       - name: dev UI tests
         run: make e2e-install-browsers && make e2e-dev

.github/workflows/live-ui-tests.yml

@@ -63,7 +63,7 @@ jobs:
           sync-labels: true
 
       - name: Check commit message
-        run: pnpm commitlint --from=HEAD~1
+        run: pnpm commitlint --from=HEAD^1
 
       - name: Install Playwright Browsers
         run: make e2e-install-browsers

package.json

@@ -14,8 +14,8 @@
     "start:prod": "NODE_OPTIONS='-r dotenv/config @newrelic/next' next start",
     "tsc": "tsc --noEmit",
     "gen-env": "gen-env-types .env -o src/types/env.d.ts -e .",
-    "lint": "eslint \"./src/**/*.{js, jsx,ts,tsx}\" --quiet --fix && eslint \"./**/*.{js, jsx,ts,tsx}\" --quiet --fix",
-    "lint:style": "stylelint --fix src/**/*.{scss,css}",
+    "lint": "eslint --ext .ts,.tsx,.js.jsx .",
+    "lint:fix": "eslint --fix --ext .ts,.tsx,.js.jsx .",
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,html}\"",
     "format:check": "prettier --list-different \"src/**/*.{js,jsx,ts,tsx,css,scss,html}\"",
     "test": "jest",
@@ -53,7 +53,7 @@
     "framer-motion": "^10.17.9",
     "gen-env-types": "^1.3.4",
     "gray-matter": "^4.0.3",
-    "groq": "3.23.4",
+    "groq": "3.24.1",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "motion": "^10.16.4",
@@ -105,7 +105,7 @@
     "@types/jest": "^29.5.11",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash": "^4.14.202",
-    "@types/node": "20.10.6",
+    "@types/node": "20.11.0",
     "@types/nprogress": "^0.2.3",
     "@types/react": "18.2.47",
     "@types/rss": "^0.0.32",
@@ -164,5 +164,10 @@
     "package.json": [
       "node scripts/alphabetizePackageJson.js"
     ]
+  },
+  "husky": {
+    "hooks": {
+      "prepare-commit-msg": "exec < /dev/tty && npx cz --hook || true"
+    }
   }
 }