Skip to content

Commit

Permalink
Oppdatere litt pakker (#5395)
Browse files Browse the repository at this point in the history
* Oppdatere @types

Har litt rom mens jeg venter på bygging etc. prøver å ta unna litt pakker

* Patcher

@babel/core               7.23.3   ->   7.23.5
@babel/preset-env    7.23.3   ->   7.23.5
@babel/runtime         7.23.2   ->    7.23.5
nodemon                    3.0.1    ->     3.0.2
postcss                      ^8.4.31 ->  ^8.4.32
nodemon                   3.0.1     ->     3.0.2
postcss                     ^8.4.31 ->    ^8.4.32
tailwindcss               ^3.3.5    ->  ^3.3.6
vis-data                    7.1.7      ->.    7.1.9
vis-timeline               7.7.2      ->.    7.7.3
  • Loading branch information
thomashwi authored Dec 6, 2023
1 parent ed8cda5 commit d45ce18
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 181 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"packages/*"
],
"dependencies": {
"@babel/runtime": "7.23.2",
"@babel/runtime": "7.23.5",
"@formatjs/intl-datetimeformat": "6.11.1",
"@formatjs/intl-numberformat": "8.8.0",
"@hookform/error-message": "^2.0.1",
Expand Down Expand Up @@ -73,10 +73,10 @@
"react-router-dom": "6.18.0"
},
"devDependencies": {
"@babel/core": "7.23.3",
"@babel/core": "7.23.5",
"@babel/eslint-parser": "7.23.3",
"@babel/helper-regex": "7.10.5",
"@babel/preset-env": "7.23.3",
"@babel/preset-env": "7.23.5",
"@babel/preset-react": "7.23.3",
"@babel/preset-typescript": "7.23.3",
"@babel/register": "7.22.15",
Expand Down Expand Up @@ -159,7 +159,7 @@
"mini-css-extract-plugin": "2.7.6",
"msw": "1.3.2",
"msw-storybook-addon": "^1.10.0",
"postcss": "^8.4.31",
"postcss": "^8.4.32",
"prettier": "3.1.0",
"raf": "3.4.1",
"react-popper": "2.3.0",
Expand All @@ -171,7 +171,7 @@
"storybook-react-router": "1.0.8",
"stylelint": "15.11.0",
"stylelint-order": "6.0.3",
"tailwindcss": "^3.3.5",
"tailwindcss": "^3.3.6",
"terser-webpack-plugin": "5.3.9",
"thread-loader": "4.0.2",
"typescript": "5.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-inntektsmelding/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"nav-frontend-spinner-style": "1.0.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"nodemon": "3.0.1",
"nodemon": "3.0.2",
"react": "18.2.0",
"react-collapse": "5.1.1",
"react-dom": "18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-om-barnet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-dom": "18.2.0",
"react-hook-form": "7.48.2",
"react-popper": "2.3.0",
"tailwindcss": "^3.3.5"
"tailwindcss": "^3.3.6"
},
"msw": {
"workerDirectory": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/tidslinje/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-intl": "6.5.5",
"vis-data": "7.1.7",
"vis-timeline": "7.7.2"
"vis-data": "7.1.9",
"vis-timeline": "7.7.3"
}
}
10 changes: 8 additions & 2 deletions packages/tidslinje/src/Timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,14 @@ events.forEach(event => {
eventDefaultProps[`${event}Handler`] = null;
});

/*
* Forsøk for å omgå typescript-feil
*/
interface K9TimelineItem extends Omit<TimelineItem, 'content'> {
content: string;
}
interface Props {
initialItems?: TimelineItem[];
initialItems?: K9TimelineItem[];
initialGroups?: TimelineGroup[];
options?: TimelineOptions;
selection?: IdType[];
Expand All @@ -104,7 +110,7 @@ const Timeline = (
) => {
const el = useRef();
const timeline = useRef<VisTimeline>();
const items: DataSet<TimelineItem> = useMemo(() => new DataSet<TimelineItem>(), []);
const items: DataSet<K9TimelineItem> = useMemo(() => new DataSet<K9TimelineItem>(), []);
const groups: DataSet<TimelineGroup> = useMemo(() => new DataSet<TimelineGroup>(), []);

useEffect(() => {
Expand Down
Loading

0 comments on commit d45ce18

Please sign in to comment.