Merge branch 'main' into dependabot/npm_and_yarn/date-fns-3.6.0

package.json

@@ -46,7 +46,6 @@
     ],
     "moduleNameMapper": {
       "\\.(css)$": "<rootDir>/src/mockStyle.js",
-      "nav-(.*)-style": "<rootDir>/src/mockStyle.js",
       "styled-components/macro": "styled-components",
       "^uuid$": "uuid"
     },
@@ -70,10 +69,9 @@
     ]
   },
   "resolutions": {
-    "styled-components": "^5",
+    "styled-components": "^6",
     "browserslist": "^4.16.5",
     "ansi-regex": "^5.0.1",
-    "webpack-plugin-ramdisk": "^0.2.0",
     "got": "^11.8.5",
     "@types/react": "^18.2.17"
   },
@@ -100,7 +98,7 @@
     "@navikt/familie-skjema": "^8.0.8",
     "@navikt/familie-sprakvelger": "^12.0.0",
     "@navikt/familie-typer": "^8.0.2",
-    "@navikt/fnrvalidator": "^1.3.3",
+    "@navikt/fnrvalidator": "^2.0.7",
     "@navikt/nav-dekoratoren-moduler": "^2.1.6",
     "@portabletext/react": "^3.0.7",
     "@portabletext/toolkit": "^2.0.8",
@@ -138,19 +136,15 @@
   "devDependencies": {
     "@axe-core/react": "^4.8.2",
     "@babel/core": "^7.24.0",
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/plugin-syntax-import-assertions": "^7.23.3",
     "@babel/preset-env": "^7.24.0",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@portabletext/types": "^2.0.6",
     "@sentry/webpack-plugin": "^2.14.1",
-    "@testing-library/dom": "^9.3.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.1.2",
-    "@testing-library/user-event": "^14.5.1",
     "@types/amplitude-js": "^8.16.5",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
@@ -164,14 +158,11 @@
     "@types/react-collapse": "^5.0.4",
     "@types/styled-components": "^5.1.34",
     "@types/webpack-env": "^1.18.4",
-    "@types/webpack-plugin-serve": "^1.4.6",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "axios-mock-adapter": "^1.22.0",
     "babel-jest": "^29.7.0",
     "babel-loader": "9.1.3",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-macros": "^3.1.0",
     "babel-plugin-styled-components": "^2.1.4",
     "buffer": "^6.0.3",
     "case-sensitive-paths-webpack-plugin": "2.4.0",
@@ -195,11 +186,9 @@
     "husky": "^9.0.11",
     "intl": "^1.2.5",
     "jest": "29.7.0",
-    "jest-circus": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jest-mock-extended": "^3.0.5",
     "jest-mock-promise": "^2.0.2",
-    "jest-resolve": "29.7.0",
     "jest-watch-typeahead": "^2.2.2",
     "lint-staged": "^15.2.2",
     "mini-css-extract-plugin": "^2.8.1",
@@ -209,24 +198,20 @@
     "react-dev-utils": "^12.0.1",
     "react-element-to-jsx-string": "^15.0.0",
     "react-intl": "^6.6.2",
-    "react-is": "^18.2.0",
     "react-masonry-css": "^1.0.16",
     "react-refresh": "^0.14.0",
     "stream-browserify": "^3.0.0",
     "style-loader": "^3.3.3",
     "styled-components": "^6.1.1",
-    "terser": "^5.26.0",
     "terser-webpack-plugin": "^5.3.9",
     "ts-essentials": "^9.4.1",
     "ts-jest": "^29.1.1",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.2.0",
     "typescript": "^5.3.3",
     "webpack": "^5.90.3",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4",
-    "webpack-merge": "^5.10.0",
-    "webpack-plugin-serve": "^1.6.0"
+    "webpack-merge": "^5.10.0"
   }
 }

src/frontend/components/Felleskomponenter/FamilieAlert/FamilieAlert.tsx

@@ -16,7 +16,7 @@ const StyledAlert = styled(Alert)`
 `;
 
 const FamilieAlert: React.FC<AlertStripeProps> = ({
-    // TODO: vurder om denne kan fjernes etter arbeid med kombinert søknad
+    // TODO: vurder om denne kan fjernes etter at vi har sluttet å bruke alerts med inline styling
     variant,
     inline = true,
     size = 'medium',

src/frontend/components/SøknadsSteg/VelgBarn/VelgBarn.test.tsx

@@ -6,7 +6,7 @@ import { DeepPartial } from 'ts-essentials';
 
 import { ESvar } from '@navikt/familie-form-elements';
 import { byggSuksessRessurs, RessursStatus } from '@navikt/familie-typer';
-import fnrvalidator from '@navikt/fnrvalidator';
+import * as fnrvalidator from '@navikt/fnrvalidator';
 
 import * as eøsContext from '../../../context/EøsContext';
 import * as pdlRequest from '../../../context/pdl';