Skip to content

Commit 1c40b8b

Browse files
authored
Merge pull request #397 from navikt/dep-bumps-dev
Oppgrader dev dependencies
2 parents 38c06a3 + f8a78a2 commit 1c40b8b

File tree

5 files changed

+44
-37
lines changed

5 files changed

+44
-37
lines changed

bun.lockb

20.6 KB
Binary file not shown.

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "internarbeidsflate-decorator",
33
"private": "true",
4+
"type": "module",
45
"workspaces": [
56
"packages/dev-server",
67
"packages/internarbeidsflate-decorator-v3"
@@ -14,4 +15,4 @@
1415
"dependencies": {
1516
"@navikt/navspa": "^6.0.1"
1617
}
17-
}
18+
}

packages/internarbeidsflate-decorator-v3/package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@
2525
"test": "vitest"
2626
},
2727
"devDependencies": {
28-
"@types/react": "^18.2.0",
29-
"@types/react-dom": "^18.2.0",
30-
"@typescript-eslint/eslint-plugin": "^6.0.0",
31-
"@typescript-eslint/parser": "^6.0.0",
28+
"@types/react": "^18.2.75",
29+
"@types/react-dom": "^18.2.24",
30+
"@typescript-eslint/eslint-plugin": "^7.6.0",
31+
"@typescript-eslint/parser": "^7.6.0",
3232
"@vitejs/plugin-react": "^4.2.1",
33-
"autoprefixer": "^10.4.16",
33+
"autoprefixer": "^10.4.19",
3434
"concurrently": "^8.2.2",
35-
"eslint": "^8.45.0",
35+
"eslint": "^8.57.0",
3636
"eslint-plugin-react-hooks": "^4.6.0",
37-
"eslint-plugin-react-refresh": "^0.4.3",
38-
"msw": "^2.1.1",
39-
"postcss": "^8.4.30",
40-
"prettier": "^3.0.3",
37+
"eslint-plugin-react-refresh": "^0.4.6",
38+
"msw": "^2.2.13",
39+
"postcss": "^8.4.38",
40+
"prettier": "^3.2.5",
4141
"react": "^18.2.0",
4242
"react-dom": "^18.2.0",
43-
"tailwindcss": "^3.3.3",
44-
"typescript": "^5.0.2",
45-
"vite": "^4.4.5",
46-
"vitest": "^1.2.0",
43+
"tailwindcss": "^3.4.3",
44+
"typescript": "^5.4.4",
45+
"vite": "^5.2.8",
46+
"vitest": "^1.4.0",
4747
"vitest-websocket-mock": "^0.3.0"
4848
},
4949
"peerDependencies": {
@@ -56,8 +56,8 @@
5656
"@navikt/ds-react": "^5.12.4",
5757
"@navikt/ds-tailwind": "^5.12.4",
5858
"@navikt/ds-tokens": "^5.12.4",
59-
"@tanstack/query-core": "^5.17.19",
59+
"@tanstack/query-core": "^5.29.0",
6060
"use-sync-external-store": "^1.2.0",
61-
"zustand": "^4.4.1"
61+
"zustand": "^4.5.2"
6262
}
63-
}
63+
}

packages/internarbeidsflate-decorator-v3/src/store/__test__/StoreHandler.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @typescript-eslint/ban-ts-comment */
1+
22
import { describe, it, beforeEach, afterEach, expect, vi } from 'vitest';
33
import { WS } from 'vitest-websocket-mock';
44
import { HttpHandler } from 'msw';

packages/internarbeidsflate-decorator-v3/src/wrapper/Wrapper.tsx

+24-18
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,52 @@
11
import React, { useEffect, useState } from 'react';
22
import { Button, TextField } from '@navikt/ds-react';
33
import { useTempValue } from './hooks/useTempValue';
4-
import { WebSocketWrapper} from '../api/WebSocketWrapper';
5-
import Decorator from '../App'
4+
import { WebSocketWrapper } from '../api/WebSocketWrapper';
5+
import Decorator from '../App';
66
import { ContextHolderAPI } from '../api/ContextHolderAPI';
77
const WS_URL = 'ws://localhost:4000/ws';
8-
const URL = 'http://localhost:4000/modiacontextholder/api/context'
8+
const URL = 'http://localhost:4000/modiacontextholder/api/context';
99

10-
const ident = 'Z999999'
10+
const ident = 'Z999999';
1111

1212
const Wrapper: React.FC = () => {
1313
const [enhet, tmpEnhet, setTmpEnhet, makeTheEnhetChange] = useTempValue('');
1414
const [fnr, tmpFnr, setTmpFnr, makeTheFnrChange] = useTempValue('');
1515
const [wsEnhet, setWsEnhet] = useState('');
1616
const [wsFnr, setWsFnr] = useState('');
17-
const [_, setWebsocketHandler] = useState<WebSocketWrapper>();
17+
const [, setWebsocketHandler] = useState<WebSocketWrapper>();
1818
const [wsConnected, setWsConntected] = useState(false);
1919
const [wsMessages, setWsMessages] = useState<string[]>([]);
2020
const [propsUpdates, setPropsUpdates] = useState<string[]>([]);
21-
const [api] = useState(() => new ContextHolderAPI(URL))
21+
const [api] = useState(() => new ContextHolderAPI(URL));
2222

2323
useEffect(() => {
2424
if (ident) {
25-
const websocketHandler = new WebSocketWrapper(`${WS_URL}/${ident}`, 'local', {
26-
onOpen: () => setWsConntected(true),
27-
onClose: () => setWsConntected(false),
28-
onMessage: (event) => {
29-
setWsMessages((messages) => {
30-
return [...messages, event.data];
31-
});
25+
const websocketHandler = new WebSocketWrapper(
26+
`${WS_URL}/${ident}`,
27+
'local',
28+
{
29+
onOpen: () => setWsConntected(true),
30+
onClose: () => setWsConntected(false),
31+
onMessage: (event) => {
32+
setWsMessages((messages) => {
33+
return [...messages, event.data];
34+
});
35+
},
3236
},
33-
});
37+
);
3438
websocketHandler.open();
3539
setWebsocketHandler(websocketHandler);
3640
return () => websocketHandler.close();
3741
}
3842
}, []);
3943

4044
const sendNewEnhet = async () => {
41-
await api.changeEnhet(wsEnhet)
45+
await api.changeEnhet(wsEnhet);
4246
};
4347

4448
const sendNewFnr = async () => {
45-
await api.changeFnr(wsFnr)
49+
await api.changeFnr(wsFnr);
4650
};
4751

4852
return (
@@ -111,7 +115,9 @@ const Wrapper: React.FC = () => {
111115
</div>
112116
</div>
113117
<hr className="dr-my-12" />
114-
<div className="dr-text-center dr-w-full dr-mt-8 dr-mb-2">WS oppdatering</div>
118+
<div className="dr-text-center dr-w-full dr-mt-8 dr-mb-2">
119+
WS oppdatering
120+
</div>
115121
<div className="dr-text-center">WS tilkoblet: {`${wsConnected}`}</div>
116122
<div className="dr-flex dr-justify-center dr-w-full">
117123
<div className="dr-mx-2">
@@ -144,6 +150,6 @@ const Wrapper: React.FC = () => {
144150
</div>
145151
</>
146152
);
147-
}
153+
};
148154

149155
export default Wrapper;

0 commit comments

Comments
 (0)