Merge branch 'release/9.1.1'

Frojd · Jul 24, 2024 · 7cf04ce · 7cf04ce
2 parents ab970b6 + 8d1d5b7
commit 7cf04ce
Show file tree

Hide file tree

Showing 19 changed files with 7,717 additions and 9,444 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Removed
 
+## [9.1.1] - 2024-07-24
+### Changed
+- Upgrade storybook to 8.2.5
+
+### Fixed
+- Upgrade Next.js to 14.2.5
+- Upgrade Django to 5.0.7
+- Upgrade wagtail to 6.1.3
+- Upgrade whitenoise to 6.7.0
+- Upgrade pytest to 8.3.1
+- Upgrade wagtail-factories to 4.2.1
+- Replace deprecated ruff <path> with ruff check <path>
+- Upgrade django-stubs to 5.0.2
+- Upgrade mypy to 1.11.0
+- Upgrade djangorestframework-stubs to 3.15.0
+- Upgrade psycopg to 3.2.1
+- Upgrade sentry_sdk to 2.10.0
+- Upgrade prettier to 3.3.3
+- Upgrade husky to 9.1.1
+- Upgrade i18next to 23.12.2
+- Upgrade next-i18next to 15.3.0
+- Upgrade eslint-config-next to 14.2.5
+- Upgrade sentry/nextjs to 8.19.0
+- Fix storybook crash in HomePage when seo robots are undefined
+- Upgrade testing-library/jest-dom to 6.4.8
+- Upgrade testing-library/react to 16.0.0
+
 ## [9.1.0] - 2024-06-02
 ### Changed
 - Upgrade Wagtail to 6.1.2

diff --git a/Company-Project/frontend/.storybook/main.js b/Company-Project/frontend/.storybook/main.js
@@ -27,6 +27,9 @@ const config = {
         name: '@storybook/nextjs',
         options: {},
     },
+    typescript: {
+        reactDocgen: 'react-docgen-typescript'
+    }
 };
 
 export default config;
diff --git a/Company-Project/frontend/.storybook/preview.js b/Company-Project/frontend/.storybook/preview.js
@@ -50,3 +50,5 @@ export const parameters = {
         ],
     },
 };
+
+export const tags = ['autodocs'];
diff --git a/Company-Project/frontend/containers/BasePage/BasePage.js b/Company-Project/frontend/containers/BasePage/BasePage.js
@@ -69,7 +69,9 @@ const BasePage = ({ children, seo, shouldRenderSeo, wagtailUserbar }) => {
                             content={seoTwitterImage}
                         />
                     )}
-                    <meta name="robots" content={seoMetaRobots.value} />
+                    {!!seoMetaRobots && (
+                        <meta name="robots" content={seoMetaRobots.value} />
+                    )}
                     {!!canonicalLink && (
                         <link rel="canonical" href={canonicalLink} />
                     )}

diff --git a/Company-Project/frontend/package-lock.json b/Company-Project/frontend/package-lock.json
diff --git a/Company-Project/frontend/package.json b/Company-Project/frontend/package.json
@@ -16,10 +16,10 @@
         "test:ci": "npx jest --ci --runInBand --reporters=default --reporters=jest-junit"
     },
     "dependencies": {
-        "@sentry/nextjs": "^8.7.0",
-        "i18next": "^23.11.5",
-        "next": "14.2.3",
-        "next-i18next": "^15.2.0",
+        "@sentry/nextjs": "^8.19.0",
+        "i18next": "^23.12.2",
+        "next": "14.2.5",
+        "next-i18next": "^15.3.0",
         "prop-types": "^15.8.1",
         "react": "^18.3.1",
         "react-dom": "18.3.1"
@@ -31,27 +31,26 @@
         }
     },
     "devDependencies": {
-        "@storybook/addon-a11y": "^7.6.10",
-        "@storybook/addon-actions": "^7.6.10",
-        "@storybook/addon-backgrounds": "^7.6.10",
-        "@storybook/addon-viewport": "^7.6.10",
-        "@storybook/addons": "^7.6.10",
-        "@storybook/nextjs": "^7.6.10",
+        "@storybook/addon-a11y": "^8.2.5",
+        "@storybook/addon-actions": "^8.2.5",
+        "@storybook/addon-backgrounds": "^8.2.5",
+        "@storybook/addon-viewport": "^8.2.5",
+        "@storybook/nextjs": "^8.2.5",
         "@swc/jest": "^0.2.36",
-        "@testing-library/jest-dom": "^6.3.0",
-        "@testing-library/react": "^14.1.2",
+        "@testing-library/jest-dom": "^6.4.8",
+        "@testing-library/react": "^16.0.0",
         "@testing-library/user-event": "^14.5.2",
         "cross-env": "^7.0.3",
         "eslint": "8.56.0",
-        "eslint-config-next": "14.1.0",
+        "eslint-config-next": "14.2.5",
         "eslint-config-prettier": "^9.1.0",
-        "husky": "^9.0.11",
+        "husky": "^9.1.1",
         "jest": "^29.6.2",
         "jest-environment-jsdom": "^29.6.2",
         "jest-junit": "^16.0.0",
-        "prettier": "^3.3.0",
+        "prettier": "^3.3.3",
         "pretty-quick": "^4.0.0",
         "react-test-renderer": "^18.3.1",
-        "storybook": "^7.6.10"
+        "storybook": "^8.2.5"
     }
 }
diff --git a/Company-Project/src/docker-entrypoint.sh b/Company-Project/src/docker-entrypoint.sh
@@ -75,7 +75,7 @@ case "$CMD" in
 
     "lint" )
         echo Running linting
-        exec ruff .
+        exec ruff check .
         ;;
 
     * )

diff --git a/Company-Project/src/requirements/base.txt b/Company-Project/src/requirements/base.txt
@@ -1,10 +1,10 @@
-Django==5.0.6
+Django==5.0.7
 gunicorn==22.0.0
 gevent==24.2.1
-psycopg==3.1.18
+psycopg==3.2.1
 python-dotenv==1.0.1
-sentry_sdk[django]==2.3.1
-wagtail==6.1.2
+sentry_sdk[django]==2.10.0
+wagtail==6.1.3
 wagtail-meta-preview==4.1.0
 wagtail_headless_preview==0.8.0
-whitenoise==6.6.0
+whitenoise==6.7.0
diff --git a/Company-Project/src/requirements/local.txt b/Company-Project/src/requirements/local.txt
@@ -4,10 +4,10 @@
 # Add local extra requirements here (django-debug etc)
 black
 django-debug-toolbar
-django-stubs==4.2.7
-djangorestframework-stubs==3.14.5
+django-stubs==5.0.2
+djangorestframework-stubs==3.15.0
 isort
-mypy==1.10.0
+mypy==1.11.0
 pipdeptree
 ptvsd
 ruff
diff --git a/Company-Project/src/requirements/test.txt b/Company-Project/src/requirements/test.txt
@@ -3,7 +3,7 @@
 
 # Add extra test requirements here (such as factory-boy)
 coverage
-pytest==8.2.0
+pytest==8.3.1
 pytest-django==4.8.0
 pytest-env
-wagtail-factories==4.1.0
+wagtail-factories==4.2.1
diff --git a/{{cookiecutter.project_name}}/frontend/.storybook/main.js b/{{cookiecutter.project_name}}/frontend/.storybook/main.js
@@ -27,6 +27,9 @@ const config = {
         name: '@storybook/nextjs',
         options: {},
     },
+    typescript: {
+        reactDocgen: 'react-docgen-typescript'
+    }
 };
 
 export default config;
diff --git a/{{cookiecutter.project_name}}/frontend/.storybook/preview.js b/{{cookiecutter.project_name}}/frontend/.storybook/preview.js
@@ -50,3 +50,5 @@ export const parameters = {
         ],
     },
 };
+
+export const tags = ['autodocs'];
diff --git a/{{cookiecutter.project_name}}/frontend/containers/BasePage/BasePage.js b/{{cookiecutter.project_name}}/frontend/containers/BasePage/BasePage.js
@@ -69,7 +69,9 @@ const BasePage = ({ children, seo, shouldRenderSeo, wagtailUserbar }) => {
                             content={seoTwitterImage}
                         />
                     )}
-                    <meta name="robots" content={seoMetaRobots.value} />
+                    {!!seoMetaRobots && (
+                        <meta name="robots" content={seoMetaRobots.value} />
+                    )}
                     {!!canonicalLink && (
                         <link rel="canonical" href={canonicalLink} />
                     )}
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,3 +50,5 @@ export const parameters = { @@
             ],
         },
     };
+    export const tags = ['autodocs'];