Merge branch 'refs/heads/master' into nytt-ferie-steg

navikt · Nov 12, 2024 · 6147cb1 · 6147cb1
2 parents e6aebf8 + 5479b8b
commit 6147cb1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/apps/foreldrepengeoversikt/src/sections/din-plan/DinPlan.test.tsx b/apps/foreldrepengeoversikt/src/sections/din-plan/DinPlan.test.tsx
@@ -48,7 +48,7 @@ describe('<Default>', () => {
         expect(screen.getByText('Helg (er ikke dager med foreldrepenger)')).toBeInTheDocument();
     });
 
-    it('Skal sjekke at fars kalender er korrekt', async () => {
+    it.skip('Skal sjekke at fars kalender er korrekt', async () => {
         await applyRequestHandlers(FarSøker.parameters.msw);
         render(<FarSøker />);
 

diff --git a/apps/veiviser-fp-eller-es/vite.config.ts b/apps/veiviser-fp-eller-es/vite.config.ts
@@ -9,6 +9,12 @@ export default defineConfig({
             include: '**/*.{jsx,tsx}',
         }),
         checker({ typescript: true }),
+        {
+            name: 'crossorigin',
+            transformIndexHtml(html) {
+                return html.replace(/<link rel="stylesheet" crossorigin/g, '<link rel="stylesheet" type="text/css"');
+            },
+        },
     ],
     base: '/foreldrepenger/foreldrepenger-eller-engangsstonad',
     build: {

diff --git a/packages/server-utils/src/frontendRoute.ts b/packages/server-utils/src/frontendRoute.ts
@@ -1,6 +1,6 @@
 import { fetchDecoratorHtml, injectDecoratorServerSide } from '@navikt/nav-dekoratoren-moduler/ssr/index.js';
 import { addViteModeHtmlToResponse } from '@navikt/vite-mode';
-import express, { Router } from 'express';
+import { Router } from 'express';
 import path from 'node:path';
 
 import config from './config.js';
@@ -15,7 +15,6 @@ const dekoratørProps = {
 
 export const setupAndServeHtml = async (router: Router) => {
     // When deployed, the built frontend is copied into the public directory. If running BFF locally the index.html will not exist.
-    router.use(express.static('./public', { index: false }));
     const spaFilePath = path.resolve('./public', 'index.html');
 
     // Only add vite-mode to dev environment

diff --git a/server-uinnlogget/src/server.ts b/server-uinnlogget/src/server.ts
@@ -5,8 +5,8 @@ import {
     logger,
     serverConfig,
     setupActuators,
+    setupAndServeHtml,
     setupServerDefaults,
-    setupAndServeHtml
 } from '@navikt/fp-server-utils';
 
 import { configureReverseProxyApi } from './reverseProxy';
@@ -17,10 +17,13 @@ setupServerDefaults(server);
 setupActuators(server);
 
 const router = express.Router();
+const publicRouter = express.Router();
 
 // Logging i json format
 server.use(logger.morganMiddleware);
 
+publicRouter.use(express.static('./public', { index: false }));
+server.use(serverConfig.app.publicPath, publicRouter);
 
 configureReverseProxyApi(router);
 // Catch all route, må være sist

diff --git a/server/src/server.ts b/server/src/server.ts
@@ -5,8 +5,8 @@ import {
     logger,
     serverConfig,
     setupActuators,
-    setupServerDefaults,
     setupAndServeHtml,
+    setupServerDefaults,
 } from '@navikt/fp-server-utils';
 
 import { configureReverseProxyApi } from './reverseProxy.js';
@@ -18,12 +18,16 @@ setupServerDefaults(server);
 setupActuators(server);
 
 const router = express.Router();
+const publicRouter = express.Router();
 
 // Logging i json format
 server.use(logger.morganMiddleware);
 
-server.use(validerInnkommendeIdportenToken);
+// Skjermdeling krever tilgang til CSS uten å være innlogget!
+publicRouter.use(express.static('./public', { index: false }));
+server.use(serverConfig.app.publicPath, publicRouter);
 
+server.use(validerInnkommendeIdportenToken);
 configureReverseProxyApi(router);
 // Catch all route, må være sist
 setupAndServeHtml(router);