Skip to content

Commit 7350c65

Browse files
authored
Merge pull request #1997 from navikt/npm-update
Npm update
2 parents e5f7099 + a59fc0f commit 7350c65

File tree

4 files changed

+30
-83
lines changed

4 files changed

+30
-83
lines changed

package-lock.json

+25-74
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,14 @@
4444
"@navikt/ds-css": "6.13.0",
4545
"@navikt/ds-react": "6.13.0",
4646
"@navikt/ds-tokens": "6.13.0",
47-
"@navikt/nav-dekoratoren-moduler": "3.0.0-beta.4",
47+
"@navikt/nav-dekoratoren-moduler": "3.0.0-beta.9",
4848
"@navikt/nav-office-reception-info": "1.0.7",
4949
"@reduxjs/toolkit": "2.2.6",
5050
"csp-header": "5.2.1",
5151
"dayjs": "1.11.11",
5252
"fuse.js": "6.6.2",
5353
"html-react-parser": "5.1.10",
5454
"js-cookie": "3.0.5",
55-
"jsdom": "24.1.0",
5655
"jsep": "1.3.8",
5756
"lodash.debounce": "4.0.8",
5857
"lru-cache": "10.4.0",
@@ -139,9 +138,6 @@
139138
"last 1 safari version"
140139
]
141140
},
142-
"browser": {
143-
"jsdom": false
144-
},
145141
"lint-staged": {
146142
"*.{ts,tsx}": [
147143
"prettier --write",

src/pages/_document.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react';
22
import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document';
33
import { DocumentInitialProps } from 'next/dist/pages/_document';
4-
import { DecoratorComponents } from '@navikt/nav-dekoratoren-moduler/ssr';
4+
import { DecoratorComponentsReact } from '@navikt/nav-dekoratoren-moduler/ssr';
55
import { Language } from 'translations';
66
import { DocumentParameter } from 'components/_common/metatags/DocumentParameterMetatags';
77
import { getDecoratorComponents } from 'srcCommon/decorator-utils-serverside';
88

99
type DocumentProps = {
1010
language: Language;
11-
Decorator: DecoratorComponents;
11+
Decorator: DecoratorComponentsReact;
1212
isLegacyContentType: boolean;
1313
};
1414

@@ -60,7 +60,6 @@ class MyDocument extends Document<DocumentProps> {
6060
<Head>
6161
{Decorator && (
6262
<>
63-
<Decorator.Styles />
6463
<Decorator.HeadAssets />
6564
</>
6665
)}

src/utils/decorator-utils.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ export const getDecoratorParams = (content: ContentProps): DecoratorParams => {
9292
...(decoratorLanguage && { language: decoratorLanguage }),
9393
breadcrumbs:
9494
breadcrumbs?.map((crumb) => ({
95-
handleInApp: true,
9695
...crumb,
96+
handleInApp: true,
97+
analyticsTitle: crumb.title,
9798
})) || [],
9899
availableLanguages: getDecoratorLanguagesParam(
99100
getContentLanguages(content),

0 commit comments

Comments
 (0)