chore: bump nextjs version to 14.1.1 (fixes turbopack) (#2837)

* chore: bump nextjs version to 14.1.0 (turbopack now works) * chore: bump nextjs version to 14.1.1 * chore: add next-router-mock as router no longer works in jest * chore: add missing codemod to TET
City-of-Helsinki · Mar 4, 2024 · 854ff87 · 854ff87
1 parent 23f4208
commit 854ff87
Show file tree

Hide file tree

Showing 19 changed files with 124 additions and 114 deletions.
diff --git a/frontend/benefit/applicant/package.json b/frontend/benefit/applicant/package.json
@@ -30,7 +30,8 @@
     "hds-design-tokens": "^2.17.1",
     "hds-react": "^2.17.1",
     "lodash": "^4.17.21",
-    "next": "14.0.3",
+    "next": "14.1.1",
+    "next-router-mock": "0.9.12",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
     "next-transpile-modules": "^9.1.0",

diff --git a/.../applicant/src/components/applications/applicationList/__tests__/ApplicationList.test.tsx b/.../applicant/src/components/applications/applicationList/__tests__/ApplicationList.test.tsx
@@ -5,6 +5,8 @@ import React from 'react';
 
 import ApplicationList, { ApplicationListProps } from '../ApplicationList';
 
+jest.mock('next/router', () => jest.requireActual('next-router-mock'));
+
 describe('ApplicationList', () => {
   const initialProps: ApplicationListProps = {
     heading: 'Application List',

diff --git a/...s/applications/forms/application/step3/attachmentsList/__tests__/AttachmentsList.test.tsx b/...s/applications/forms/application/step3/attachmentsList/__tests__/AttachmentsList.test.tsx
@@ -6,6 +6,8 @@ import React from 'react';
 
 import AttachmentsList, { AttachmentsListProps } from '../AttachmentsList';
 
+jest.mock('next/router', () => jest.requireActual('next-router-mock'));
+
 describe('AttachmentsList', () => {
   const initialProps: AttachmentsListProps = {
     attachmentType: ATTACHMENT_TYPES.HELSINKI_BENEFIT_VOUCHER,

diff --git a/frontend/benefit/handler/jest.config.js b/frontend/benefit/handler/jest.config.js
@@ -15,6 +15,8 @@ const config = {
   setupFilesAfterEnv: [
     '<rootDir>/../../shared/src/__tests__/utils/setupTests.ts',
     '<rootDir>/test/i18n/i18n-test.ts',
+    '<rootDir>/test/next-router-mock.ts',
+    // '<rootDir>/../../shared/src/__tests__/utils/next-router-mock.ts',
   ],
   coveragePathIgnorePatterns: [
     '<rootDir>/src/pages/',

diff --git a/frontend/benefit/handler/package.json b/frontend/benefit/handler/package.json
@@ -31,7 +31,8 @@
     "hds-react": "^2.17.1",
     "ibantools": "^4.3.4",
     "lodash": "^4.17.21",
-    "next": "14.0.3",
+    "next": "14.1.1",
+    "next-router-mock": "0.9.12",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
     "next-transpile-modules": "^9.1.0",

diff --git a/frontend/benefit/handler/test/next-router-mock.ts b/frontend/benefit/handler/test/next-router-mock.ts
@@ -0,0 +1,2 @@
+import mockRouter from 'next-router-mock';
+jest.mock('next/router', () => jest.requireActual('next-router-mock'));
diff --git a/frontend/benefit/shared/package.json b/frontend/benefit/shared/package.json
@@ -18,7 +18,8 @@
     "date-fns": "^2.24.0",
     "hds-react": "^2.17.1",
     "ibantools": "^4.1.5",
-    "next": "14.0.3",
+    "next": "14.1.1",
+    "next-router-mock": "0.9.12",
     "react": "^18.2.0",
     "styled-components": "^5.3.11",
     "yup": "^0.32.9"

diff --git a/frontend/kesaseteli/employer/package.json b/frontend/kesaseteli/employer/package.json
@@ -27,9 +27,10 @@
     "hds-react": "^2.17.1",
     "ibantools": "^4.1.5",
     "lodash": "^4.17.21",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
+    "next-router-mock": "0.9.12",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/frontend/kesaseteli/handler/package.json b/frontend/kesaseteli/handler/package.json
@@ -27,7 +27,7 @@
     "hds-design-tokens": "^2.17.1",
     "hds-react": "^2.17.1",
     "lodash": "^4.17.21",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
     "next-transpile-modules": "^9.1.0",

diff --git a/frontend/kesaseteli/youth/package.json b/frontend/kesaseteli/youth/package.json
@@ -28,9 +28,10 @@
     "hds-design-tokens": "^2.17.1",
     "hds-react": "^2.17.1",
     "lodash": "^4.17.21",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
+    "next-router-mock": "0.9.12",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/frontend/package.json b/frontend/package.json
@@ -100,7 +100,7 @@
     "eslint-config-airbnb": "^19.0.2",
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-auto": "^0.7.1",
-    "eslint-config-next": "^14.0.4",
+    "eslint-config-next": "^14.1.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-array-func": "^3.1.7",
     "eslint-plugin-chai-expect": "^3.0.0",
@@ -141,6 +141,8 @@
     "lerna-audit": "^1.3.3",
     "lint-staged": "^12.3.1",
     "lodash": "^4.17.21",
+    "next": "14.1.1",
+    "next-router-mock": "0.9.12",
     "nock": "^13.5.0",
     "picocolors": "1.0.0",
     "prettier": "^2.5.1",

diff --git a/frontend/shared/package.json b/frontend/shared/package.json
@@ -25,7 +25,7 @@
     "hds-react": "^2.17.1",
     "js-file-download": "^0.4.12",
     "lodash": "^4.17.21",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-i18next": "^13.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/frontend/shared/src/__tests__/utils/next-router-mock.js b/frontend/shared/src/__tests__/utils/next-router-mock.js
@@ -0,0 +1 @@
+jest.mock('next/router', () => require('next-router-mock'));
diff --git a/frontend/shared/src/__tests__/utils/setupTests.ts b/frontend/shared/src/__tests__/utils/setupTests.ts
@@ -7,6 +7,8 @@ import { isString } from 'shared/utils/type-guards';
 jest.setTimeout(JEST_TIMEOUT);
 expect.extend(toHaveNoViolations);
 
+jest.mock('next/router', () => jest.requireActual('next-router-mock'));
+
 // eslint-disable-next-line no-console
 const originalError = console.error;
 let consoleWarnSpy: jest.SpyInstance;

diff --git a/frontend/tet/admin/package.json b/frontend/tet/admin/package.json
@@ -27,7 +27,7 @@
     "hds-design-tokens": "^2.17.1",
     "hds-react": "^2.17.1",
     "leaflet": "^1.7.1",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
     "next-transpile-modules": "^9.0.0",

diff --git a/frontend/tet/shared/package.json b/frontend/tet/shared/package.json
@@ -17,7 +17,7 @@
     "@frontend/shared": "*",
     "axios": "^0.27.2",
     "hds-react": "^2.17.1",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-i18next": "^13.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/frontend/tet/youth/package.json b/frontend/tet/youth/package.json
@@ -27,7 +27,7 @@
     "hds-react": "^2.17.1",
     "leaflet": "^1.7.1",
     "leaflet.markercluster": "^1.5.3",
-    "next": "14.0.3",
+    "next": "14.1.1",
     "next-compose-plugins": "^2.2.1",
     "next-i18next": "^13.0.3",
     "next-transpile-modules": "^9.0.0",

diff --git a/frontend/tet/youth/src/components/pageContent/PageContent.tsx b/frontend/tet/youth/src/components/pageContent/PageContent.tsx
@@ -1,5 +1,5 @@
 import { Button, IconMap } from 'hds-react';
-import Image from 'next/image';
+import Image from 'next/legacy/image';
 import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
 import React from 'react';