Merge pull request #2170 from City-of-Helsinki/hl-730-nextjs-12-v2

HL-730 | Upgrade to NextJS v12
City-of-Helsinki · Aug 22, 2023 · aa11ac6 · aa11ac6
2 parents 0d46053 + 5e6c39b
commit aa11ac6
Show file tree

Hide file tree

Showing 39 changed files with 1,093 additions and 1,601 deletions.
diff --git a/frontend/babel.config.js b/frontend/babel.config.js
diff --git a/frontend/benefit/applicant/jest.config.js b/frontend/benefit/applicant/jest.config.js
@@ -1,11 +1,12 @@
 const sharedConfig = require('../../jest.config.js');
-module.exports = {
+const nextJest = require('next/jest');
+
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
   ...sharedConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.jest.json',
-    },
-  },
   moduleNameMapper: {
     [`^shared\/(.*)$`]: '<rootDir>/../../shared/src/$1',
     [`^benefit-shared\/(.*)$`]: '<rootDir>../shared/src/$1',
@@ -20,4 +21,8 @@ module.exports = {
     '<rootDir>/../../shared/src/server/next-server.js',
     '<rootDir>/../../shared/src/test/',
   ],
+  moduleDirectories: ['node_modules', '<rootDir>/'],
+  testEnvironment: 'jest-environment-jsdom',
 };
+
+module.exports = createJestConfig(config);
diff --git a/frontend/benefit/applicant/next-env.d.ts b/frontend/benefit/applicant/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/frontend/benefit/applicant/next.config.js b/frontend/benefit/applicant/next.config.js
@@ -6,5 +6,4 @@ const { parsed: env } = require('dotenv').config({
 module.exports = nextConfig({
   i18n,
   env,
-  poweredByHeader: false,
 });
diff --git a/frontend/benefit/applicant/package.json b/frontend/benefit/applicant/package.json
@@ -11,8 +11,8 @@
     "test": "jest --passWithNoTests",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/newApplication/company.testcafe.ts",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/newApplication/company.testcafe.ts"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/newApplication/company.testcafe.ts --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/newApplication/company.testcafe.ts --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/shared": "*",
@@ -21,19 +21,19 @@
     "@sentry/browser": "^7.16.0",
     "@sentry/nextjs": "^7.16.0",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-import": "^1.13.6",
     "camelcase-keys": "^7.0.2",
     "date-fns": "^2.24.0",
     "dotenv": "^16.0.0",
     "finnish-ssn": "^2.0.4",
     "formik": "^2.2.9",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
-    "next-transpile-modules": "^9.0.0",
+    "next-transpile-modules": "^9.1.0",
     "pdfjs-dist": "3.6.172",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

diff --git a/frontend/benefit/applicant/src/pages/_app.tsx b/frontend/benefit/applicant/src/pages/_app.tsx
@@ -13,8 +13,8 @@ import {
 import { setAppLoaded } from 'benefit-shared/utils/common';
 import { AppProps } from 'next/app';
 import { useRouter } from 'next/router';
+import { useTranslation } from 'next-i18next';
 import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import BackendAPIProvider from 'shared/backend-api/BackendAPIProvider';
 import BaseApp from 'shared/components/app/BaseApp';

diff --git a/frontend/benefit/handler/jest.config.js b/frontend/benefit/handler/jest.config.js
@@ -1,11 +1,12 @@
 const sharedConfig = require('../../jest.config.js');
-module.exports = {
+const nextJest = require('next/jest');
+
+const createJestConfig = nextJest({
+  dir: './',
+});
+
+const config = {
   ...sharedConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.jest.json',
-    },
-  },
   moduleNameMapper: {
     [`^shared\/(.*)$`]: '<rootDir>/../../shared/src/$1',
     [`^benefit-shared\/(.*)$`]: '<rootDir>../shared/src/$1',
@@ -21,3 +22,5 @@ module.exports = {
     '<rootDir>/../../shared/src/test/',
   ],
 };
+
+module.exports = createJestConfig(config);
diff --git a/frontend/benefit/handler/next-env.d.ts b/frontend/benefit/handler/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/frontend/benefit/handler/package.json b/frontend/benefit/handler/package.json
@@ -11,15 +11,15 @@
     "test": "jest --passWithNoTests",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/pages/",
-    "browser-test:ci": "testcafe 'chrome:headless --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/pages/"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/pages/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --allow-insecure-localhost --disable-web-security --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/pages/ --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/benefit-shared": "*",
     "@frontend/shared": "*",
     "@sentry/browser": "^7.16.0",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-import": "^1.13.6",
     "camelcase-keys": "^7.0.2",
     "date-fns": "^2.24.0",
     "dotenv": "^16.0.0",
@@ -29,11 +29,11 @@
     "fuse.js": "^6.6.2",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
-    "next-transpile-modules": "^9.0.0",
+    "next-transpile-modules": "^9.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-input-mask": "^2.0.4",

diff --git a/frontend/benefit/shared/package.json b/frontend/benefit/shared/package.json
@@ -16,7 +16,7 @@
     "@frontend/shared": "*",
     "camelcase-keys": "^7.0.1",
     "hds-react": "^2.10.0",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "react": "^18.0.0",
     "styled-components": "^5.3.3"
   },

diff --git a/frontend/kesaseteli/employer/next-env.d.ts b/frontend/kesaseteli/employer/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/frontend/kesaseteli/employer/package.json b/frontend/kesaseteli/employer/package.json
@@ -13,9 +13,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/",
-    "browser-test:wsl2win": "testcafe 'path:`/mnt/c/Program Files/Google/Chrome/Application/chrome.exe` --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --live --dev  browser-tests/"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/kesaseteli-shared": "*",
@@ -28,9 +27,9 @@
     "hds-react": "^2.10.0",
     "ibantools": "^4.1.5",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.0.0",

diff --git a/frontend/kesaseteli/handler/next-env.d.ts b/frontend/kesaseteli/handler/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/frontend/kesaseteli/handler/package.json b/frontend/kesaseteli/handler/package.json
@@ -13,8 +13,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test:debug-dom --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/"
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless"
   },
   "dependencies": {
     "@frontend/kesaseteli-shared": "*",
@@ -27,11 +27,11 @@
     "finnish-ssn": "^2.0.4",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
-    "next-transpile-modules": "^9.0.0",
+    "next-transpile-modules": "^9.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-hook-form": "^7.30.0",

diff --git a/frontend/kesaseteli/youth/next-env.d.ts b/frontend/kesaseteli/youth/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/frontend/kesaseteli/youth/package.json b/frontend/kesaseteli/youth/package.json
@@ -13,8 +13,8 @@
     "test:debug-dom": "cross-env DEBUG_PRINT_LIMIT=1000000 yarn test",
     "test:staged": "yarn test --watchAll=false --findRelatedTests",
     "test:coverage": "yarn test:debug-dom --verbose --coverage",
-    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/",
-    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/",
+    "browser-test": "testcafe 'chrome --allow-insecure-localhost --ignore-certificate-errors --ignore-urlfetcher-cert-requests --window-size=\"1249,720\"' browser-tests/ --experimental-proxyless",
+    "browser-test:ci": "testcafe 'chrome:headless --disable-gpu --window-size=\"1249,720\"  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/ --experimental-proxyless",
     "browser-test:wsl2win": "testcafe 'path:`/mnt/c/Program Files/Google/Chrome/Application/chrome.exe`  --ignore-certificate-errors-spki-list=\"8sg/cl7YabrOFqSqH+Bu0e+P27Av33gWgi8Lq28DW1I=,gJt+wt/T3afCRkxtMMSjXcl/99sgzWc2kk1c1PC9tG0=,zrQI2/1q8i2SRPmMZ1sMntIkG+lMW0legPFokDo3nrY=\"' --live --dev --screenshots path=report --video report --reporter spec,custom,html:report/index.html browser-tests/"
   },
   "dependencies": {
@@ -28,9 +28,9 @@
     "finnish-ssn": "^2.0.4",
     "hds-react": "^2.10.0",
     "lodash": "^4.17.21",
-    "next": "^11.1.4",
+    "next": "^12.3.4",
     "next-compose-plugins": "^2.2.1",
-    "next-i18next": "^10.5.0",
+    "next-i18next": "^13.0.3",
     "next-plugin-custom-babel-config": "^1.0.5",
     "next-transpile-modules": "^9.0.0",
     "react": "^18.0.0",