Merge branch 'main' into dp-auth-idporten

navikt · Aug 31, 2023 · fef6dc3 · fef6dc3
2 parents 399ab8c + 2dff73e
commit fef6dc3
Show file tree

Hide file tree

Showing 21 changed files with 12,937 additions and 8,702 deletions.
diff --git a/.env.development b/.env.development
@@ -7,5 +7,5 @@ DEKORATOR_ENV=dev
 SELF_URL=http://localhost:3000
 AMPLITUDE_API_KEY=
 
-NEXT_PUBLIC_SOKNADSDIALOG=https://arbeid.dev.nav.no/dagpenger/dialog/
+NEXT_PUBLIC_SOKNADSDIALOG=https://arbeid.intern.dev.nav.no/dagpenger/dialog/
 NEXT_PUBLIC_LOCALHOST=true
diff --git a/.env.test b/.env.test
@@ -1,3 +1,3 @@
 IDPORTEN_WELL_KNOWN_URL=http://idporten.test
 SAF_SELVBETJENING_INGRESS=http://saf.test
-NEXT_PUBLIC_SOKNADSDIALOG=https://arbeid.dev.nav.no/dagpenger/dialog/
+NEXT_PUBLIC_SOKNADSDIALOG=https://arbeid.intern.dev.nav.no/dagpenger/dialog/
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,6 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx --no-install pretty-quick --staged
 npx --no-install lint-staged
 npm test
diff --git a/.nais/dev.yaml b/.nais/dev.yaml
@@ -15,4 +15,4 @@ saf:
   url: https://safselvbetjening-q1.dev-fss-pub.nais.io
   scope: safselvbetjening-q1
 soknadsdialog:
-  ingress: https://arbeid.dev.nav.no/dagpenger/dialog/
+  ingress: https://arbeid.intern.dev.nav.no/dagpenger/dialog/
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.13.0
+v18.12.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16 AS builder
+FROM node:18 AS builder
 
 WORKDIR /usr/src/app
 
@@ -15,7 +15,7 @@ RUN --mount=type=secret,id=SENTRY_AUTH_TOKEN \
     SENTRY_AUTH_TOKEN=$(cat /run/secrets/SENTRY_AUTH_TOKEN) \
     npm run build && npm prune --production
 
-FROM node:16-alpine AS runtime
+FROM node:18-alpine AS runtime
 
 WORKDIR /usr/src/app