From fb64117dcda658f80078acc3bb0d7305e107cbe5 Mon Sep 17 00:00:00 2001 From: Anders Nomerstad Date: Mon, 9 Sep 2024 13:42:18 +0200 Subject: [PATCH 1/2] Hindrer redirects fra /_/* i dev --- server/src/server-setup/server-setup-dev.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/server-setup/server-setup-dev.ts b/server/src/server-setup/server-setup-dev.ts index e81307d48..56f9d2766 100644 --- a/server/src/server-setup/server-setup-dev.ts +++ b/server/src/server-setup/server-setup-dev.ts @@ -16,7 +16,7 @@ export const serverSetupDev = (expressApp: Express, nextApp: NextServer) => { // These paths should never redirect, to ensure the site will load correctly // when accessed from the Content Studio editor expressApp.all( - ['/draft/*', '/archive/*', '/editor/*', '/_next/*', '/gfx/*', '/api/*'], + ['/draft/*', '/archive/*', '/editor/*', '/_next/*', '/gfx/*', '/api/*', '/_/*'], (req, res) => { return nextRequestHandler(req, res); } From 459a3ed1b89e3e5f46055d29a6ac23801636aae2 Mon Sep 17 00:00:00 2001 From: Anders Nomerstad Date: Mon, 9 Sep 2024 14:09:39 +0200 Subject: [PATCH 2/2] Bruker redirects istedenfor rewrites --- next.config.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/next.config.js b/next.config.js index 690f31483..3316f7c64 100644 --- a/next.config.js +++ b/next.config.js @@ -213,6 +213,16 @@ const config = { destination: `${process.env.APP_ORIGIN}/no/nav-og-samfunn/samarbeid/for-kommunen/digisos/til-kommuner-som-onsker-a-ta-i-bruk-digital-soknad-om-okonomisk-sosialhjelp/Håndbok for innføring av digital søknad %2800B%29 12.12.19.pdf`, permanent: false, }, + // /_/* should point to XP services. Redirect only if XP is on a different origin + ...(process.env.XP_ORIGIN !== process.env.APP_ORIGIN + ? [ + { + source: '/_/:path*', + destination: `${process.env.XP_ORIGIN}/_/:path*`, + permanent: false, + }, + ] + : []), ], rewrites: async () => [ { @@ -249,15 +259,6 @@ const config = { source: '/feilside', destination: '/404', }, - // /_/* should point to XP services. Rewrite only if XP is on a different origin - ...(process.env.XP_ORIGIN !== process.env.APP_ORIGIN - ? [ - { - source: '/_/:path*', - destination: `${process.env.XP_ORIGIN}/_/:path*`, - }, - ] - : []), ...(isLocal ? [ {