diff --git a/package-lock.json b/package-lock.json index cdae0ade5..793f381dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@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", @@ -25,7 +25,6 @@ "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", @@ -3721,81 +3720,17 @@ "license": "MIT" }, "node_modules/@navikt/nav-dekoratoren-moduler": { - "version": "3.0.0-beta.4", - "resolved": "https://npm.pkg.github.com/download/@navikt/nav-dekoratoren-moduler/3.0.0-beta.4/c1bee4cb2092c6f46a20623464e75e7a95ca47ba", - "integrity": "sha512-EMd8gq2eARy4qnJhnWFo6UzCENZxmFINf4+uhdxt3bNBbLwvJ/48aDVASq7WexYtDZu2HzNaDyr8IiHwx2rTLw==", - "license": "MIT", - "dependencies": { - "csp-header": "5.2.1", - "html-react-parser": "3.0.16", - "node-cache": "5.1.2" - }, + "version": "3.0.0-beta.9", + "resolved": "https://npm.pkg.github.com/download/@navikt/nav-dekoratoren-moduler/3.0.0-beta.9/6efd9bcb48788109d167928bbf92d92a8c19cfc2", + "integrity": "sha512-a7zonbDtwtuDZn9QWWwFZSDBDvCpBta4ISahJaTen/T1fPOyJ3ZqZSwUXYNnJmR+6F5ye7+XttqiGcjcIyVV/Q==", "engines": { "node": ">=18" }, "peerDependencies": { + "csp-header": ">=5.x", + "html-react-parser": ">=5.x", "jsdom": ">=16.x", - "react": "17.x || 18.x" - } - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/html-dom-parser": { - "version": "3.1.7", - "license": "MIT", - "dependencies": { - "domhandler": "5.0.3", - "htmlparser2": "8.0.2" - } - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/html-react-parser": { - "version": "3.0.16", - "license": "MIT", - "dependencies": { - "domhandler": "5.0.3", - "html-dom-parser": "3.1.7", - "react-property": "2.0.0", - "style-to-js": "1.1.3" - }, - "peerDependencies": { - "react": "0.14 || 15 || 16 || 17 || 18" - } - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/htmlparser2": { - "version": "8.0.2", - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "MIT", - "dependencies": { - "domelementtype": "^2.3.0", - "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" - } - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/inline-style-parser": { - "version": "0.1.1", - "license": "MIT" - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/react-property": { - "version": "2.0.0", - "license": "MIT" - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/style-to-js": { - "version": "1.1.3", - "license": "MIT", - "dependencies": { - "style-to-object": "0.4.1" - } - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/style-to-object": { - "version": "0.4.1", - "license": "MIT", - "dependencies": { - "inline-style-parser": "0.1.1" + "react": ">=17.x" } }, "node_modules/@navikt/nav-office-reception-info": { @@ -6812,6 +6747,7 @@ "node_modules/agent-base": { "version": "7.1.1", "license": "MIT", + "peer": true, "dependencies": { "debug": "^4.3.4" }, @@ -8948,6 +8884,7 @@ "node_modules/cssstyle": { "version": "4.0.1", "license": "MIT", + "peer": true, "dependencies": { "rrweb-cssom": "^0.6.0" }, @@ -8957,7 +8894,8 @@ }, "node_modules/cssstyle/node_modules/rrweb-cssom": { "version": "0.6.0", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/csstype": { "version": "3.1.3", @@ -8972,6 +8910,7 @@ "node_modules/data-urls": { "version": "5.0.0", "license": "MIT", + "peer": true, "dependencies": { "whatwg-mimetype": "^4.0.0", "whatwg-url": "^14.0.0" @@ -12039,6 +11978,7 @@ "node_modules/html-encoding-sniffer": { "version": "4.0.0", "license": "MIT", + "peer": true, "dependencies": { "whatwg-encoding": "^3.1.1" }, @@ -12197,6 +12137,7 @@ "node_modules/http-proxy-agent": { "version": "7.0.2", "license": "MIT", + "peer": true, "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -12236,6 +12177,7 @@ "node_modules/https-proxy-agent": { "version": "7.0.4", "license": "MIT", + "peer": true, "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -14539,6 +14481,7 @@ "node_modules/jsdom": { "version": "24.1.0", "license": "MIT", + "peer": true, "dependencies": { "cssstyle": "^4.0.1", "data-urls": "^5.0.0", @@ -19337,7 +19280,8 @@ }, "node_modules/rrweb-cssom": { "version": "0.7.1", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/rss": { "version": "1.2.2", @@ -21004,6 +20948,7 @@ "node_modules/tr46": { "version": "5.0.0", "license": "MIT", + "peer": true, "dependencies": { "punycode": "^2.3.1" }, @@ -21820,6 +21765,7 @@ "node_modules/w3c-xmlserializer": { "version": "5.0.0", "license": "MIT", + "peer": true, "dependencies": { "xml-name-validator": "^5.0.0" }, @@ -22072,6 +22018,7 @@ "node_modules/whatwg-encoding": { "version": "3.1.1", "license": "MIT", + "peer": true, "dependencies": { "iconv-lite": "0.6.3" }, @@ -22082,6 +22029,7 @@ "node_modules/whatwg-encoding/node_modules/iconv-lite": { "version": "0.6.3", "license": "MIT", + "peer": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -22092,6 +22040,7 @@ "node_modules/whatwg-mimetype": { "version": "4.0.0", "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -22099,6 +22048,7 @@ "node_modules/whatwg-url": { "version": "14.0.0", "license": "MIT", + "peer": true, "dependencies": { "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" @@ -22283,6 +22233,7 @@ "node_modules/xml-name-validator": { "version": "5.0.0", "license": "Apache-2.0", + "peer": true, "engines": { "node": ">=18" } diff --git a/package.json b/package.json index cd3e478d3..654e94051 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@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", @@ -52,7 +52,6 @@ "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 index d5b59f67a..933ea1f1d 100644 --- 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 { {Decorator && ( <> - )} diff --git a/src/utils/decorator-utils.ts b/src/utils/decorator-utils.ts index c96608866..9f115b9b0 100644 --- 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),