Skip to content

Commit

Permalink
Oppgraderte next-js og node.
Browse files Browse the repository at this point in the history
Deployer branch til dev.
  • Loading branch information
sstensby committed Feb 27, 2025
1 parent 003307d commit 57a319c
Show file tree
Hide file tree
Showing 9 changed files with 422 additions and 386 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- mer-om-statistikk
- next-15
paths-ignore:
- "**.md"
- "**/**.md"
Expand All @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
registry-url: https://npm.pkg.github.com
cache: yarn
- name: Install dependencies
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// eslint-disable-next-line @typescript-eslint/no-var-requires
const nextJest = require("next/jest");

const createJestConfig = nextJest({
Expand All @@ -19,7 +20,7 @@ const customJestConfig = {
testEnvironmentOptions: {
customExportConditions: [""],
},
setupFiles: ["./jest.polyfills.js"],
setupFiles: [],
};

// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
Expand Down
32 changes: 0 additions & 32 deletions jest.polyfills.js

This file was deleted.

2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
1 change: 0 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const __filename = fileURLToPath(import.meta.url);
export default {
reactStrictMode: true,
basePath: "/forebygge-fravar",
swcMinify: true,
output: "standalone",
i18n: {
locales: ["no"],
Expand Down
35 changes: 16 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,36 @@
]
},
"dependencies": {
"@amplitude/analytics-browser": "^2.11.11",
"@grafana/faro-web-sdk": "^1.13.3",
"@navikt/aksel-icons": "^7.12.2",
"@amplitude/analytics-browser": "^2.11.12",
"@grafana/faro-web-sdk": "^1.14.0",
"@navikt/aksel-icons": "^7.14.2",
"@navikt/arbeidsgiver-notifikasjon-widget": "^7.2.3",
"@navikt/bedriftsmeny": "^7.0.5",
"@navikt/ds-css": "^7.12.2",
"@navikt/ds-css": "^7.14.2",
"@navikt/ds-icons": "^3.4.3",
"@navikt/ds-react": "^7.12.2",
"@navikt/ds-react": "^7.14.2",
"@navikt/ia-metrikker-client": "1.9.4",
"@navikt/nav-dekoratoren-moduler": "^2.1.6",
"@navikt/next-api-proxy": "^4.1.3",
"@navikt/oasis": "^3.7.0",
"@testing-library/dom": "^10.4.0",
"@types/cheerio": "^0.22.35",
"@types/classnames": "^2.3.4",
"@types/history": "^5.0.0",
"@types/node-fetch": "^3.0.3",
"@types/react-router-dom": "^5.3.3",
"@types/uuid": "^10.0.0",
"cheerio": "^1.0.0",
"dotenv": "^16.4.7",
"msw": "2.7.0",
"next": "^14.2.24",
"msw": "2.7.3",
"next": "15.2.0",
"pino": "^9.6.0",
"react": "^18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "^6.2.8",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router-dom": "^6.29.0",
"react-to-print": "^3.0.5",
"recharts": "^2.15.1",
"swr": "^2.3.2",
"typescript": "^5.7.3",
"undici": "^6.21.1",
"uuid": "^11.0.5",
"uuid": "^11.1.0",
"zod": "^3.24.2"
},
"devDependencies": {
Expand All @@ -61,16 +58,16 @@
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^29.5.14",
"@types/jest-axe": "^3.5.9",
"@types/node": "^20.17.18",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/node": "^22.13.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"core-js": "^3.40.0",
"jest-axe": "^9.0.0",
"jest-cli": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-transform-stub": "^2.0.0",
"prettier": "^3.5.1",
"sass": "^1.84.0",
"prettier": "^3.5.2",
"sass": "^1.85.1",
"whatwg-fetch": "^3.6.20"
}
}
2 changes: 1 addition & 1 deletion src/Banner/Banner.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../styles/screensize";
@use "../styles/screensize" as *;

.banner > div > div {
@media(min-width: $screen-md) {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/globals.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import "@navikt/ds-css";
@use "@navikt/ds-css";
Loading

0 comments on commit 57a319c

Please sign in to comment.