From b02354238a9ea1e5e5f7cd08588aff88aad19ed8 Mon Sep 17 00:00:00 2001 From: Ken Gullaksen Date: Fri, 1 Sep 2023 14:59:06 +0200 Subject: [PATCH 1/3] cleanup --- server/server.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/server.js b/server/server.js index e7c9abc50..d107ab039 100644 --- a/server/server.js +++ b/server/server.js @@ -28,12 +28,11 @@ const log_events_counter = new Prometheus.Counter({ labelNames: ['level'], }); -const maskFormat = format((info) => { - return { - ...info, - message: info.message.replace(/\d{9,}/g, (match) => '*'.repeat(match.length)), - }; -}); +const maskFormat = format((info) => ({ + ...info, + message: info.message.replace(/\d{9,}/g, (match) => '*'.repeat(match.length)), +})); + // proxy calls to log. https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/Proxy/get const log = new Proxy( createLogger({ From e4288d0a79299af111cd5fd89f7ce90fcfeec156 Mon Sep 17 00:00:00 2001 From: Peter Brottveit Bock Date: Fri, 1 Sep 2023 15:01:23 +0200 Subject: [PATCH 2/3] bump notifikasjon-widget --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 128a1f32c..b779a7767 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.1.0", "dependencies": { "@navikt/aksel-icons": "^4.9.0", - "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.8", - "@navikt/bedriftsmeny": "6.10.0", + "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.9", + "@navikt/bedriftsmeny": "6.10.2", "@navikt/ds-css": "^4.9.0", "@navikt/ds-icons": "3.4.3", "@navikt/ds-react": "^4.9.0", @@ -4073,9 +4073,9 @@ "license": "MIT" }, "node_modules/@navikt/arbeidsgiver-notifikasjon-widget": { - "version": "6.3.8", - "resolved": "https://npm.pkg.github.com/download/@navikt/arbeidsgiver-notifikasjon-widget/6.3.8/ed29ca6358e9e1cb53e78d5f458ad06fd7858473", - "integrity": "sha512-63Kwn5jqt7R4FUrS1d7JTrU5KkO5CeSvHXufNqRT7Sg6DXhzrqksMJMRMbj4R7kLogYOufA/R5ZNXZ8HaqW4jQ==", + "version": "6.3.9", + "resolved": "https://npm.pkg.github.com/download/@navikt/arbeidsgiver-notifikasjon-widget/6.3.9/901114d7aabc5617ed16a127739f9bde1c7fe941", + "integrity": "sha512-49UMswCOJudP5eunEuTM3mlELZpJ7uDGn0CWj6yO90/LR5vnWarfy6t5hhkKsoPDJmQ2lfnmjuswZfpMY2d8Nw==", "dependencies": { "@apollo/client": "3.6.9", "graphql": "^16.6.0" @@ -4089,9 +4089,9 @@ } }, "node_modules/@navikt/bedriftsmeny": { - "version": "6.10.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/bedriftsmeny/6.10.0/376e5d17f292ef0f8d24e3bf523d5df19dada005", - "integrity": "sha512-u6DpuyvST1OqKFEYKyWss/HjsxxmLmtQ4uscYd/qRCylPtvlLVQ9evjMVuXbfWtNakTxkMu2n7GVZHN0/6WnRg==", + "version": "6.10.2", + "resolved": "https://npm.pkg.github.com/download/@navikt/bedriftsmeny/6.10.2/6321b8b35a5fd8ab506ffc13069713e36ad2adc5", + "integrity": "sha512-Bh14dZ9eSrjzKokZekig/7NCN+FxrpSLfGuItflp2U6ZzgFq7gSXySBAs9QPbe3M7JqAfinJASRCHABv2ax8tg==", "license": "MIT", "dependencies": { "@types/amplitude-js": "^8.9.4", @@ -4099,9 +4099,9 @@ "history": "^4.10.1" }, "peerDependencies": { - "@navikt/ds-css": "2 || 3 || 4", - "@navikt/ds-icons": "2 || 3", - "@navikt/ds-react": "2 || 3 || 4", + "@navikt/ds-css": ">=2", + "@navikt/ds-icons": ">=2", + "@navikt/ds-react": ">=2", "@types/react": "17 || 18", "@types/react-dom": "17 || 18", "react": "17 || 18", @@ -23280,18 +23280,18 @@ "integrity": "sha512-WOTkelI+W1VR0VvC6DyTznHcgCcYq5BTWIHU3zmPJMi2ImfmOAP768kGW8imxQ600hN9bTwnjBZixAC5pFsM6A==" }, "@navikt/arbeidsgiver-notifikasjon-widget": { - "version": "6.3.8", - "resolved": "https://npm.pkg.github.com/download/@navikt/arbeidsgiver-notifikasjon-widget/6.3.8/ed29ca6358e9e1cb53e78d5f458ad06fd7858473", - "integrity": "sha512-63Kwn5jqt7R4FUrS1d7JTrU5KkO5CeSvHXufNqRT7Sg6DXhzrqksMJMRMbj4R7kLogYOufA/R5ZNXZ8HaqW4jQ==", + "version": "6.3.9", + "resolved": "https://npm.pkg.github.com/download/@navikt/arbeidsgiver-notifikasjon-widget/6.3.9/901114d7aabc5617ed16a127739f9bde1c7fe941", + "integrity": "sha512-49UMswCOJudP5eunEuTM3mlELZpJ7uDGn0CWj6yO90/LR5vnWarfy6t5hhkKsoPDJmQ2lfnmjuswZfpMY2d8Nw==", "requires": { "@apollo/client": "3.6.9", "graphql": "^16.6.0" } }, "@navikt/bedriftsmeny": { - "version": "6.10.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/bedriftsmeny/6.10.0/376e5d17f292ef0f8d24e3bf523d5df19dada005", - "integrity": "sha512-u6DpuyvST1OqKFEYKyWss/HjsxxmLmtQ4uscYd/qRCylPtvlLVQ9evjMVuXbfWtNakTxkMu2n7GVZHN0/6WnRg==", + "version": "6.10.2", + "resolved": "https://npm.pkg.github.com/download/@navikt/bedriftsmeny/6.10.2/6321b8b35a5fd8ab506ffc13069713e36ad2adc5", + "integrity": "sha512-Bh14dZ9eSrjzKokZekig/7NCN+FxrpSLfGuItflp2U6ZzgFq7gSXySBAs9QPbe3M7JqAfinJASRCHABv2ax8tg==", "requires": { "@types/amplitude-js": "^8.9.4", "fuzzysort": "^1.1.4", diff --git a/package.json b/package.json index 06df93f10..61892fd6e 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "homepage": "/min-side-arbeidsgiver", "dependencies": { "@navikt/aksel-icons": "^4.9.0", - "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.8", - "@navikt/bedriftsmeny": "6.10.0", + "@navikt/arbeidsgiver-notifikasjon-widget": "6.3.9", + "@navikt/bedriftsmeny": "6.10.2", "@navikt/ds-css": "^4.9.0", "@navikt/ds-icons": "3.4.3", "@navikt/ds-react": "^4.9.0", From 3e6160b6a2df1e40427d6cfee2fe7faba55d0f72 Mon Sep 17 00:00:00 2001 From: Ken Gullaksen Date: Fri, 1 Sep 2023 15:14:27 +0200 Subject: [PATCH 3/3] rm ubrukt option --- server/server.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/server.js b/server/server.js index d107ab039..0dff04868 100644 --- a/server/server.js +++ b/server/server.js @@ -122,7 +122,6 @@ const main = async () => { ); } else { const proxyOptions = { - logLevel: PROXY_LOG_LEVEL, logger: log, on: { error: (err, req, res) => {