Merge pull request #1997 from navikt/npm-update

Npm update
navikt · Aug 28, 2024 · 7350c65 · 7350c65
2 parents e5f7099 + a59fc0f
commit 7350c65
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 83 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,15 +44,14 @@
         "@navikt/ds-css": "6.13.0",
         "@navikt/ds-react": "6.13.0",
         "@navikt/ds-tokens": "6.13.0",
-        "@navikt/nav-dekoratoren-moduler": "3.0.0-beta.4",
+        "@navikt/nav-dekoratoren-moduler": "3.0.0-beta.9",
         "@navikt/nav-office-reception-info": "1.0.7",
         "@reduxjs/toolkit": "2.2.6",
         "csp-header": "5.2.1",
         "dayjs": "1.11.11",
         "fuse.js": "6.6.2",
         "html-react-parser": "5.1.10",
         "js-cookie": "3.0.5",
-        "jsdom": "24.1.0",
         "jsep": "1.3.8",
         "lodash.debounce": "4.0.8",
         "lru-cache": "10.4.0",
@@ -139,9 +138,6 @@
             "last 1 safari version"
         ]
     },
-    "browser": {
-        "jsdom": false
-    },
     "lint-staged": {
         "*.{ts,tsx}": [
             "prettier --write",

diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document';
 import { DocumentInitialProps } from 'next/dist/pages/_document';
-import { DecoratorComponents } from '@navikt/nav-dekoratoren-moduler/ssr';
+import { DecoratorComponentsReact } from '@navikt/nav-dekoratoren-moduler/ssr';
 import { Language } from 'translations';
 import { DocumentParameter } from 'components/_common/metatags/DocumentParameterMetatags';
 import { getDecoratorComponents } from 'srcCommon/decorator-utils-serverside';
 
 type DocumentProps = {
     language: Language;
-    Decorator: DecoratorComponents;
+    Decorator: DecoratorComponentsReact;
     isLegacyContentType: boolean;
 };
 
@@ -60,7 +60,6 @@ class MyDocument extends Document<DocumentProps> {
                 <Head>
                     {Decorator && (
                         <>
-                            <Decorator.Styles />
                             <Decorator.HeadAssets />
                         </>
                     )}

diff --git a/src/utils/decorator-utils.ts b/src/utils/decorator-utils.ts
@@ -92,8 +92,9 @@ export const getDecoratorParams = (content: ContentProps): DecoratorParams => {
         ...(decoratorLanguage && { language: decoratorLanguage }),
         breadcrumbs:
             breadcrumbs?.map((crumb) => ({
-                handleInApp: true,
                 ...crumb,
+                handleInApp: true,
+                analyticsTitle: crumb.title,
             })) || [],
         availableLanguages: getDecoratorLanguagesParam(
             getContentLanguages(content),