Merge branch 'dev'

luke-h1 · Jan 14, 2024 · 9f06bc4 · 9f06bc4
2 parents da0cce1 + 0de401a
commit 9f06bc4
Show file tree

Hide file tree

Showing 10 changed files with 818 additions and 823 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -11,4 +11,3 @@ node_modules/
 *.min.css
 *.min.js
 @sanity
-playwright-report/
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -123,10 +123,11 @@ jobs:
         - name: tune linux network
           run: sudo ethtool -K eth0 tx off rx off
 
-        - uses: actions/checkout@v4
+        - name: Checkout repository
+          uses: actions/checkout@v4
           with:
             fetch-depth: 0
-            ref: main
+            ref: ${{ github.head_ref }}
 
         - name: Setup node
           uses: actions/setup-node@v4

diff --git a/package.json b/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 --ext .ts,.tsx,.js.jsx .",
-    "lint:fix": "eslint --fix --ext .ts,.tsx,.js.jsx .",
+    "lint": "eslint \"./src/**/*.{js, jsx,ts,tsx}\" --quiet --fix && eslint \"./**/*.{js, jsx,ts,tsx}\" --quiet --fix",
+    "lint:style": "stylelint --fix src/**/*.{scss,css}",
     "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.24.1",
+    "groq": "3.23.4",
     "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.11.0",
+    "@types/node": "20.10.6",
     "@types/nprogress": "^0.2.3",
     "@types/react": "18.2.47",
     "@types/rss": "^0.0.32",