From 2596720d56bad05528eb58f9f6cd83c312263c0f Mon Sep 17 00:00:00 2001 From: frodehansen2 Date: Mon, 23 Sep 2024 18:44:48 +0200 Subject: [PATCH] Div cleanup --- apps/dine-pleiepenger/package.json | 12 +++++----- apps/dine-pleiepenger/src/utils/env.ts | 1 + apps/dine-pleiepenger/vitest.config.ts | 2 +- .../vitest.config.ts | 2 +- .../vitest.config.ts | 2 +- .../vitest.config.ts | 2 +- apps/omsorgspengesoknad/vitest.config.ts | 2 +- .../vitest.config.ts | 2 +- apps/pleiepenger-sykt-barn/vitest.config.ts | 2 +- apps/sif-ettersending/vitest.config.ts | 2 +- packages/sif-common-core-ds/vitest.config.ts | 2 +- .../sif-common-formik-ds/vitest.config.ts | 2 +- packages/sif-common-forms-ds/vitest.config.ts | 2 +- packages/sif-common-utils/vitest.config.ts | 2 +- yarn.lock | 24 +++++++++---------- 15 files changed, 31 insertions(+), 30 deletions(-) diff --git a/apps/dine-pleiepenger/package.json b/apps/dine-pleiepenger/package.json index 9d7e6c1a9f..cc0dbc5877 100644 --- a/apps/dine-pleiepenger/package.json +++ b/apps/dine-pleiepenger/package.json @@ -19,15 +19,15 @@ "dependencies": { "@grafana/faro-web-sdk": "1.10.0", "@grafana/faro-web-tracing": "1.10.0", - "@navikt/appstatus-react-ds": "workspace: *", + "@navikt/appstatus-react-ds": "*", "@navikt/nav-dekoratoren-moduler": "2.1.6", "@navikt/next-logger": "1.32.0", "@navikt/oasis": "3.4.0", - "@navikt/sif-app-register": "workspace: *", - "@navikt/sif-common-amplitude": "workspace: *", - "@navikt/sif-common-core-ds": "workspace: *", - "@navikt/sif-common-sentry": "workspace: *", - "@navikt/sif-common-utils": "workspace: *", + "@navikt/sif-app-register": "*", + "@navikt/sif-common-amplitude": "*", + "@navikt/sif-common-core-ds": "*", + "@navikt/sif-common-sentry": "*", + "@navikt/sif-common-utils": "*", "axios": "1.7.7", "date-fns": "4.1.0", "jsdom": "25.0.1", diff --git a/apps/dine-pleiepenger/src/utils/env.ts b/apps/dine-pleiepenger/src/utils/env.ts index b2f93d3383..8a75ed5161 100644 --- a/apps/dine-pleiepenger/src/utils/env.ts +++ b/apps/dine-pleiepenger/src/utils/env.ts @@ -47,6 +47,7 @@ export const publicEnvSchema = z.object({ }); export type ServerEnv = z.infer; + export const serverEnvSchema = z.object({ NEXT_PUBLIC_INNSYN_BACKEND_SCOPE: z.string(), NEXT_PUBLIC_BRUKERDIALOG_BACKEND_SCOPE: z.string(), diff --git a/apps/dine-pleiepenger/vitest.config.ts b/apps/dine-pleiepenger/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/apps/dine-pleiepenger/vitest.config.ts +++ b/apps/dine-pleiepenger/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/vitest.config.ts b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/vitest.config.ts +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/endringsmelding-pleiepenger/vitest.config.ts b/apps/endringsmelding-pleiepenger/vitest.config.ts index 435a2dbde5..4672f6f2b4 100644 --- a/apps/endringsmelding-pleiepenger/vitest.config.ts +++ b/apps/endringsmelding-pleiepenger/vitest.config.ts @@ -6,7 +6,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/vitest.config.ts b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/vitest.config.ts +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/omsorgspengesoknad/vitest.config.ts b/apps/omsorgspengesoknad/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/apps/omsorgspengesoknad/vitest.config.ts +++ b/apps/omsorgspengesoknad/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/vitest.config.ts b/apps/pleiepenger-i-livets-sluttfase-soknad/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/vitest.config.ts +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/pleiepenger-sykt-barn/vitest.config.ts b/apps/pleiepenger-sykt-barn/vitest.config.ts index 6e134336fd..5ed253d022 100644 --- a/apps/pleiepenger-sykt-barn/vitest.config.ts +++ b/apps/pleiepenger-sykt-barn/vitest.config.ts @@ -6,7 +6,7 @@ import * as path from 'path'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/apps/sif-ettersending/vitest.config.ts b/apps/sif-ettersending/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/apps/sif-ettersending/vitest.config.ts +++ b/apps/sif-ettersending/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/packages/sif-common-core-ds/vitest.config.ts b/packages/sif-common-core-ds/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/packages/sif-common-core-ds/vitest.config.ts +++ b/packages/sif-common-core-ds/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/packages/sif-common-formik-ds/vitest.config.ts b/packages/sif-common-formik-ds/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/packages/sif-common-formik-ds/vitest.config.ts +++ b/packages/sif-common-formik-ds/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/packages/sif-common-forms-ds/vitest.config.ts b/packages/sif-common-forms-ds/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/packages/sif-common-forms-ds/vitest.config.ts +++ b/packages/sif-common-forms-ds/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/packages/sif-common-utils/vitest.config.ts b/packages/sif-common-utils/vitest.config.ts index ec336f5985..10433c1a26 100644 --- a/packages/sif-common-utils/vitest.config.ts +++ b/packages/sif-common-utils/vitest.config.ts @@ -5,7 +5,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx'], + exclude: ['./e2e/**/*', './build/**/*', './dist/**/*', '**/*.spec.tsx', 'node_modules'], globals: true, environment: 'jsdom', css: false, diff --git a/yarn.lock b/yarn.lock index 21e96ddb1d..2d0001dd86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4088,7 +4088,7 @@ __metadata: languageName: node linkType: hard -"@navikt/appstatus-react-ds@npm:*, @navikt/appstatus-react-ds@workspace: *, @navikt/appstatus-react-ds@workspace:packages/appstatus-react-ds": +"@navikt/appstatus-react-ds@npm:*, @navikt/appstatus-react-ds@workspace:packages/appstatus-react-ds": version: 0.0.0-use.local resolution: "@navikt/appstatus-react-ds@workspace:packages/appstatus-react-ds" dependencies: @@ -4119,7 +4119,7 @@ __metadata: "@axe-core/playwright": "npm:4.10.0" "@grafana/faro-web-sdk": "npm:1.10.0" "@grafana/faro-web-tracing": "npm:1.10.0" - "@navikt/appstatus-react-ds": "workspace: *" + "@navikt/appstatus-react-ds": "npm:*" "@navikt/ds-css": "npm:7.0.1" "@navikt/ds-icons": "npm:3.4.3" "@navikt/ds-react": "npm:7.0.1" @@ -4127,11 +4127,11 @@ __metadata: "@navikt/nav-dekoratoren-moduler": "npm:2.1.6" "@navikt/next-logger": "npm:1.32.0" "@navikt/oasis": "npm:3.4.0" - "@navikt/sif-app-register": "workspace: *" - "@navikt/sif-common-amplitude": "workspace: *" - "@navikt/sif-common-core-ds": "workspace: *" - "@navikt/sif-common-sentry": "workspace: *" - "@navikt/sif-common-utils": "workspace: *" + "@navikt/sif-app-register": "npm:*" + "@navikt/sif-common-amplitude": "npm:*" + "@navikt/sif-common-core-ds": "npm:*" + "@navikt/sif-common-sentry": "npm:*" + "@navikt/sif-common-utils": "npm:*" "@playwright/test": "npm:1.47.2" "@sif/eslint-config": "npm:*" "@storybook/addon-essentials": "npm:8.3.2" @@ -4933,7 +4933,7 @@ __metadata: languageName: unknown linkType: soft -"@navikt/sif-app-register@npm:*, @navikt/sif-app-register@workspace: *, @navikt/sif-app-register@workspace:packages/sif-app-register": +"@navikt/sif-app-register@npm:*, @navikt/sif-app-register@workspace:packages/sif-app-register": version: 0.0.0-use.local resolution: "@navikt/sif-app-register@workspace:packages/sif-app-register" dependencies: @@ -4960,7 +4960,7 @@ __metadata: languageName: unknown linkType: soft -"@navikt/sif-common-amplitude@npm:*, @navikt/sif-common-amplitude@workspace: *, @navikt/sif-common-amplitude@workspace:packages/sif-common-amplitude": +"@navikt/sif-common-amplitude@npm:*, @navikt/sif-common-amplitude@workspace:packages/sif-common-amplitude": version: 0.0.0-use.local resolution: "@navikt/sif-common-amplitude@workspace:packages/sif-common-amplitude" dependencies: @@ -4980,7 +4980,7 @@ __metadata: languageName: unknown linkType: soft -"@navikt/sif-common-core-ds@npm:*, @navikt/sif-common-core-ds@workspace: *, @navikt/sif-common-core-ds@workspace:packages/sif-common-core-ds": +"@navikt/sif-common-core-ds@npm:*, @navikt/sif-common-core-ds@workspace:packages/sif-common-core-ds": version: 0.0.0-use.local resolution: "@navikt/sif-common-core-ds@workspace:packages/sif-common-core-ds" dependencies: @@ -5203,7 +5203,7 @@ __metadata: languageName: unknown linkType: soft -"@navikt/sif-common-sentry@npm:*, @navikt/sif-common-sentry@workspace: *, @navikt/sif-common-sentry@workspace:packages/sif-common-sentry": +"@navikt/sif-common-sentry@npm:*, @navikt/sif-common-sentry@workspace:packages/sif-common-sentry": version: 0.0.0-use.local resolution: "@navikt/sif-common-sentry@workspace:packages/sif-common-sentry" dependencies: @@ -5350,7 +5350,7 @@ __metadata: languageName: unknown linkType: soft -"@navikt/sif-common-utils@npm:*, @navikt/sif-common-utils@workspace: *, @navikt/sif-common-utils@workspace:packages/sif-common-utils": +"@navikt/sif-common-utils@npm:*, @navikt/sif-common-utils@workspace:packages/sif-common-utils": version: 0.0.0-use.local resolution: "@navikt/sif-common-utils@workspace:packages/sif-common-utils" dependencies: