Merge pull request #10 from charles4221/develop

Finalise for initial production release
charles4221 · Nov 28, 2024 · e1cca9c · e1cca9c
2 parents fbb2d54 + 71ec3b2
commit e1cca9c
Show file tree

Hide file tree

Showing 96 changed files with 4,372 additions and 1,859 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,29 +6,21 @@
     "next/core-web-vitals",
     "prettier"
   ],
-  "plugins": [
-    "prettier"
-  ],
+  "plugins": ["prettier"],
   "rules": {
     "prettier/prettier": "error",
     "import/order": [
       "warn",
       {
-        "groups": [
-          "builtin",
-          "external",
-          "internal"
-        ],
+        "groups": ["builtin", "external", "internal"],
         "pathGroups": [
           {
             "pattern": "react",
             "group": "external",
             "position": "before"
           }
         ],
-        "pathGroupsExcludedImportTypes": [
-          "react"
-        ],
+        "pathGroupsExcludedImportTypes": ["react"],
         "newlines-between": "always",
         "alphabetize": {
           "order": "asc",
@@ -49,19 +41,14 @@
   },
   "overrides": [
     {
-      "files": [
-        "**/*.js?(x)"
-      ],
+      "files": ["**/*.js?(x)"],
       "rules": {
         "@typescript-eslint/no-var-requires": "off",
         "unicorn/prefer-module": "off"
       }
     },
     {
-      "files": [
-        "**/*.tsx",
-        "**/*.jsx"
-      ],
+      "files": ["**/*.tsx", "**/*.jsx"],
       "rules": {
         "unicorn/no-null": "off",
         "unicorn/filename-case": [
@@ -73,9 +60,7 @@
       }
     },
     {
-      "files": [
-        "**/app/**/*.tsx"
-      ],
+      "files": ["**/app/**/*.tsx"],
       "rules": {
         "unicorn/filename-case": [
           "error",
@@ -87,10 +72,7 @@
     },
     // hooks-specific
     {
-      "files": [
-        "**/hooks/**/*.ts",
-        "**/use*.ts"
-      ],
+      "files": ["**/hooks/**/*.ts", "**/use*.ts"],
       "rules": {
         "unicorn/filename-case": [
           "error",
@@ -116,4 +98,4 @@
       }
     }
   ]
-}
+}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,7 +2,10 @@ on:
   push:
     branches:
       - main
+      - develop
       - release/*
+  pull_request:
+    types: [opened, synchronize, reopened]
 jobs:
   lint:
     name: Lint Code
@@ -11,19 +14,22 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Node.js v20.11.0
+      - name: Setup Node.js v22.10.0
         uses: actions/setup-node@v3
         with:
-          node-version: '20.11.0'
+          node-version: '22.10.0'
           registry-url: https://npm.fontawesome.com/
           scope: '@fortawesome'
           cache: 'npm'
 
       - name: Install Node Dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
         env:
           FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.NPM_CONFIG_FONT_AWESOME_TOKEN }}
 
+      - name: Check Code Formatting with Prettier
+        run: npm run format:check
+
       - name: Lint Code with ESLint
         run: npm run lint
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,10 @@ on:
   push:
     branches:
       - main
+      - develop
       - release/*
+  pull_request:
+    types: [opened, synchronize, reopened]
 jobs:
   test:
     name: Test App
@@ -11,16 +14,16 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Setup Node.js v20.11.0
+      - name: Setup Node.js v22.10.0
         uses: actions/setup-node@v3
         with:
-          node-version: '20.11.0'
+          node-version: '22.10.0'
           registry-url: https://npm.fontawesome.com/
           scope: '@fortawesome'
           cache: 'npm'
 
       - name: Install Node Dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
         env:
           FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.NPM_CONFIG_FONT_AWESOME_TOKEN }}
 

diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,5 @@
 .slicemachine
 .next
+# auto-generated mocks and models from slicemachine
+src/components/slices/**/mocks.json
+src/components/slices/**/model.json
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-nodejs 20.11.0
+nodejs 22.10.0
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -33,5 +33,6 @@
   // Extension Settings
   "eslint.enable": true,
   "eslint.format.enable": false, // formatting is handled by prettier
-  "prettier.enable": true
-}
+  "prettier.enable": true,
+  "cSpell.words": ["gsap", "mailjet"]
+}
diff --git a/customtypes/page/index.json b/customtypes/page/index.json
@@ -41,7 +41,7 @@
             "hero": {
               "type": "SharedSlice"
             },
-            "quote": {
+            "testimonials": {
               "type": "SharedSlice"
             },
             "text": {

diff --git a/customtypes/page/mocks.json b/customtypes/page/mocks.json
@@ -86,8 +86,8 @@
           }
         },
         {
-          "key": "quote$6e8fb18a-3fe5-4a3b-9925-6499eff63b8e",
-          "name": "quote",
+          "key": "testimonials$6e8fb18a-3fe5-4a3b-9925-6499eff63b8e",
+          "name": "testimonials",
           "widget": {
             "__TYPE__": "SharedSliceContent",
             "variation": "default",

diff --git a/jest.config.ts b/jest.config.ts
@@ -31,10 +31,12 @@ const config: Config = {
     'src/app/**/*.{ts,tsx}',
     'src/components/**/*.{ts,tsx}',
     'src/hooks/**/*.{ts,tsx}',
+    'src/theme/**/*.{ts,tsx}',
     'src/utils/**/*.{ts,tsx}',
     '!src/**/constants.ts',
     '!src/**/*.d.ts',
     '!src/**/types.ts',
+    '!src/components/typography/icons/*',
   ],
 
   // The directory where Jest should output its coverage files

diff --git a/next-env.d.ts b/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/next.config.js b/next.config.js
@@ -1,8 +1,11 @@
+const withBundleAnalyzer = require('@next/bundle-analyzer')({
+  enabled: process.env.ANALYZE === 'true',
+});
 const prismic = require('@prismicio/client');
 
 const sm = require('./slicemachine.config.json');
 
-/** @type {import('next').NextConfig} */
+/** @type {() => Promise<import('next').NextConfig>} */
 const nextConfig = async () => {
   const client = prismic.createClient(sm.repositoryName);
 
@@ -19,7 +22,15 @@ const nextConfig = async () => {
       // a non-locale prefixed path e.g. `/hello`
       defaultLocale: locales[0],
     },
+    images: {
+      remotePatterns: [
+        {
+          protocol: 'https',
+          hostname: '**.prismic.io',
+        },
+      ],
+    },
   };
 };
 
-module.exports = nextConfig;
+module.exports = withBundleAnalyzer(nextConfig);