Merge pull request #1704 from navikt/server-improvements

Diverse forbedringer for logging, server-bygg ++

Author: anders-nom

.env.development

@@ -2,8 +2,8 @@ NODE_ENV=development
 ENV=localhost
 SERVICE_SECRET=dummyToken
 DOCKER_HOST_ADDRESS=host.docker.internal
-PAGE_CACHE_DIR=./.next/page-cache
-IMAGE_CACHE_DIR=./.next/image-cache
+PAGE_CACHE_DIR=../.next/page-cache
+IMAGE_CACHE_DIR=../.next/image-cache
 ADMIN_ORIGIN=http://localhost:8080
 APP_ORIGIN=http://localhost:3000
 DECORATOR_URL=http://localhost:8100/dekoratoren
@@ -12,8 +12,8 @@ INNLOGGINGSSTATUS_URL=http://localhost:8095/nav-dekoratoren-api/auth
 REVALIDATOR_PROXY_ORIGIN=http://localhost:3002
 XP_ORIGIN=http://localhost:8080
 IS_FAILOVER_INSTANCE='false'
-BUILD_ID=development
 RELEASE_TAG=development
 ASSET_PREFIX=http://localhost:3000
 TELEMETRY_URL=http://localhost:12347/collect
 NAVNO_API_URL=https://www.nav.no/person/navno-api
+NEXT_TELEMETRY_DISABLED=1

.env.prod-local

@@ -2,8 +2,8 @@ NODE_ENV=production
 ENV=localhost
 SERVICE_SECRET=dummyToken
 DOCKER_HOST_ADDRESS=host.docker.internal
-PAGE_CACHE_DIR=./.next/page-cache
-IMAGE_CACHE_DIR=./.next/image-cache
+PAGE_CACHE_DIR=../.next/page-cache
+IMAGE_CACHE_DIR=../.next/image-cache
 ADMIN_ORIGIN=http://localhost:8080
 APP_ORIGIN=http://localhost:3000
 DECORATOR_URL=http://localhost:8100/dekoratoren
@@ -12,8 +12,8 @@ INNLOGGINGSSTATUS_URL=http://localhost:8095/nav-dekoratoren-api/auth
 REVALIDATOR_PROXY_ORIGIN=http://localhost:3002
 XP_ORIGIN=http://localhost:8080
 IS_FAILOVER_INSTANCE='false'
-BUILD_ID=prodLocal
 RELEASE_TAG=prodLocal
 ASSET_PREFIX=http://localhost:3000
 TELEMETRY_URL=http://localhost:12347/collect
 NAVNO_API_URL=https://www.nav.no/person/navno-api
+NEXT_TELEMETRY_DISABLED=1

.eslintrc.json

@@ -1,9 +1,11 @@
 {
     "plugins": ["css-modules"],
     "extends": ["next/core-web-vitals", "plugin:css-modules/recommended"],
+    "ignorePatterns": ["next.config.js"],
     "rules": {
         "@next/next/no-img-element": 0,
         "css-modules/no-unused-class": [1, { "camelCase": true }],
-        "css-modules/no-undef-class": [2, { "camelCase": true }]
+        "css-modules/no-undef-class": [2, { "camelCase": true }],
+        "no-console": "error"
     }
 }

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

@@ -21,7 +21,5 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
       - name: Build application
         run: npm run build-local
-      - name: Run server tests
-        run: npm run test-server
-      - name: Run client tests
-        run: npm run test-client
+      - name: Run tests
+        run: npm run test

.github/workflows/build-image.yml

@@ -96,6 +96,7 @@ jobs:
           ASSET_PREFIX=https://cdn.nav.no/personbruker/nav-enonicxp-frontend
           PAGE_CACHE_DIR=/tmp/pages
           IMAGE_CACHE_DIR=/tmp/images
+          NEXT_TELEMETRY_DISABLED=1
           EOF
       - name: Nextjs cache
         uses: actions/cache@v3
@@ -106,10 +107,8 @@ jobs:
         run: npm ci
         env:
           NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
-      - name: Run server tests
-        run: npm run test-server
-      - name: Run client tests
-        run: npm run test-client
+      - name: Run tests
+        run: npm run test
       - name: Build application
         run: npm run build
         env:

.gitignore

@@ -32,6 +32,7 @@ yarn-error.log*
 .env
 .env.local
 .env.development.local
+.env.prod-local.local
 
 /.idea/
 /nav-enonicxp-frontend.iml
@@ -45,7 +46,7 @@ yarn-error.log*
 /image-manifest
 /benchmark.mjs
 
-/.serverDist/
+/server/.dist/
 /server/tsconfig.tsbuildinfo
 /server/__next-test-dummy/.next/
 

.vscode/launch.json

@@ -5,16 +5,15 @@ RUN adduser --system --uid 1001 nextjs
 
 WORKDIR /app
 
-COPY package*.json /app/
-COPY node_modules /app/node_modules/
-
+COPY package*.json next.config.js .env /app/
 COPY .next /app/.next/
 COPY public /app/public/
+COPY node_modules /app/node_modules/
 
-COPY next.config.js .env /app/
-COPY .serverDist /app/.serverDist/
+COPY /server/package*.json /app/server/
+COPY /server/.dist /app/server/.dist/
 
 USER nextjs
 
 EXPOSE 3000
-CMD ["npm", "run", "start"]
+CMD ["npm", "start"]

Dockerfile

@@ -3,7 +3,7 @@ NODE_ENV=production
 ADMIN_ORIGIN=https://portal-admin-dev.oera.no
 APP_ORIGIN=https://www.ekstern.dev.nav.no
 DECORATOR_URL=https://dekoratoren.ekstern.dev.nav.no
-XP_ORIGIN=https://portal-admin-dev.oera.no
+XP_ORIGIN=https://www.dev.nav.no
 TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
 REVALIDATOR_PROXY_ORIGIN=http://nav-enonicxp-frontend-revalidator-proxy-dev1
 FAILOVER_ORIGIN=https://www-failover.intern.dev.nav.no

failover/.env-dev1

@@ -3,7 +3,7 @@ NODE_ENV=production
 ADMIN_ORIGIN=https://portal-admin-q6.oera.no
 APP_ORIGIN=https://www-2.ekstern.dev.nav.no
 DECORATOR_URL=https://dekoratoren.ekstern.dev.nav.no
-XP_ORIGIN=https://portal-admin-q6.oera.no
+XP_ORIGIN=https://www-q6.nav.no
 TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
 REVALIDATOR_PROXY_ORIGIN=http://nav-enonicxp-frontend-revalidator-proxy-dev2
 FAILOVER_ORIGIN=https://www-2-failover.intern.dev.nav.no

failover/.env-dev2

@@ -13,12 +13,14 @@ ARG SERVICE_SECRET
 ARG ENV_FILE
 
 COPY package*.json /failover/.npmrc /app/
+COPY server /app/server/
+
 RUN npm ci --ignore-scripts
 RUN rm -f .npmrc
 
 COPY public /app/public/
-COPY server /app/server/
 COPY src /app/src/
+COPY srcCommon /app/srcCommon/
 COPY next.config.js tsconfig.json .eslintrc.json /app/
 COPY "/failover/$ENV_FILE" /app/.env
 
@@ -35,4 +37,4 @@ COPY --from=0 /tmp/images/image-manifest /tmp/images/image-manifest
 USER nextjs
 
 EXPOSE 3000
-CMD ["npm", "run", "start"]
+CMD ["npm", "start"]

failover/Dockerfile

@@ -117,19 +117,19 @@ const corsHeaders = [
 ];
 
 console.log(
-    `Env: ${process.env.ENV} - Node env: ${process.env.NODE_ENV} - Failover: ${isFailover}`
+    `Env: ${process.env.ENV} - Node env: ${process.env.NODE_ENV} - Is failover instance? ${isFailover}`
 );
 
 const config = {
-    experimental: {
-        // Set this to 0 to disable the next.js built-in memory cache for the ISR page cache
-        // We implement our own in the customCacheHandler to allow us to invalidate the memory cache on demand
-        isrMemoryCacheSize: 0,
-        incrementalCacheHandlerPath: path.resolve(
+    ...(!isFailover && {
+        cacheHandler: path.resolve(
             __dirname,
-            '.serverDist/custom-cache-handler'
+            'server',
+            '.dist',
+            'custom-cache-handler.cjs'
         ),
-    },
+        cacheMaxMemorySize: 0,
+    }),
     productionBrowserSourceMaps: true,
     distDir: isFailover && isLocal ? '.next-static' : '.next',
     assetPrefix: process.env.ASSET_PREFIX,

next.config.js

@@ -22,14 +22,6 @@ declare global {
         }
     }
 
-    interface Window {
-        GoBrain?: {
-            create: (element: HTMLElement, config: Record<string, any>) => any;
-            destroy: (widgetId: string, deleteElement?: boolean) => any;
-            widgets: (widgetId: string) => any;
-        };
-    }
-
     var cacheKey: string | undefined;
 }