Spor rydding del1

.eslintrc.json

@@ -1,13 +1,7 @@
 {
-    "plugins": ["css-modules", "no-relative-import-paths"],
-    "extends": [
-        "next/core-web-vitals",
-        "plugin:css-modules/recommended",
-        "plugin:storybook/recommended"
-    ],
-    "ignorePatterns": ["next.config.js"],
+    "plugins": ["css-modules", "@typescript-eslint"],
+    "extends": [],
     "rules": {
-        "@next/next/no-img-element": 0,
         "css-modules/no-unused-class": [
             1,
             {
@@ -20,36 +14,23 @@
                 "camelCase": true
             }
         ],
-        "import/order": [
+        "@typescript-eslint/no-unused-vars": [
             "warn",
             {
-                "groups": [
-                    ["builtin", "external"],
-                    ["internal", "parent", "index", "object", "unknown", "type"],
-                    "sibling"
-                ],
-                "pathGroups": [
-                    {
-                        "pattern": "./**/*.module.scss",
-                        "group": "sibling",
-                        "position": "after"
-                    }
-                ]
-            }
-        ],
-        "no-console": "warn",
-        "no-alert": "error",
-        "no-relative-import-paths/no-relative-import-paths": [
-            "warn",
-            {
-                "allowSameFolder": true,
-                "rootDir": "src"
+                "varsIgnorePattern": "^_",
+                "argsIgnorePattern": "^_",
+                "caughtErrorsIgnorePattern": "^_"
             }
         ]
     },
-    "settings": {
-        "css-modules": {
-            "basePath": "src"
+    "overrides": [
+        {
+            "files": ["workspaces/nextjs/**/*.ts", "workspaces/nextjs/**/*.tsx"],
+            "settings": {
+                "css-modules": {
+                    "basePath": "workspaces/nextjs/src"
+                }
+            }
         }
-    }
+    ]
 }

failover/Dockerfile → .failover/Dockerfile

@@ -12,17 +12,20 @@ ARG GITHUB_PAT
 ARG SERVICE_SECRET
 ARG ENV_FILE
 
-COPY package*.json /failover/.npmrc /app/
-COPY server /app/server/
+COPY package*.json .failover/.npmrc /app/
+
+COPY packages/server /app/packages/server/
+COPY packages/nextjs /app/packages/nextjs/
+COPY packages/shared /app/packages/shared/
 
 RUN npm ci --ignore-scripts
 RUN rm -f .npmrc
 
-COPY public /app/public/
-COPY src /app/src/
-COPY srcCommon /app/srcCommon/
-COPY next.config.js tsconfig.json .eslintrc.json /app/
-COPY "/failover/$ENV_FILE" /app/.env
+COPY ".failover/${ENV_FILE}" /app/.env
+# Also copy this .env file to the nextjs and server packages so they can
+# pick the environment variables as needed.
+COPY /app/.env /app/packages/nextjs/.env
+COPY /app/.env /app/packages/server/.env
 
 RUN npm run build
 

failover/build-dev-failover-image.sh → .failover/build-dev-failover-image.sh

@@ -2,10 +2,13 @@
 
 # Script for building failover-images for dev-environments
 # Usage: "build-dev-failover-image.sh <dev1|dev2> <image name>"
-# XP service secret should be put in the appropriate file (.secret-dev1|.secret-dev2)
-# You also need a Github PAT with repo and packages write access in the .github-token
-# file at the root of the project
-# Take care not to expose secrets!
+#
+# About secrets:
+# As NPM packages with ie post-install scripts could potentially sniff and compromise secrets,
+# we need to read secrets from environment variables. These variables should be set using
+# ie. 1Password CLI or similar.
+#
+# The secrets are: NAV_ENONICXP_DEV1, NAV_ENONICXP_DEV2 AND GITHUB_PAT.
 #
 # Once the image is built, use the relevant deploy action on Github with the chosen
 # image name to deploy
@@ -24,20 +27,18 @@ fi
 if [[ "$APP_ENV" == "dev1" ]]
 then
   echo "Building image $IMAGE_NAME for dev1"
-  SERVICE_SECRET=$(<.secret-dev1)
+  SERVICE_SECRET=$NAV_ENONICXP_DEV1
   ENV_FILE=".env-dev1"
 elif [[ "$APP_ENV" == "dev2" ]]
 then
   echo "Building image $IMAGE_NAME for dev2"
-  SERVICE_SECRET=$(<.secret-dev2)
+  SERVICE_SECRET=$NAV_ENONICXP_DEV2
   ENV_FILE=".env-dev2"
 else
   echo "Invalid ENV specified, aborting"
   exit
 fi
 
-GITHUB_PAT=$(<../.github-token)
-
 IMAGE_NAME_FULL="ghcr.io/navikt/nav-enonicxp-frontend:$IMAGE_NAME"
 
 docker build -f Dockerfile -t "$IMAGE_NAME_FULL" --no-cache --build-arg ENV_FILE="$ENV_FILE" --build-arg SERVICE_SECRET="$SERVICE_SECRET" --build-arg GITHUB_PAT="$GITHUB_PAT" ../.

.failover/testfile.env

@@ -0,0 +1 @@
+testfile

.github/workflows/build-image.yml

@@ -67,8 +67,8 @@ jobs:
         name: Build docker image
         runs-on: ubuntu-latest
         permissions:
-            contents: read
-            id-token: write
+            contents: 'read'
+            id-token: 'write'
         environment: ${{ inputs.environment }}
         outputs:
             image: ${{ steps.docker-push.outputs.image }}
@@ -78,7 +78,7 @@ jobs:
             - name: Setup node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: '20'
                   registry-url: 'https://npm.pkg.github.com'
                   cache: 'npm'
             - name: Set app environmment
@@ -101,10 +101,12 @@ jobs:
                   IMAGE_CACHE_DIR=/tmp/images
                   NEXT_TELEMETRY_DISABLED=1
                   EOF
+            - name: Copy env to nextjs and server workspaces
+              run: cp .env packages/nextjs/.env && cp .env packages/server/.env
             - name: Nextjs cache
               uses: actions/cache@v4
               with:
-                  path: ${{ github.workspace }}/.next/cache
+                  path: ${{ github.workspace }}/packages/nextjs/.next/cache
                   key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}
             - name: Install dependencies
               run: npm ci
@@ -122,7 +124,7 @@ jobs:
               uses: nais/deploy/actions/cdn-upload/v2@master
               with:
                   team: personbruker
-                  source: ./.next/static
+                  source: ./packages/nextjs/.next/static
                   destination: nav-enonicxp-frontend/_next
                   project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
                   identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

.gitignore

@@ -1,60 +1,55 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
-/server/node_modules
-/.pnp
-.pnp.js
+**/node_modules
+**/.pnp
+**/.pnp.js
 
 # testing
-/coverage
-*storybook.log
-/storybook-static
+**/coverage
+**/storybook.log
+**/storybook-static
 
 # next.js
-/.next/
-/.next-static/
-/out/
-
-# production
-/build
+**/.next
+**/.next-static
+**/out
 
 # misc
 .DS_Store
 *.pem
 
 # debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+**/npm-debug.log*
+**/yarn-debug.log*
+**/yarn-error.log*
 
 # vercel
 .vercel
 
 # local env
-.env
-.env.local
-.env.development.local
-.env.prod-local.local
+**/.env
+**/.env.local
+**/.env.development.local
+**/.env.prod-local.local
 
 /.idea/
-/nav-enonicxp-frontend.iml
+**/nav-enonicxp-frontend.iml
 
 # secrets, careful!
-/.github-token
-/failover/.secret-dev1
-/failover/.secret-dev2
+**/.github-token
+**/.failover/.secret-dev1
+**/.failover/.secret-dev2
 
-/tsconfig.tsbuildinfo
-/image-manifest
-/benchmark.mjs
+**/tsconfig.tsbuildinfo
+**/image-manifest
+**/benchmark.mjs
 
-/server/.dist/
-/server/tsconfig.tsbuildinfo
-/server/__test-utils/next-dummy/.next/
+**/.dist/
+**/tsconfig.tsbuildinfo
+**/__test-utils/next-dummy/.next/
 
 # VS Code
-.vscode
-/.env.prod-local.local
-/server/.next/
-/analyze/
+**/.vscode
+**/.env.prod-local.local
+**/analyze

.husky/pre-commit

@@ -1,4 +1,7 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged
+cd packages/nextjs
+npx eslint --max-warnings=0 '**/*.{ts,tsx}'
+cd ../server
+npx eslint --max-warnings=0 '**/*.{ts,tsx}'
+cd ../shared
+npx eslint --max-warnings=0 '**/*.{ts,tsx}'
+cd ../../

.lintstagedrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    'packages/nextjs/**/*.{ts,tsx}': [
+        'prettier --write',
+        'npx eslint --debug --config ./packages/nextjs/.eslintrc.json',
+    ],
+    'packages/nextjs/**/*.{scss,css}': ['prettier --write'],
+};

Dockerfile

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

README.md

@@ -10,6 +10,16 @@ Kjøres lokalt på [http://localhost:3000](http://localhost:3000).
 
 Som default kreves en lokal instans av Enonic XP med [nav-enonicxp](https://github.com/navikt/nav-enonicxp) installert. Alternativt kan en dev eller prod-instans av XP benyttes via [nav-enonicxp-dev-proxy](https://github.com/navikt/nav-enonicxp-dev-proxy).
 
+### VS Code
+
+Hvis lintingreglene i pakkene ikke plukkes opp av VS Code, sørg for å ha følgende innstillinger i .vscode/settings.json:
+
+```
+{
+  "eslint.workingDirectories": ["./packages/nextjs", "./packages/shared", "./packages/server"]
+}
+```
+
 ### Development mode:
 
 #### Med lokal XP:
@@ -66,8 +76,8 @@ og servere denne som en fallback.
 
 Failover deployes ikke automatisk til dev-miljøer. For å bygge og deploye til et dev-miljø, gjør følgende:
 
--   Legg inn relevante secrets lokalt som spesifisert i kommentarer i `/failover/build-dev-failover-image.sh`
--   Kjør `/failover/build-dev-failover-image.sh <dev1|dev2> <image-navn>`
+-   Legg inn relevante secrets lokalt som spesifisert i kommentarer i `.failover/build-dev-failover-image.sh`
+-   Kjør `./.failover/build-dev-failover-image.sh <dev1|dev2> <image-navn>`
 -   Vent på at imaget bygges (det tar normalt 15-20 min)
 -   Kjør Github workflow'en `deploy-failover.dev` med dev-miljøet og image-navnet du valgte som input