From 34b6b65b1e1803d8aeefe99dfcd95e6e7ac09f33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 07:00:13 +0000 Subject: [PATCH 1/2] Bump @navikt/nav-dekoratoren-moduler from 2.1.6 to 3.1.0 Bumps [@navikt/nav-dekoratoren-moduler](https://github.com/navikt/nav-dekoratoren-moduler) from 2.1.6 to 3.1.0. - [Release notes](https://github.com/navikt/nav-dekoratoren-moduler/releases) - [Commits](https://github.com/navikt/nav-dekoratoren-moduler/compare/v2.1.6...v3.1.0) --- updated-dependencies: - dependency-name: "@navikt/nav-dekoratoren-moduler" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 86 +++++------------------------------------------ package.json | 2 +- 2 files changed, 9 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01062c0..8425955 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@navikt/aksel-icons": "^7.1.2", "@navikt/ds-css": "^7.1.2", "@navikt/ds-react": "^7.1.2", - "@navikt/nav-dekoratoren-moduler": "^2.1.6", + "@navikt/nav-dekoratoren-moduler": "^3.1.0", "@sentry/nextjs": "^8.33.1", "axios": "^1.7.7", "html-react-parser": "^5.1.17", @@ -978,44 +978,18 @@ "license": "MIT" }, "node_modules/@navikt/nav-dekoratoren-moduler": { - "version": "2.1.6", - "resolved": "https://npm.pkg.github.com/download/@navikt/nav-dekoratoren-moduler/2.1.6/049e1daeecff43519e41e387f21fd7e3634c2bd3", - "integrity": "sha512-P9c+a8/HuIY6XScNr/DVS7lZ0UtndzYAMEaIVdAzCOrG4SudY4tXSp+44g1V58GKml1RjdzOfGVF4hxmFv3SiA==", + "version": "3.1.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/nav-dekoratoren-moduler/3.1.0/d0731ed243140296e5d363ecaba39da3e314031e", + "integrity": "sha512-Lul6z6U0NQJEnIksLYehoThk89tFDeS06ElHgbF5Q+nJ0qMbwVc5IQIyC93LykHYzzxczy83Q1Gp/iNs9xmgqw==", "license": "MIT", - "dependencies": { - "csp-header": "^5.1.0", - "html-react-parser": "^3.0.16", - "node-cache": "^5.1.2" - }, "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", - "resolved": "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-3.1.7.tgz", - "integrity": "sha512-cDgNF4YgF6J3H+d9mcldGL19p0GzVdS3iGuDNzYWQpU47q3+IRM85X3Xo07E+nntF4ek4s78A9V24EwxlPTjig==", - "dependencies": { - "domhandler": "5.0.3", - "htmlparser2": "8.0.2" - } - }, - "node_modules/@navikt/nav-dekoratoren-moduler/node_modules/html-react-parser": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/html-react-parser/-/html-react-parser-3.0.16.tgz", - "integrity": "sha512-ysQZtRFPcg+McVb4B05oNWSnqM14zagpvTgGcI5e1/BvCl38YwzWzKibrbBmXeemg70olN1bAoeixo7o06G5Eg==", - "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" + "react": ">=17.x" } }, "node_modules/@next/env": { @@ -3801,14 +3775,6 @@ "node": ">=12" } }, - "node_modules/clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "engines": { - "node": ">=0.8" - } - }, "node_modules/clsx": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", @@ -3974,6 +3940,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/csp-header/-/csp-header-5.2.1.tgz", "integrity": "sha512-qOJNu39JZkPrbrAM40a1tQCePEPYVIoI6nMDhX4RA07QjU8efS+zyd/zE83XJu85KKazH9NjKlvvlswFMteMgg==", + "peer": true, "engines": { "node": ">=10" } @@ -6149,11 +6116,6 @@ "node": ">=10" } }, - "node_modules/inline-style-parser": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz", - "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==" - }, "node_modules/internal-slot": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", @@ -7793,17 +7755,6 @@ } } }, - "node_modules/node-cache": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz", - "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==", - "dependencies": { - "clone": "2.x" - }, - "engines": { - "node": ">= 8.0.0" - } - }, "node_modules/node-fetch": { "version": "2.6.13", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz", @@ -8669,11 +8620,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, - "node_modules/react-property": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz", - "integrity": "sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw==" - }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -9461,22 +9407,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/style-to-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.3.tgz", - "integrity": "sha512-zKI5gN/zb7LS/Vm0eUwjmjrXWw8IMtyA8aPBJZdYiQTXj4+wQ3IucOLIOnF7zCHxvW8UhIGh/uZh/t9zEHXNTQ==", - "dependencies": { - "style-to-object": "0.4.1" - } - }, - "node_modules/style-to-object": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz", - "integrity": "sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==", - "dependencies": { - "inline-style-parser": "0.1.1" - } - }, "node_modules/styled-components": { "version": "6.1.13", "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.13.tgz", diff --git a/package.json b/package.json index f916580..55c4236 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@navikt/aksel-icons": "^7.1.2", "@navikt/ds-css": "^7.1.2", "@navikt/ds-react": "^7.1.2", - "@navikt/nav-dekoratoren-moduler": "^2.1.6", + "@navikt/nav-dekoratoren-moduler": "^3.1.0", "@sentry/nextjs": "^8.33.1", "axios": "^1.7.7", "html-react-parser": "^5.1.17", From a9f7ca0b15451b32717a2cfb34bfdcbdf4c75fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20R=C3=B8ed=20Hestvik?= Date: Tue, 8 Oct 2024 10:54:14 +0200 Subject: [PATCH 2/2] migrating to new version of dekoratoren --- pages/_document.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/_document.tsx b/pages/_document.tsx index d2eb6e4..1d12a84 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -1,4 +1,4 @@ -import { DecoratorComponents, fetchDecoratorReact } from '@navikt/nav-dekoratoren-moduler/ssr'; +import { DecoratorComponentsReact, fetchDecoratorReact } from '@navikt/nav-dekoratoren-moduler/ssr'; import getConfig from 'next/config'; import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document'; import { ServerStyleSheet } from 'styled-components'; @@ -6,7 +6,7 @@ import { ServerStyleSheet } from 'styled-components'; const { publicRuntimeConfig } = getConfig(); interface Props { - Decorator: DecoratorComponents; + Decorator: DecoratorComponentsReact; } export default class MyDocument extends Document { static async getInitialProps(ctx: DocumentContext) { @@ -45,12 +45,12 @@ export default class MyDocument extends Document { } } render() { - const { Styles, Scripts, Header, Footer } = this.props.Decorator; + const { HeadAssets, Scripts, Header, Footer } = this.props.Decorator; const disableDecorator = process.env.DECORATOR_DISABLED !== 'true'; return ( - {disableDecorator && } + {disableDecorator && } {disableDecorator &&
}