Skip to content

Commit edc9127

Browse files
vebnorvebnor
authored
Pakkeoppdateringer060125 vol1 (#3595)
* minor & patch * allow any * nodejs22 & webpack-cli * uuid * stylelint * remove stylelint * remove stylelint * react-dom * node22 * resolutions på react * yarn install * ny yarn.lock for å se om det hjelper * Revert "ny yarn.lock for å se om det hjelper" This reverts commit 0ebd1f8. * Reapply "ny yarn.lock for å se om det hjelper" This reverts commit 2f79847. * Revert "ny yarn.lock for å se om det hjelper" This reverts commit 0ebd1f8. * Revert "yarn install" This reverts commit 40f5400. * Revert "resolutions på react" This reverts commit ccde07b. * Revert "node22" This reverts commit 3bcf2d9. * Reapply "node22" This reverts commit c77acbc. * Revert "react-dom" This reverts commit ff11fb1. * react 18.3.1 * Revert "allow any" This reverts commit 4f2571c. * Reapply "allow any" This reverts commit 5dfbbd7. * ft-plattform-komponenter breaking i 5.3.1 * nå også med oppdatert lockfile * major updates * fjerne resolution * fiks chai issues * fjerner stylelint-greier * rydder * bump minor/patch igjen * endringslogg major bomp * Revert "endringslogg major bomp" This reverts commit 4ee5dca.
1 parent 7311cfe commit edc9127

24 files changed

+553
-1389
lines changed

Diff for: ‎.github/workflows/build-and-deploy.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ jobs:
3636
- name: Sette opp Node
3737
uses: actions/setup-node@v4
3838
with:
39-
node-version: 18.x
39+
node-version: 22.x
4040
cache: yarn
4141
- name: Installere dependencies
4242
run: yarn workspaces focus k9-los-web
43-
- name: CSS lint
44-
run: yarn css:lint
4543
- name: Tester
4644
run: yarn test --maxWorkers=2
4745
- name: Bygge kode

Diff for: ‎.github/workflows/valid-pull-request.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ jobs:
3333
- name: Sette opp Node
3434
uses: actions/setup-node@v4
3535
with:
36-
node-version: 18.x
36+
node-version: 22.x
3737
cache: yarn
3838
- name: Installere dependencies
3939
run: yarn install
40-
- name: CSS lint
41-
run: yarn css:lint
4240
- name: Tester
4341
run: yarn test --maxWorkers=2
4442
- name: Bygge

Diff for: ‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gcr.io/distroless/nodejs18-debian12:nonroot
1+
FROM gcr.io/distroless/nodejs22-debian12:nonroot
22

33
ENV TZ="Europe/Oslo"
44
ENV NODE_ENV production

Diff for: ‎e2e/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"license": "ISC",
1212
"devDependencies": {
1313
"@playwright/test": "1.49.1",
14-
"@types/node": "22.10.3"
14+
"@types/node": "22.10.5"
1515
}
1616
}

Diff for: ‎jest-runner-eslint.config.mjs

-14
This file was deleted.

Diff for: ‎jest.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default {
2525
"^.+\\.(ts|tsx|js|jsx)?$": "babel-jest",
2626
"^.+.(css|less)$": "jest-transform-stub",
2727
},
28-
transformIgnorePatterns: ["<rootDir>.*(node_modules)(?!.*(nav|uuid).*).*$"],
28+
transformIgnorePatterns: ["<rootDir>.*(node_modules)(?!.*(nav|uuid|chai).*).*$"],
2929
// ignore tests in tests folder
3030
moduleDirectories: ["node_modules", "src/client", "src/client/app"],
3131

Diff for: ‎package.json

+22-31
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
"repository": "https://github.com/navikt/k9-los-web",
1212
"license": "MIT",
1313
"dependencies": {
14-
"@formatjs/intl-datetimeformat": "6.17.1",
15-
"@formatjs/intl-numberformat": "8.15.1",
14+
"@formatjs/intl-datetimeformat": "6.17.2",
15+
"@formatjs/intl-numberformat": "8.15.2",
1616
"@grafana/faro-web-sdk": "1.12.2",
1717
"@grafana/faro-web-tracing": "1.12.2",
18-
"@navikt/aksel-icons": "7.9.0",
19-
"@navikt/ds-css": "7.9.0",
20-
"@navikt/ds-react": "7.9.0",
21-
"@navikt/ds-tailwind": "7.9.0",
22-
"@navikt/ds-tokens": "7.9.0",
23-
"@navikt/familie-endringslogg": "13.1.4",
18+
"@navikt/aksel-icons": "7.9.1",
19+
"@navikt/ds-css": "7.9.1",
20+
"@navikt/ds-react": "7.9.1",
21+
"@navikt/ds-tailwind": "7.9.1",
22+
"@navikt/ds-tokens": "7.9.1",
23+
"@navikt/familie-endringslogg": "13.1.5",
2424
"@navikt/fnrvalidator": "2.1.5",
2525
"@navikt/ft-form-hooks": "5.2.9",
2626
"@navikt/ft-form-validators": "2.5.7",
2727
"@navikt/ft-plattform-komponenter": "5.3.0",
2828
"@popperjs/core": "2.11.8",
2929
"@reach/combobox": "0.18.0",
30-
"@sentry/browser": "8.47.0",
31-
"@sentry/cli": "2.39.1",
32-
"@sentry/react": "8.47.0",
30+
"@sentry/browser": "8.48.0",
31+
"@sentry/cli": "2.40.0",
32+
"@sentry/react": "8.48.0",
3333
"axios": "1.7.9",
3434
"classnames": "2.5.1",
3535
"dayjs": "1.11.13",
@@ -88,7 +88,7 @@
8888
"react-router": "6.26.2",
8989
"react-router-dom": "6.26.2",
9090
"tailwindcss": "3.4.17",
91-
"uuid": "10.0.0"
91+
"uuid": "11.0.4"
9292
},
9393
"devDependencies": {
9494
"@babel/core": "7.26.0",
@@ -99,15 +99,14 @@
9999
"@babel/preset-react": "7.26.3",
100100
"@babel/preset-typescript": "7.26.0",
101101
"@babel/register": "7.25.9",
102-
"@chromatic-com/storybook": "2.0.2",
103-
"@navikt/aksel-stylelint": "7.9.0",
102+
"@chromatic-com/storybook": "3.2.3",
104103
"@playwright/test": "1.49.1",
105104
"@storybook/addon-essentials": "8.4.7",
106105
"@storybook/addon-interactions": "8.4.7",
107106
"@storybook/addon-links": "8.4.7",
108107
"@storybook/addon-onboarding": "8.4.7",
109108
"@storybook/addon-styling-webpack": "1.0.1",
110-
"@storybook/addon-webpack5-compiler-swc": "1.0.6",
109+
"@storybook/addon-webpack5-compiler-swc": "2.0.0",
111110
"@storybook/blocks": "8.4.7",
112111
"@storybook/react": "8.4.7",
113112
"@storybook/react-webpack5": "8.4.7",
@@ -116,8 +115,8 @@
116115
"@testing-library/jest-dom": "6.6.3",
117116
"@testing-library/react": "16.1.0",
118117
"@testing-library/user-event": "14.5.2",
119-
"@trivago/prettier-plugin-sort-imports": "4.3.0",
120-
"@types/chai": "4.3.20",
118+
"@trivago/prettier-plugin-sort-imports": "5.2.1",
119+
"@types/chai": "5.0.1",
121120
"@types/history": "5.0.0",
122121
"@types/jest": "29.5.14",
123122
"@types/react": "18.3.18",
@@ -126,14 +125,14 @@
126125
"@types/react-intl": "3.0.0",
127126
"@types/react-redux": "7.1.34",
128127
"@types/react-router-dom": "5.3.3",
129-
"@typescript-eslint/eslint-plugin": "8.19.0",
130-
"@typescript-eslint/parser": "8.19.0",
128+
"@typescript-eslint/eslint-plugin": "8.19.1",
129+
"@typescript-eslint/parser": "8.19.1",
131130
"autoprefixer": "10.4.20",
132131
"babel-eslint": "10.1.0",
133132
"babel-jest": "29.7.0",
134133
"babel-loader": "9.2.1",
135134
"babel-runtime": "6.26.0",
136-
"chai": "4.5.0",
135+
"chai": "5.1.2",
137136
"circular-dependency-plugin": "5.2.2",
138137
"copy-webpack-plugin": "12.0.2",
139138
"cross-env": "7.0.3",
@@ -151,8 +150,8 @@
151150
"eslint-plugin-jest-dom": "5.5.0",
152151
"eslint-plugin-jsx-a11y": "6.10.2",
153152
"eslint-plugin-react": "7.37.3",
154-
"eslint-plugin-react-hooks": "4.6.2",
155-
"eslint-plugin-storybook": "0.11.1",
153+
"eslint-plugin-react-hooks": "5.1.0",
154+
"eslint-plugin-storybook": "0.11.2",
156155
"html-webpack-plugin": "5.6.3",
157156
"husky": "9.1.7",
158157
"identity-obj-proxy": "3.0.0",
@@ -171,28 +170,21 @@
171170
"prettier": "3.4.2",
172171
"prop-types": "15.8.1",
173172
"storybook": "8.4.7",
174-
"stylelint": "15.11.0",
175-
"stylelint-config-prettier": "9.0.5",
176-
"stylelint-order": "6.0.4",
177173
"terser-webpack-plugin": "5.3.11",
178174
"thread-loader": "4.0.4",
179175
"typescript": "5.7.2",
180176
"webpack": "5.97.1",
181-
"webpack-cli": "5.1.4",
177+
"webpack-cli": "6.0.1",
182178
"webpack-dev-server": "5.2.0",
183179
"webpack-merge": "6.0.1"
184180
},
185-
"resolutions": {
186-
"postcss": "8.4.31"
187-
},
188181
"scripts": {
189182
"test": "jest --colors",
190183
"dev-env-variables": "cross-env SOKEBOKS_NYE_KOER=enabled SAKSBEHANDLER_KAN_VELGE_NYE_KOER=enabled AVDELINGSLEDER_TILGANG_TIL_NYE_KOER=enabled K9_LOS_API_URL=http://localhost:8020/api",
191184
"dev": "yarn dev-env-variables cross-env node webpack/webpack.dev.server.mjs --config webpack/webpack.dev.mjs",
192185
"build": "cross-env NODE_ENV=production SENTRY_RELEASE=$(git rev-parse --short HEAD) webpack --config webpack/webpack.prod.mjs",
193186
"ts-check": "tsc --pretty",
194187
"lint": "eslint --cache --fix \"src/**/*.ts?(x)\"",
195-
"css:lint": "stylelint \"src/**/*.css\"",
196188
"up": "docker-compose up -d --remove-orphans --build",
197189
"down": "docker-compose down",
198190
"sentry-release": "(SENTRY_RELEASE=$(git rev-parse --short HEAD); node ./setup/sentry-release.cjs)",
@@ -205,7 +197,6 @@
205197
},
206198
"lint-staged": {
207199
"src/client/**/*.ts?(x)": "eslint --fix",
208-
"src/**/*.(le|c)ss": "stylelint --fix",
209200
"src/client/**/*.{ts,tsx,js,jsx,css,less}": "prettier --write"
210201
},
211202
"eslintConfig": {

Diff for: ‎src/client/app/admin/components/AdminDashboard.tsx

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32
import * as styles from './adminDashboard.css';
43

5-
type TsProps = Readonly<{
4+
interface AdminDashboardProps {
65
children: React.ReactNode;
7-
}>;
6+
}
87

98
/**
109
* AvdelingslederDashboard
1110
*/
12-
const AdminDashboard = ({ children }: TsProps) => (
11+
const AdminDashboard = ({ children }: AdminDashboardProps) => (
1312
<div>
1413
<div className={styles.oppgaveContainer}>
1514
<div className={styles.gridContainer}>
@@ -21,8 +20,4 @@ const AdminDashboard = ({ children }: TsProps) => (
2120
</div>
2221
);
2322

24-
AdminDashboard.propTypes = {
25-
children: PropTypes.node.isRequired,
26-
};
27-
2823
export default AdminDashboard;

Diff for: ‎src/client/app/form/finalFields/CustomNavSelect.tsx

-92
This file was deleted.

Diff for: ‎src/client/app/form/finalFields/OptionGrid.tsx

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32
import { PersonPencilIcon } from '@navikt/aksel-icons';
43
import { FlexColumn, FlexContainer, FlexRow } from 'sharedComponents/flexGrid';
54
import { range } from 'utils/arrayUtils';
65
import * as styles from './optionGrid.css';
76

8-
export const OptionGrid = ({ columns, rows, options, spaceBetween, isEdited, direction }) => {
7+
interface OptionGridProps {
8+
columns?: number;
9+
options: React.ReactElement[];
10+
spaceBetween?: boolean;
11+
isEdited?: boolean;
12+
direction?: string;
13+
rows?: number;
14+
}
15+
16+
export const OptionGrid = ({ columns, rows, options, spaceBetween, isEdited, direction }: OptionGridProps) => {
917
if (direction === 'vertical') {
1018
const numRows = rows || options.length;
1119
return (
@@ -36,15 +44,6 @@ export const OptionGrid = ({ columns, rows, options, spaceBetween, isEdited, dir
3644
);
3745
};
3846

39-
OptionGrid.propTypes = {
40-
columns: PropTypes.number,
41-
options: PropTypes.arrayOf(PropTypes.element).isRequired,
42-
spaceBetween: PropTypes.bool,
43-
isEdited: PropTypes.bool,
44-
direction: PropTypes.string,
45-
rows: PropTypes.number,
46-
};
47-
4847
OptionGrid.defaultProps = {
4948
columns: 0,
5049
rows: 0,

Diff for: ‎src/client/app/saksbehandler/behandlingskoer/components/menu/MenuButton.tsx

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32
import { Detail } from '@navikt/ds-react';
43
import * as styles from './menuButton.css';
54

6-
type TsProps = Readonly<{
7-
onClick: () => void;
8-
children: JSX.Element;
9-
}>;
5+
interface MenuButtonProps {
6+
onClick(...args: unknown[]): unknown;
7+
children: React.ReactElement;
8+
}
109

1110
/**
1211
* MenuButton
1312
*
1413
* Presentasjonskomponent. Lager lenker i behandlingsmeny
1514
*/
16-
const MenuButton = React.forwardRef(({ onClick, children }: TsProps, ref) => (
15+
const MenuButton = React.forwardRef<HTMLElement, MenuButtonProps>(({ onClick, children }: TsProps, ref) => (
1716
<button ref={ref} className={styles.button} onClick={onClick} type="button">
1817
<Detail>{children}</Detail>
1918
</button>
2019
));
2120

22-
MenuButton.propTypes = {
23-
onClick: PropTypes.func.isRequired,
24-
children: PropTypes.element.isRequired,
25-
};
26-
2721
export default MenuButton;

0 commit comments

Comments
 (0)