Skip to content

Commit

Permalink
Pakkeoppdateringer, inkl. dayjs minmax (#1061)
Browse files Browse the repository at this point in the history
* Pakkeoppdateringer

* oppdatere dayjs - minmax

* Oppdatere jest-dom
  • Loading branch information
frodehansen2 authored Aug 14, 2023
1 parent e9b469c commit e18a242
Show file tree
Hide file tree
Showing 21 changed files with 1,503 additions and 870 deletions.
14 changes: 7 additions & 7 deletions apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
"axios": "1.4.0",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"dayjs": "1.11.8",
"dayjs": "1.11.9",
"dotenv": "16.3.1",
"eslint": "8.46.0",
"eslint": "8.47.0",
"express": "4.18.2",
"formik": "2.4.3",
"helmet": "7.0.0",
Expand All @@ -61,17 +61,17 @@
"react-router-dom": "6.15.0"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/core": "7.22.10",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-modules-commonjs": "7.22.5",
"@babel/preset-env": "7.22.9",
"@babel/preset-env": "7.22.10",
"@babel/preset-react": "7.22.5",
"@types/jest": "29.5.3",
"@types/object-hash": "3.0.2",
"@types/react": "18.2.18",
"@types/object-hash": "3.0.3",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"@types/react-router-dom": "5.3.3",
"autoprefixer": "10.4.14",
"autoprefixer": "10.4.15",
"babel-polyfill": "6.26.0",
"case-sensitive-paths-webpack-plugin": "2.4.0",
"css-loader": "6.8.1",
Expand Down
32 changes: 16 additions & 16 deletions apps/endringsmelding-pleiepenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"constate": "3.3.2",
"cookie-parser": "1.4.6",
"date-fns": "2.30.0",
"dayjs": "1.11.8",
"dayjs": "1.11.9",
"detect-browser": "5.3.0",
"dotenv": "16.3.1",
"express": "4.18.2",
Expand Down Expand Up @@ -65,30 +65,30 @@
"react-router-dom": "6.15.0"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/core": "7.22.10",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-modules-commonjs": "7.22.5",
"@babel/preset-env": "7.22.9",
"@babel/preset-env": "7.22.10",
"@babel/preset-react": "7.22.5",
"@babel/preset-typescript": "7.22.5",
"@mswjs/data": "0.13.0",
"@navikt/ds-tailwind": "4.11.0",
"@storybook/addon-actions": "7.2.1",
"@storybook/addon-essentials": "7.2.1",
"@storybook/addon-interactions": "7.2.1",
"@storybook/addon-links": "7.2.1",
"@storybook/builder-webpack5": "7.2.1",
"@storybook/node-logger": "7.2.1",
"@storybook/preset-create-react-app": "7.2.1",
"@storybook/react": "7.2.1",
"@storybook/react-webpack5": "7.2.1",
"@storybook/addon-actions": "7.2.3",
"@storybook/addon-essentials": "7.2.3",
"@storybook/addon-interactions": "7.2.3",
"@storybook/addon-links": "7.2.3",
"@storybook/builder-webpack5": "7.2.3",
"@storybook/node-logger": "7.2.3",
"@storybook/preset-create-react-app": "7.2.3",
"@storybook/react": "7.2.3",
"@storybook/react-webpack5": "7.2.3",
"@storybook/testing-library": "0.2.0",
"@types/flat": "5.0.2",
"@types/intl": "1.2.0",
"@types/jest": "29.5.3",
"@types/js-cookie": "3.0.3",
"@types/object-hash": "3.0.2",
"@types/react": "18.2.18",
"@types/object-hash": "3.0.3",
"@types/react": "18.2.20",
"@types/react-collapse": "5.0.1",
"@types/react-document-title": "2.0.5",
"@types/react-dom": "18.2.7",
Expand All @@ -103,7 +103,7 @@
"html-webpack-plugin": "5.5.3",
"jsdom": "22.1.0",
"mini-css-extract-plugin": "2.7.6",
"msw": "1.2.2",
"msw": "1.2.3",
"postcss": "8.4.27",
"postcss-import": "15.1.0",
"postcss-loader": "7.3.3",
Expand All @@ -116,7 +116,7 @@
"sass-loader": "13.3.2",
"source-map-loader": "4.0.1",
"start-server-and-test": "2.0.0",
"storybook": "7.2.1",
"storybook": "7.2.3",
"style-loader": "3.3.3",
"tailwindcss": "3.3.3",
"ts-loader": "9.4.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ export const getPeriodeForArbeidsgiverOppslag = (
tillattEndringsperiode: DateRange
): DateRange | undefined => {
const dateRange = {
from: dayjs.max(dayjs(dateRangeAlleSaker.from), dayjs(tillattEndringsperiode.from)).toDate(),
to: dayjs.min(dayjs(dateRangeAlleSaker.to), dayjs(tillattEndringsperiode.to)).toDate(),
from: dayjs.max(dayjs(dateRangeAlleSaker.from), dayjs(tillattEndringsperiode.from))!.toDate(),
to: dayjs.min(dayjs(dateRangeAlleSaker.to), dayjs(tillattEndringsperiode.to))!.toDate(),
};
if (dayjs(dateRange.to).isBefore(dateRange.from)) {
return undefined;
Expand Down
8 changes: 4 additions & 4 deletions apps/omsorgsdager-aleneomsorg-dialog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"axios": "1.4.0",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"dayjs": "1.11.8",
"dayjs": "1.11.9",
"express": "4.18.2",
"formik": "2.4.3",
"helmet": "7.0.0",
Expand All @@ -63,10 +63,10 @@
"devDependencies": {
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-modules-commonjs": "7.22.5",
"@babel/preset-env": "7.22.9",
"@babel/preset-env": "7.22.10",
"@babel/preset-react": "7.22.5",
"@types/object-hash": "3.0.2",
"@types/react": "18.2.18",
"@types/object-hash": "3.0.3",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"@types/react-router-dom": "5.3.3",
"babel-polyfill": "6.26.0",
Expand Down
10 changes: 5 additions & 5 deletions apps/omsorgspengerutbetaling-soknad/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
"uuid": "9.0.0"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/preset-env": "7.22.9",
"@babel/core": "7.22.10",
"@babel/preset-env": "7.22.10",
"@babel/preset-react": "7.22.5",
"@babel/preset-typescript": "7.22.5",
"@types/jest": "29.5.3",
"@types/lodash": "4.14.196",
"@types/object-hash": "3.0.2",
"@types/react": "18.2.18",
"@types/lodash": "4.14.197",
"@types/object-hash": "3.0.3",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"@types/react-router-dom": "5.3.3",
"babel-polyfill": "6.26.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const getÅrstallFromFravær = (
case 1:
return dayjs(dager[0]).get('year');
default:
return dayjs.min(dager.map((d) => dayjs(d))).get('year');
return dayjs.min(dager.map((d) => dayjs(d)))!.get('year');
}
};

Expand All @@ -35,7 +35,7 @@ const getTidsromFromÅrstall = (årstall?: number): DateRange => {
const sisteDagIÅret = dayjs(`${årstall}-12-31`).toDate();
return {
from: førsteDagIÅret,
to: dayjs.min([dayjs(sisteDagIÅret), dayjs(dateToday)]).toDate(),
to: dayjs.min([dayjs(sisteDagIÅret), dayjs(dateToday)])!.toDate(),
};
};

Expand All @@ -47,13 +47,13 @@ const getPeriodeBoundaries = (
let max: Dayjs | undefined;

perioderMedFravær.forEach((p) => {
min = min ? dayjs.min(dayjs(p.fraOgMed), min) : dayjs(p.fraOgMed);
max = max ? dayjs.max(dayjs(p.tilOgMed), max) : dayjs(p.tilOgMed);
min = min ? dayjs.min(dayjs(p.fraOgMed), min)! : dayjs(p.fraOgMed);
max = max ? dayjs.max(dayjs(p.tilOgMed), max)! : dayjs(p.tilOgMed);
});

dagerMedFravær.forEach((d) => {
min = min ? dayjs.min(dayjs(d.dato), min) : dayjs(d.dato);
max = max ? dayjs.max(dayjs(d.dato), max) : dayjs(d.dato);
min = min ? dayjs.min(dayjs(d.dato), min)! : dayjs(d.dato);
max = max ? dayjs.max(dayjs(d.dato), max)! : dayjs(d.dato);
});

return {
Expand Down
28 changes: 14 additions & 14 deletions apps/omsorgspengesoknad/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"busboy": "1.6.0",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"dayjs": "1.11.8",
"dayjs": "1.11.9",
"dotenv": "16.3.1",
"express": "4.18.2",
"formik": "2.4.3",
Expand All @@ -43,23 +43,23 @@
"react-router-dom": "6.15.0"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/preset-env": "7.22.9",
"@babel/core": "7.22.10",
"@babel/preset-env": "7.22.10",
"@babel/preset-react": "7.22.5",
"@babel/preset-typescript": "7.22.5",
"@storybook/addon-actions": "7.2.1",
"@storybook/addon-essentials": "7.2.1",
"@storybook/addon-interactions": "7.2.1",
"@storybook/addon-links": "7.2.1",
"@storybook/builder-webpack5": "7.2.1",
"@storybook/addon-actions": "7.2.3",
"@storybook/addon-essentials": "7.2.3",
"@storybook/addon-interactions": "7.2.3",
"@storybook/addon-links": "7.2.3",
"@storybook/builder-webpack5": "7.2.2",
"@storybook/manager-webpack5": "6.5.16",
"@storybook/node-logger": "7.2.1",
"@storybook/preset-create-react-app": "7.2.1",
"@storybook/react": "7.2.1",
"@storybook/node-logger": "7.2.3",
"@storybook/preset-create-react-app": "7.2.3",
"@storybook/react": "7.2.3",
"@storybook/testing-library": "0.2.0",
"@types/jest": "29.5.3",
"@types/object-hash": "3.0.2",
"@types/react": "18.2.18",
"@types/object-hash": "3.0.3",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"@types/react-router-dom": "5.3.3",
"babel-polyfill": "6.26.0",
Expand All @@ -78,7 +78,7 @@
"sass-loader": "13.3.2",
"source-map-loader": "4.0.1",
"start-server-and-test": "2.0.0",
"storybook": "7.2.1",
"storybook": "7.2.3",
"style-loader": "3.3.3",
"ts-loader": "9.4.4",
"typescript": "5.1.6",
Expand Down
8 changes: 4 additions & 4 deletions apps/sif-ettersending/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"date-fns": "2.30.0",
"dayjs": "1.11.8",
"dayjs": "1.11.9",
"dotenv": "16.3.1",
"express": "4.18.2",
"formik": "2.4.3",
Expand All @@ -51,11 +51,11 @@
"react-router-dom": "6.15.0"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/preset-env": "7.22.9",
"@babel/core": "7.22.10",
"@babel/preset-env": "7.22.10",
"@babel/preset-react": "7.22.5",
"@types/jest": "29.5.3",
"@types/react": "18.2.18",
"@types/react": "18.2.20",
"@types/react-collapse": "5.0.1",
"@types/react-dom": "18.2.7",
"@types/react-router-dom": "5.3.3",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
"devDependencies": {
"@changesets/cli": "2.26.2",
"@navikt/ds-tailwind": "4.11.0",
"@storybook/builder-webpack5": "7.2.1",
"@storybook/builder-webpack5": "7.2.3",
"@storybook/manager-webpack5": "6.5.16",
"@testing-library/dom": "9.3.1",
"@testing-library/jest-dom": "5.17.0",
"@testing-library/jest-dom": "6.0.0",
"@testing-library/react": "14.0.0",
"@testing-library/react-hooks": "8.0.1",
"@testing-library/user-event": "14.4.3",
"check-peer-dependencies": "^4.2.0",
"esbuild": "0.19.0",
"esbuild": "0.19.2",
"esbuild-jest": "0.5.0",
"eslint": "8.46.0",
"eslint": "8.47.0",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.3",
"jest-environment-jsdom": "29.6.2",
Expand All @@ -38,7 +38,7 @@
"react-dom": "18.2.0",
"react-scripts": "5.0.1",
"react-syntax-highlighter": "15.5.0",
"storybook": "7.2.1",
"storybook": "7.2.3",
"turbo": "1.10.12",
"typescript": "5.1.6",
"webpack": "5.88.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/appstatus-react-ds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"dependencies": {
"@portabletext/react": "3.0.4",
"@sanity/client": "6.4.0"
"@sanity/client": "6.4.6"
},
"devDependencies": {
"@navikt/ds-css": "4.11.0",
"@navikt/ds-react": "4.11.0",
"@types/node": "20.4.8",
"@types/react": "18.2.18",
"@types/node": "20.5.0",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"config": "*",
"copyfiles": "2.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@typescript-eslint/eslint-plugin": "6.3.0",
"@typescript-eslint/parser": "6.3.0",
"eslint": "8.46.0",
"eslint": "8.47.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-prettier": "4.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/sif-common-amplitude/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"devDependencies": {
"@types/amplitude-js": "8.16.2",
"@types/node": "20.4.8",
"@types/react": "18.2.18",
"@types/node": "20.5.0",
"@types/react": "18.2.20",
"amplitude-js": "8.21.9",
"config": "*",
"constate": "3.3.2",
Expand Down
Loading

0 comments on commit e18a242

Please sign in to comment.