Migrerer server til TS og bytter logging

.eslintrc.json

@@ -11,6 +11,10 @@
         "plugin:jsx-a11y/recommended",
         "prettier"
     ],
+    "globals": {
+        "process": true,
+        "__dirname": true
+    },
     "settings": {
         "react": {
             "version": "detect"
@@ -28,6 +32,7 @@
         "semi": ["error", "always"],
         "max-len": [1, { "code": 150, "ignoreComments": true, "ignoreStrings": true }],
         "indent": "off",
+        "@typescript-eslint/no-unused-vars": "warn",
         "@typescript-eslint/no-non-null-assertion": "off",
         "react/display-name": "off"
     }

.github/workflows/build-and-deploy.yml

@@ -86,7 +86,7 @@ jobs:
           echo "IMAGE_NAME=$(echo ${GITHUB_REPOSITORY##*/})" >> $GITHUB_ENV
           echo "IMAGE_VERSION=${IMAGE_VERSION_RAW,,}" >> $GITHUB_ENV
           echo "GITHUB_TOKEN=$(echo ${GITHUB_TOKEN})" >> $GITHUB_ENV
-          echo "PUBLIC_URL=https://cdn.nav.no/personbruker/personopplysninger/$(echo ${IMAGE_VERSION_RAW,,})/build" >> $GITHUB_ENV
+          echo "PUBLIC_URL=https://cdn.nav.no/personbruker/personopplysninger/$(echo ${IMAGE_VERSION_RAW,,})/build/client" >> $GITHUB_ENV
       - name: Define client-side environment
         run: |
           echo "VITE_ENV=${{ inputs.env }}" >> $GITHUB_ENV

.gitignore

@@ -13,7 +13,7 @@
 
 # production
 /build
-
+/server-build
 
 # misc
 .DS_Store

Dockerfile

@@ -3,11 +3,9 @@ FROM node:20-bullseye-slim
 ENV NODE_ENV production
 
 WORKDIR usr/src/app
-COPY server server/
 COPY build build/
+COPY server/node_modules build/server/node_modules
 
-WORKDIR server
-
-CMD ["node", "./server.js"]
+CMD ["node", "./build/server/server.js"]
 
 EXPOSE 8080

package.json

@@ -12,6 +12,7 @@
         "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
         "postinstall": "cd server && npm install",
         "build": "npm-run-all -p build:*",
+        "build:server": "cd server && npm run build",
         "build:js": "vite build",
         "build:css": "less-watch-compiler --run-once",
         "test": "vitest",

server/dekorator.ts

@@ -0,0 +1,22 @@
+import { injectDecoratorServerSide } from '@navikt/nav-dekoratoren-moduler/ssr';
+
+type DecoratorNaisEnv = 'prod' | 'dev' | 'beta' | 'betaTms' | 'devNext' | 'prodNext';
+
+export const getHtmlWithDecorator = (filePath: string) =>
+    injectDecoratorServerSide({
+        env: process.env.ENV as DecoratorNaisEnv,
+        filePath,
+        params: {
+            enforceLogin: false,
+            breadcrumbs: [
+                { url: 'https://www.nav.no/minside/', title: 'Min side' },
+                { url: 'https://www.nav.no/person/personopplysninger/', title: 'Personopplysninger' },
+            ],
+            availableLanguages: [
+                { url: 'https://www.nav.no/person/personopplysninger/nb/', locale: 'nb' },
+                { url: 'https://www.nav.no/person/personopplysninger/en/', locale: 'en' },
+                { url: 'https://www.nav.no/person/personopplysninger/nn/', locale: 'nn' },
+            ],
+            logoutWarning: true,
+        },
+    });

server/logger.ts

@@ -0,0 +1,11 @@
+import { LoggerOptions, pino } from 'pino';
+
+const options = {
+    formatters: {
+        level: (label) => {
+            return { level: label };
+        },
+    },
+} as LoggerOptions;
+
+export const logger = pino(options);