From 15372135cd0992ddb17e156ee83e27cabdb059e7 Mon Sep 17 00:00:00 2001 From: Thomas Tykesson Date: Mon, 25 Mar 2024 13:17:02 +0100 Subject: [PATCH] Oppgraderer, og migrerer aksel/ds-pakkene til v6 --- next.config.js | 3 ++ package-lock.json | 70 ++++++++++++++++++++++------------------------- package.json | 6 ++-- 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/next.config.js b/next.config.js index d748fc56..309c5d7f 100644 --- a/next.config.js +++ b/next.config.js @@ -5,6 +5,9 @@ const basePath = process.env.NEXT_PUBLIC_BASE_PATH || ''; import { withSentryConfig } from '@sentry/nextjs'; const nextConfig = { + experimental: { + optimizePackageImports: ['@navikt/ds-react', '@navikt/aksel-icons'], + }, reactStrictMode: false, eslint: { // Warning: This allows production builds to successfully complete even if diff --git a/package-lock.json b/package-lock.json index ee8d31f5..f018b09e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,9 @@ "name": "send-inn-frontend", "version": "0.1.0", "dependencies": { - "@navikt/aksel-icons": "^5.18.3", - "@navikt/ds-css": "^5.18.3", - "@navikt/ds-react": "^5.18.3", + "@navikt/aksel-icons": "^6.3.3", + "@navikt/ds-css": "^6.3.3", + "@navikt/ds-react": "^6.3.3", "@navikt/nav-dekoratoren-moduler": "^2.1.6", "@sentry/nextjs": "^7.107.0", "axios": "^1.6.7", @@ -560,31 +560,31 @@ } }, "node_modules/@navikt/aksel-icons": { - "version": "5.18.3", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.18.3/0e8ff38b54ec91be6c5e8d8574a3341ee87eb792", - "integrity": "sha512-kytq0BT1xsJBrG7/eyDuMQLddQZA4OMT3Fw3VLGHsJNqjEWEVOl3uYCGL70Thvg0+du0s/Z3mXPQUQpIaDt7rg==", + "version": "6.3.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.3.3/251b544c7aea1904c7d11341fbc999e6b7e6e3e1", + "integrity": "sha512-DRWDvqJCPc1kYTjJwzv6sw5Bxf6DfHortkYDUtFSriwvXRaL1DM1/LxPtpu+fkMlCIBBioGps8CHZzRpg7Q8UQ==", "license": "MIT" }, "node_modules/@navikt/ds-css": { - "version": "5.18.3", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.18.3/cbeeddfeca6dd1efbbbb93a29a7cc3a9d5f6df86", - "integrity": "sha512-/BfZKrx7S5bVfjCQzm0B+3QgSHitPOAn04Bq0hAplFWXveLG0HkrVauDxL6dq9mqFN8zAJCSTXZjltRjY+JoHA==", + "version": "6.3.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.3.3/86285e2560cc1c06a9fdac1baf34415dcf7808dd", + "integrity": "sha512-Rpm71ivCpJ5CQuItrIKCe7h/tSnjqnZh9+DS1Mq3LUXaAEdBa1wIg1wF8Eqximy3QcObcO/tRwEkMcFxKe4xLQ==", "license": "MIT" }, "node_modules/@navikt/ds-react": { - "version": "5.18.3", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.18.3/dfa962fc74ec44189b33ad8076908f291ea91fd8", - "integrity": "sha512-+Ant1d6BhlOHuACttwCEiZLVPlVxEYEFGjPdr2EnDYRexmQVvY9dICnKaInBI/Cu6+cKl9BdnZbHsAs4+IPKQA==", + "version": "6.3.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.3.3/b432ae6ff3940ea88951a467923d96ff53b16b96", + "integrity": "sha512-iOCX4zO/CB6yM5GxTBDd8yl/sFe7QP2aNMxgA2uqH6l4S+tX1T7CKnMyUhxWrYTgGYFbjAaEppj77q2Gjokvkg==", "license": "MIT", "dependencies": { "@floating-ui/react": "0.25.4", - "@navikt/aksel-icons": "^5.18.3", - "@navikt/ds-tokens": "^5.18.3", + "@navikt/aksel-icons": "^6.3.3", + "@navikt/ds-tokens": "^6.3.3", "@radix-ui/react-tabs": "1.0.0", "@radix-ui/react-toggle-group": "1.0.0", - "clsx": "^1.2.1", - "date-fns": "^2.30.0", - "react-day-picker": "8.3.4" + "clsx": "^2.1.0", + "date-fns": "^3.0.0", + "react-day-picker": "8.10.0" }, "peerDependencies": { "@types/react": "^17.0.30 || ^18.0.0", @@ -592,9 +592,9 @@ } }, "node_modules/@navikt/ds-tokens": { - "version": "5.18.3", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/5.18.3/c03906e7264f2534ab5f6238a2e2850307e51af3", - "integrity": "sha512-PMA4K1DCosKbekk/hySFnjIRaQxwExhhdV6LFED+ImlutzYKJI79Gmbw1mttp6RWNAJYeVX5z8hCXPTMq6fu6w==", + "version": "6.3.3", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.3.3/d6403f08c3aa389e917b6fbb962ded0c5ce6f603", + "integrity": "sha512-EArixE4zSCbkqAYh2iQarsWtTl80yhcKrkAyPlQHrUr19EeRLJIRBQW+lnSiGFMXe+jh7ZUqsHeY1mDOr693Eg==", "license": "MIT" }, "node_modules/@navikt/nav-dekoratoren-moduler": { @@ -2634,9 +2634,9 @@ } }, "node_modules/clsx": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", - "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", "engines": { "node": ">=6" } @@ -2967,18 +2967,12 @@ } }, "node_modules/date-fns": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", - "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "dependencies": { - "@babel/runtime": "^7.21.0" - }, - "engines": { - "node": ">=0.11" - }, + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" } }, "node_modules/dayjs": { @@ -7228,15 +7222,15 @@ } }, "node_modules/react-day-picker": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.3.4.tgz", - "integrity": "sha512-UuCbfZ69DhQmd+UhEv8nCPp5PxMk7ioNTuOLMlU0X7q3wd7o8TKDdsjduQoeBYTPTMS3LFdbA1qqbrIpRHo/Vg==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.0.tgz", + "integrity": "sha512-mz+qeyrOM7++1NCb1ARXmkjMkzWVh2GL9YiPbRjKe0zHccvekk4HE+0MPOZOrosn8r8zTHIIeOUXTmXRqmkRmg==", "funding": { "type": "individual", "url": "https://github.com/sponsors/gpbl" }, "peerDependencies": { - "date-fns": "^2.28.0", + "date-fns": "^2.28.0 || ^3.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, diff --git a/package.json b/package.json index 6a9c4dd3..9d8068fc 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "prettier": "prettier --write ." }, "dependencies": { - "@navikt/aksel-icons": "^5.18.3", - "@navikt/ds-css": "^5.18.3", - "@navikt/ds-react": "^5.18.3", + "@navikt/aksel-icons": "^6.3.3", + "@navikt/ds-css": "^6.3.3", + "@navikt/ds-react": "^6.3.3", "@navikt/nav-dekoratoren-moduler": "^2.1.6", "@sentry/nextjs": "^7.107.0", "axios": "^1.6.7",