From c2dd3b0be246376c0686ed395b3f3533760a989d Mon Sep 17 00:00:00 2001 From: Tor Idland Date: Mon, 10 Feb 2025 13:33:52 +0100 Subject: [PATCH] :bug: ikke bruk window i env-sjekk, bruk NEXT_PUBLIC_ENVIRONMENT --- packages/aap-felles-css/CHANGELOG.md | 2 ++ packages/aap-felles-css/package.json | 2 +- packages/aap-felles-prettier/CHANGELOG.md | 2 ++ packages/aap-felles-prettier/package.json | 2 +- packages/aap-felles-react/CHANGELOG.md | 6 ++++++ packages/aap-felles-react/package.json | 2 +- .../src/KelvinAppHeader/KelvinAppHeader.tsx | 8 ++++---- packages/aap-felles-utils-client/CHANGELOG.md | 2 ++ packages/aap-felles-utils-client/package.json | 2 +- packages/aap-felles-utils/CHANGELOG.md | 2 ++ packages/aap-felles-utils/package.json | 2 +- packages/eslint-config-aap/CHANGELOG.md | 2 ++ packages/eslint-config-aap/package.json | 2 +- 13 files changed, 26 insertions(+), 10 deletions(-) diff --git a/packages/aap-felles-css/CHANGELOG.md b/packages/aap-felles-css/CHANGELOG.md index 9cc7d0b..9e9ac6d 100644 --- a/packages/aap-felles-css/CHANGELOG.md +++ b/packages/aap-felles-css/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.3.3 + ## 4.3.2 ## 4.3.1 diff --git a/packages/aap-felles-css/package.json b/packages/aap-felles-css/package.json index cdd513a..45051db 100644 --- a/packages/aap-felles-css/package.json +++ b/packages/aap-felles-css/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.2", + "version": "4.3.3", "name": "@navikt/aap-felles-css", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-prettier/CHANGELOG.md b/packages/aap-felles-prettier/CHANGELOG.md index 5291692..f1da4c3 100644 --- a/packages/aap-felles-prettier/CHANGELOG.md +++ b/packages/aap-felles-prettier/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.3.3 + ## 4.3.2 ## 4.3.1 diff --git a/packages/aap-felles-prettier/package.json b/packages/aap-felles-prettier/package.json index 68d04c5..789490f 100644 --- a/packages/aap-felles-prettier/package.json +++ b/packages/aap-felles-prettier/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/aap-felles-prettier", "author": "NAV", - "version": "4.3.2", + "version": "4.3.3", "main": "index.json", "license": "MIT", "dependencies": { diff --git a/packages/aap-felles-react/CHANGELOG.md b/packages/aap-felles-react/CHANGELOG.md index 8c62ef9..c43e9ef 100644 --- a/packages/aap-felles-react/CHANGELOG.md +++ b/packages/aap-felles-react/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.3.3 + +### Patch Changes + +- avoid-window + ## 4.3.2 ### Patch Changes diff --git a/packages/aap-felles-react/package.json b/packages/aap-felles-react/package.json index fc2fab8..020f194 100644 --- a/packages/aap-felles-react/package.json +++ b/packages/aap-felles-react/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.2", + "version": "4.3.3", "name": "@navikt/aap-felles-react", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx b/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx index d15f1d6..26e6b87 100644 --- a/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx +++ b/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx @@ -25,12 +25,12 @@ interface BrukerInformasjon { NAVident?: string; } function getUrl(systemUrl: SystemUrl) { - if(window && window.location) { - if(window.location.href.includes('intern.dev') || window.location.href.includes('ansatt.dev')) { - return systemUrl.dev; - } + if(['dev', 'localhost'].includes(process.env.NEXT_PUBLIC_ENVIRONMENT || '')) { + return systemUrl.dev; + } else if (process.env.NEXT_PUBLIC_ENVIRONMENT === 'prod') { return systemUrl.prod; } + throw new Error('NEXT_PUBLIC_ENVIRONMENT er ikke satt'); } const Brukermeny = ({ brukerInformasjon }: { brukerInformasjon: BrukerInformasjon }) => ( diff --git a/packages/aap-felles-utils-client/CHANGELOG.md b/packages/aap-felles-utils-client/CHANGELOG.md index d20361a..e367afd 100644 --- a/packages/aap-felles-utils-client/CHANGELOG.md +++ b/packages/aap-felles-utils-client/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.3.3 + ## 4.3.2 ## 4.3.1 diff --git a/packages/aap-felles-utils-client/package.json b/packages/aap-felles-utils-client/package.json index 69c3731..5dd8577 100644 --- a/packages/aap-felles-utils-client/package.json +++ b/packages/aap-felles-utils-client/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.2", + "version": "4.3.3", "name": "@navikt/aap-felles-utils-client", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-utils/CHANGELOG.md b/packages/aap-felles-utils/CHANGELOG.md index ddf38b8..d34df3a 100644 --- a/packages/aap-felles-utils/CHANGELOG.md +++ b/packages/aap-felles-utils/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.3.3 + ## 4.3.2 ## 4.3.1 diff --git a/packages/aap-felles-utils/package.json b/packages/aap-felles-utils/package.json index bc2903a..a823c8a 100644 --- a/packages/aap-felles-utils/package.json +++ b/packages/aap-felles-utils/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.2", + "version": "4.3.3", "name": "@navikt/aap-felles-utils", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/eslint-config-aap/CHANGELOG.md b/packages/eslint-config-aap/CHANGELOG.md index 96fd998..b3ef78c 100644 --- a/packages/eslint-config-aap/CHANGELOG.md +++ b/packages/eslint-config-aap/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.3.3 + ## 4.3.2 ## 4.3.1 diff --git a/packages/eslint-config-aap/package.json b/packages/eslint-config-aap/package.json index 932cb7f..d374f1c 100644 --- a/packages/eslint-config-aap/package.json +++ b/packages/eslint-config-aap/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/eslint-config-aap", "author": "NAV", - "version": "4.3.2", + "version": "4.3.3", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\"",