Skip to content

Commit 1daf299

Browse files
authored
Merge pull request #1391 from navikt/tech/node-22
Upgrade node: 20.9.0 -> 22.12.0
2 parents 556e988 + 0c6ecdf commit 1daf299

10 files changed

+27
-27
lines changed

.github/workflows/build-and-test.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: actions/setup-node@v4
1818
with:
19-
node-version: '20.9.0'
19+
node-version: '22.12.0'
2020
cache: 'yarn'
2121
cache-dependency-path: '**/yarn.lock'
2222
registry-url: https://npm.pkg.github.com/
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/checkout@v4
5555
- uses: actions/setup-node@v4
5656
with:
57-
node-version: '20.9.0'
57+
node-version: '22.12.0'
5858
cache: 'yarn'
5959
cache-dependency-path: '**/yarn.lock'
6060
registry-url: https://npm.pkg.github.com/
@@ -92,7 +92,7 @@ jobs:
9292
- uses: actions/checkout@v4
9393
- uses: actions/setup-node@v4
9494
with:
95-
node-version: '20.9.0'
95+
node-version: '22.12.0'
9696
cache: 'yarn'
9797
cache-dependency-path: '**/yarn.lock'
9898
registry-url: https://npm.pkg.github.com/

.github/workflows/cypress-tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616
- uses: actions/setup-node@v4
1717
with:
18-
node-version: '20.9.0'
18+
node-version: '22.12.0'
1919
registry-url: https://npm.pkg.github.com/
2020
scope: '@navikt'
2121
- name: set timezone
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/checkout@v4
5858
- uses: actions/setup-node@v4
5959
with:
60-
node-version: '20.9.0'
60+
node-version: '22.12.0'
6161
registry-url: https://npm.pkg.github.com/
6262
scope: '@navikt'
6363
- name: set timezone

.github/workflows/jest-coverage-report.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- uses: actions/setup-node@v4
1616
with:
17-
node-version: '20.9.0'
17+
node-version: '22.12.0'
1818
cache: 'yarn'
1919
cache-dependency-path: '**/yarn.lock'
2020
registry-url: https://npm.pkg.github.com/

.github/workflows/manual-deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v4
2727
- uses: actions/setup-node@v4
2828
with:
29-
node-version: '20.9.0'
29+
node-version: '22.12.0'
3030
cache: 'yarn'
3131
cache-dependency-path: '**/yarn.lock'
3232
registry-url: https://npm.pkg.github.com/
@@ -63,7 +63,7 @@ jobs:
6363
- uses: actions/checkout@v4
6464
- uses: actions/setup-node@v4
6565
with:
66-
node-version: '20.9.0'
66+
node-version: '22.12.0'
6767
cache: 'yarn'
6868
cache-dependency-path: '**/yarn.lock'
6969
registry-url: https://npm.pkg.github.com/

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.9.0
1+
v22.12.0

docker/Dockerfile.bygger

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20.9.0-alpine
1+
FROM node:22.12.0-alpine
22
ENV NODE_ENV=production
33
ARG git_sha
44

docker/Dockerfile.fyllut-base

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20.9.0-alpine
1+
FROM node:22.12.0-alpine
22
ENV NODE_ENV=production
33
ARG git_sha
44

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"vitest-fetch-mock": "^0.3.0"
9090
},
9191
"engines": {
92-
"node": ">=20.9.0"
92+
"node": ">=22.12.0"
9393
},
9494
"lint-staged": {
9595
"*.{js,jsx,ts,tsx,mjs}": [

packages/shared-domain/src/summary/formSummaryUtil.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ describe('form summary', () => {
503503
'',
504504
mockedTranslate,
505505
);
506-
expect(actual[0].value).toEqual('kr 2 512,39'.replaceAll(' ', '\u00A0'));
506+
expect(actual[0].value).toEqual('2 512,39 kr'.replaceAll(' ', '\u00A0'));
507507
});
508508
});
509509

@@ -516,7 +516,7 @@ describe('form summary', () => {
516516
'',
517517
mockedTranslate,
518518
);
519-
expect(actual[0].value).toEqual('NOK 2 512,39'.replaceAll(' ', '\u00A0'));
519+
expect(actual[0].value).toEqual('2 512,39 NOK'.replaceAll(' ', '\u00A0'));
520520
});
521521

522522
it("should not add anything if belop isn't filled", () => {

packages/shared-domain/src/utils/currencyUtils.test.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ import { currencyUtils } from '../index';
33
describe('currencyValidators', () => {
44
describe('toLocaleString', () => {
55
it('decimal', () => {
6-
expect(currencyUtils.toLocaleString(10)).toBe('kr\u00A010,00');
7-
expect(currencyUtils.toLocaleString('10')).toBe('kr\u00A010,00');
8-
expect(currencyUtils.toLocaleString('10.5')).toBe('kr\u00A010,50');
9-
expect(currencyUtils.toLocaleString('10.500000')).toBe('kr\u00A010,50');
10-
expect(currencyUtils.toLocaleString('10.504')).toBe('kr\u00A010,50');
6+
expect(currencyUtils.toLocaleString(10)).toBe('10,00\u00A0kr');
7+
expect(currencyUtils.toLocaleString('10')).toBe('10,00\u00A0kr');
8+
expect(currencyUtils.toLocaleString('10.5')).toBe('10,50\u00A0kr');
9+
expect(currencyUtils.toLocaleString('10.500000')).toBe('10,50\u00A0kr');
10+
expect(currencyUtils.toLocaleString('10.504')).toBe('10,50\u00A0kr');
1111
});
1212

1313
it('integer', () => {
14-
expect(currencyUtils.toLocaleString(10, { integer: true })).toBe('kr\u00A010');
15-
expect(currencyUtils.toLocaleString(10.4, { integer: true })).toBe('kr\u00A010');
16-
expect(currencyUtils.toLocaleString(10.5, { integer: true })).toBe('kr\u00A011');
17-
expect(currencyUtils.toLocaleString('10', { integer: true })).toBe('kr\u00A010');
18-
expect(currencyUtils.toLocaleString('10.5', { integer: true })).toBe('kr\u00A011');
19-
expect(currencyUtils.toLocaleString('10.500000', { integer: true })).toBe('kr\u00A011');
20-
expect(currencyUtils.toLocaleString('10.504', { integer: true })).toBe('kr\u00A011');
21-
expect(currencyUtils.toLocaleString('1000', { integer: true })).toBe('kr\u00A01\u00A0000');
14+
expect(currencyUtils.toLocaleString(10, { integer: true })).toBe('10\u00A0kr');
15+
expect(currencyUtils.toLocaleString(10.4, { integer: true })).toBe('10\u00A0kr');
16+
expect(currencyUtils.toLocaleString(10.5, { integer: true })).toBe('11\u00A0kr');
17+
expect(currencyUtils.toLocaleString('10', { integer: true })).toBe('10\u00A0kr');
18+
expect(currencyUtils.toLocaleString('10.5', { integer: true })).toBe('11\u00A0kr');
19+
expect(currencyUtils.toLocaleString('10.500000', { integer: true })).toBe('11\u00A0kr');
20+
expect(currencyUtils.toLocaleString('10.504', { integer: true })).toBe('11\u00A0kr');
21+
expect(currencyUtils.toLocaleString('1000', { integer: true })).toBe('1\u00A0000\u00A0kr');
2222
});
2323

2424
it('invalid currency', () => {

0 commit comments

Comments
 (0)