Skip to content

Commit 1b56136

Browse files
Thomas-CTThomas-CT
committedFeb 26, 2024·
Upgrade and migrate to vite v5, vitest v1, and jsdom v24
1 parent 8767e55 commit 1b56136

File tree

5 files changed

+558
-468
lines changed

5 files changed

+558
-468
lines changed
 

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
"@typescript-eslint/eslint-plugin": "^6.17.0",
5656
"@typescript-eslint/parser": "^6.17.0",
5757
"@vitejs/plugin-react": "^4.2.1",
58-
"@vitest/browser": "^0.34.6",
59-
"@vitest/coverage-v8": "^0.34.6",
58+
"@vitest/browser": "^1.3.1",
59+
"@vitest/coverage-v8": "^1.3.1",
6060
"concurrently": "^8.2.2",
6161
"cross-env": "^7.0.3",
6262
"cypress": "^13.6.5",
@@ -70,16 +70,16 @@
7070
"eslint-plugin-vitest": "^0.3.22",
7171
"eslint-plugin-vitest-globals": "^1.4.0",
7272
"husky": "^9.0.11",
73-
"jsdom": "^22.1.0",
73+
"jsdom": "^24.0.0",
7474
"lint-staged": "^15.2.2",
7575
"prettier": "^3.2.5",
7676
"prettier-plugin-organize-imports": "^3.2.4",
7777
"rimraf": "^5.0.5",
7878
"typescript": "^5.3.3",
79-
"vite": "^4.5.2",
79+
"vite": "^5.1.4",
8080
"vite-plugin-html": "^3.2.2",
8181
"vite-tsconfig-paths": "^4.3.1",
82-
"vitest": "0.34.6",
82+
"vitest": "^1.3.1",
8383
"vitest-fetch-mock": "^0.2.2"
8484
},
8585
"engines": {

‎packages/bygger-backend/src/services/PublisherService.test.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { FormPropertiesType, NavFormType } from '@navikt/skjemadigitalisering-shared-domain';
1+
import { NavFormType } from '@navikt/skjemadigitalisering-shared-domain';
22
import nock from 'nock';
3+
import { MockInstance } from 'vitest';
34
import { Backend } from '../Backend';
45
import config from '../config';
56
import PublisherService from './PublisherService';
@@ -85,12 +86,7 @@ describe('PublisherService', () => {
8586
});
8687

8788
describe('when publishing fails', () => {
88-
// @ts-ignore
89-
let formioServiceSpy: vi.SpyInstance<
90-
Promise<NavFormType>,
91-
[form: NavFormType, formioToken: string, userName: string, formProps?: Partial<FormPropertiesType> | undefined]
92-
>;
93-
89+
let formioServiceSpy: MockInstance;
9490
let nockScope: nock.Scope;
9591
let formioApiRequestBodies: NavFormType[];
9692

‎packages/bygger/src/hooks/useTemaKoder.test.tsx

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { AppConfigProvider } from '@navikt/skjemadigitalisering-shared-components';
22
import { renderHook, waitFor } from '@testing-library/react';
3+
import { MockInstance } from 'vitest';
34
import createMockImplementation from '../../test/backendMockImplementation';
45
import useTemaKoder from './useTemaKoder';
56

67
describe('useTemaKoder', () => {
7-
// @ts-ignore
8-
let fetchSpy: vi.SpyInstance;
8+
let fetchSpy: MockInstance;
99
let appConfig: any;
1010
const projectUrl = 'http://test.example.org';
1111

@@ -35,10 +35,13 @@ describe('useTemaKoder', () => {
3535
});
3636

3737
describe('When fetch returns with not ok', () => {
38-
let errorSpy;
39-
// @ts-ignore
40-
beforeEach(() => (errorSpy = vi.spyOn(console, 'error').mockImplementation(vi.fn())));
41-
afterEach(() => errorSpy.mockClear());
38+
let errorSpy: MockInstance;
39+
beforeEach(() => {
40+
errorSpy = vi.spyOn(console, 'error').mockImplementation(vi.fn());
41+
});
42+
afterEach(() => {
43+
errorSpy.mockClear();
44+
});
4245

4346
it('returns an error message', async () => {
4447
fetchSpy.mockImplementation(() => Promise.resolve(new Response(null, { status: 503 })));

‎packages/shared-components/src/formio/overrides/utils-overrides/__snapshots__/utils-overrides.test.js.snap

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22

33
exports[`utils-overrides > getDiffTag > component has new default prop in schema > returns no tag if component has not changed, only default schema 1`] = `""`;
44

5-
exports[`utils-overrides > getDiffTag > component has new default prop in schema > returns tag "NY" if component does not exist in published form 1`] = `"<span class=\\"navds-tag navds-tag--warning navds-tag--xsmall navds-detail navds-detail--small\\">Ny</span>"`;
5+
exports[`utils-overrides > getDiffTag > component has new default prop in schema > returns tag "NY" if component does not exist in published form 1`] = `"<span class="navds-tag navds-tag--warning navds-tag--xsmall navds-detail navds-detail--small">Ny</span>"`;
66

77
exports[`utils-overrides > getDiffTag > returns no tag even if component is changed when it renders outside builder 1`] = `""`;
88

99
exports[`utils-overrides > getDiffTag > returns no tag when component is unchanged 1`] = `""`;
1010

11-
exports[`utils-overrides > getDiffTag > returns tag 'Endring' when component is changed 1`] = `"<span class=\\"navds-tag navds-tag--warning navds-tag--xsmall navds-detail navds-detail--small\\">Endring</span>"`;
11+
exports[`utils-overrides > getDiffTag > returns tag 'Endring' when component is changed 1`] = `"<span class="navds-tag navds-tag--warning navds-tag--xsmall navds-detail navds-detail--small">Endring</span>"`;
1212

13-
exports[`utils-overrides > getDiffTag > returns tag 'Ny' when component does not exist in published form 1`] = `"<span class=\\"navds-tag navds-tag--warning navds-tag--xsmall navds-detail navds-detail--small\\">Ny</span>"`;
13+
exports[`utils-overrides > getDiffTag > returns tag 'Ny' when component does not exist in published form 1`] = `"<span class="navds-tag navds-tag--warning navds-tag--xsmall navds-detail navds-detail--small">Ny</span>"`;
1414

1515
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > empty html when navSelect is not changed 1`] = `""`;
1616

17-
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > should list change in conditional 1`] = `"<span id=\\"nav-form-diff-changed-elements\\" class=\\"navds-body-short font-bold\\">Endringer</span><ul aria-labelledby=\\"nav-form-diff-changed-elements\\"><li>conditional.eq: Fra 'sommer' til 'vinter'</li></ul>"`;
17+
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > should list change in conditional 1`] = `"<span id="nav-form-diff-changed-elements" class="navds-body-short font-bold">Endringer</span><ul aria-labelledby="nav-form-diff-changed-elements"><li>conditional.eq: Fra 'sommer' til 'vinter'</li></ul>"`;
1818

19-
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > should list changed key 1`] = `"<span id=\\"nav-form-diff-changed-elements\\" class=\\"navds-body-short font-bold\\">Endringer</span><ul aria-labelledby=\\"nav-form-diff-changed-elements\\"><li>key: Fra 'borDuINorge1' til 'doYouLiveInNorway'</li></ul>"`;
19+
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > should list changed key 1`] = `"<span id="nav-form-diff-changed-elements" class="navds-body-short font-bold">Endringer</span><ul aria-labelledby="nav-form-diff-changed-elements"><li>key: Fra 'borDuINorge1' til 'doYouLiveInNorway'</li></ul>"`;
2020

21-
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > should list changes for navSelect 1`] = `"<span id=\\"nav-form-diff-changed-elements\\" class=\\"navds-body-short font-bold\\">Endringer</span><ul aria-labelledby=\\"nav-form-diff-changed-elements\\"><li>label: Fra 'Instrument' til 'Velg instrument'</li><li>data.values: Fra '[{\\"label\\":\\"Gitar\\",\\"value\\":\\"gitar\\"},{\\"label\\":\\"Trommer\\",\\"value\\":\\"trommer\\"},{\\"label\\":\\"Piano\\",\\"value\\":\\"piano\\"},{\\"label\\":\\"Trekkspill\\",\\"value\\":\\"trekkspill\\"},{\\"label\\":\\"Munnspill\\",\\"value\\":\\"munnspill\\"}]' til '[{\\"label\\":\\"Gitar\\",\\"value\\":\\"gitar\\"},{\\"label\\":\\"Trommer\\",\\"value\\":\\"trommer\\"},{\\"label\\":\\"Piano\\",\\"value\\":\\"piano\\"},{\\"label\\":\\"Trekkspill\\",\\"value\\":\\"trekkspill\\"}]'</li><li>defaultValue: Fra 'undefined' til '{\\"label\\":\\"Trommer\\",\\"value\\":\\"trommer\\"}'</li></ul>"`;
21+
exports[`utils-overrides > navFormDiffToHtml > Form -> diff -> html > should list changes for navSelect 1`] = `"<span id="nav-form-diff-changed-elements" class="navds-body-short font-bold">Endringer</span><ul aria-labelledby="nav-form-diff-changed-elements"><li>label: Fra 'Instrument' til 'Velg instrument'</li><li>data.values: Fra '[{"label":"Gitar","value":"gitar"},{"label":"Trommer","value":"trommer"},{"label":"Piano","value":"piano"},{"label":"Trekkspill","value":"trekkspill"},{"label":"Munnspill","value":"munnspill"}]' til '[{"label":"Gitar","value":"gitar"},{"label":"Trommer","value":"trommer"},{"label":"Piano","value":"piano"},{"label":"Trekkspill","value":"trekkspill"}]'</li><li>defaultValue: Fra 'undefined' til '{"label":"Trommer","value":"trommer"}'</li></ul>"`;
2222

23-
exports[`utils-overrides > navFormDiffToHtml > generates html list with changed properties 1`] = `"<span id=\\"nav-form-diff-changed-elements\\" class=\\"navds-body-short font-bold\\">Endringer</span><ul aria-labelledby=\\"nav-form-diff-changed-elements\\"><li>label: Fra 'Fornavn' til 'Oppgi fornavn'</li><li>id: Fra 'ehnemzu' til 'e6s77h'</li></ul>"`;
23+
exports[`utils-overrides > navFormDiffToHtml > generates html list with changed properties 1`] = `"<span id="nav-form-diff-changed-elements" class="navds-body-short font-bold">Endringer</span><ul aria-labelledby="nav-form-diff-changed-elements"><li>label: Fra 'Fornavn' til 'Oppgi fornavn'</li><li>id: Fra 'ehnemzu' til 'e6s77h'</li></ul>"`;
2424

25-
exports[`utils-overrides > navFormDiffToHtml > generates html list with deleted radiopanel from panel 1`] = `"<span id=\\"nav-form-diff-deleted-elements\\" class=\\"navds-body-short font-bold\\">Slettede elementer</span><ul aria-labelledby=\\"nav-form-diff-deleted-elements\\"><li>radiopanel: Bekreftelse på skoleplass</li></ul>"`;
25+
exports[`utils-overrides > navFormDiffToHtml > generates html list with deleted radiopanel from panel 1`] = `"<span id="nav-form-diff-deleted-elements" class="navds-body-short font-bold">Slettede elementer</span><ul aria-labelledby="nav-form-diff-deleted-elements"><li>radiopanel: Bekreftelse på skoleplass</li></ul>"`;
2626

27-
exports[`utils-overrides > navFormDiffToHtml > generates nested html list with deleted datagrid and its components 1`] = `"<span id=\\"nav-form-diff-deleted-elements\\" class=\\"navds-body-short font-bold\\">Slettede elementer</span><ul aria-labelledby=\\"nav-form-diff-deleted-elements\\"><li>datagrid: Dine hunder<ul><li>textfield: Navn</li><li>textfield: Rase</li></ul></li></ul>"`;
27+
exports[`utils-overrides > navFormDiffToHtml > generates nested html list with deleted datagrid and its components 1`] = `"<span id="nav-form-diff-deleted-elements" class="navds-body-short font-bold">Slettede elementer</span><ul aria-labelledby="nav-form-diff-deleted-elements"><li>datagrid: Dine hunder<ul><li>textfield: Navn</li><li>textfield: Rase</li></ul></li></ul>"`;
2828

2929
exports[`utils-overrides > navFormDiffToHtml > handles failure when diffSummary is of unexpected type 1`] = `"<span>Det oppstod dessverre en feil under behandling av endringene i dette skjemaet.</span>"`;
3030

31-
exports[`utils-overrides > navFormDiffToHtml > ignores props whos value changes from undefined to falsy 1`] = `"<span id=\\"nav-form-diff-changed-elements\\" class=\\"navds-body-short font-bold\\">Endringer</span><ul aria-labelledby=\\"nav-form-diff-changed-elements\\"><li>label: Fra 'WIP' til 'Svar ja eller nei?'</li></ul>"`;
31+
exports[`utils-overrides > navFormDiffToHtml > ignores props whos value changes from undefined to falsy 1`] = `"<span id="nav-form-diff-changed-elements" class="navds-body-short font-bold">Endringer</span><ul aria-labelledby="nav-form-diff-changed-elements"><li>label: Fra 'WIP' til 'Svar ja eller nei?'</li></ul>"`;

‎yarn.lock

+531-440
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.