wip

navikt · Nov 11, 2024 · cf2b5fa · cf2b5fa
1 parent 769a530
commit cf2b5fa
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -6,8 +6,9 @@
   "type": "module",
   "scripts": {
     "start": "vite --base=/ & tsc --watch",
-    "build": "vite build",
-    "build:local": "vite --base=/ build",
+    "build": "vite build && bun run copy:robots",
+    "build:local": "vite --base=/ build && bun run copy:robots",
+    "copy:robots": "cp assets/robots.txt dist/assets/robots.txt",
     "typecheck": "tsc",
     "lint": "biome check"
   },
@@ -41,4 +42,4 @@
     "react-router-dom": "6.28.0",
     "styled-components": "6.1.13"
   }
-}
+}
diff --git a/server/src/plugins/not-found.ts b/server/src/plugins/not-found.ts
@@ -11,11 +11,14 @@ const log = getLogger('not-found-plugin');
 
 export const NOT_FOUND_PLUGIN_ID = 'not-found';
 
+const HARMLESS_NOT_FOUND_PATHS = ['/favicon.ico', '/'];
+
 export const notFoundPlugin = fastifyPlugin(
   async (app) => {
     app.setNotFoundHandler((req, reply) => {
-      if (isDeployedToProd) {
-        log.warn({
+      // if (isDeployedToProd) {
+        const harmless = HARMLESS_NOT_FOUND_PATHS.includes(req.url)
+        log[harmless ? "debug" : 'warn']({
           msg: `Invalid URL. Redirecting to external URL ${YTELSE_OVERVIEW_URL}`,
           data: { url: req.url },
         });
@@ -25,9 +28,9 @@ export const notFoundPlugin = fastifyPlugin(
         });
 
         return reply.redirect(YTELSE_OVERVIEW_URL);
-      }
+      // }
 
-      return reply.status(404).header('content-type', 'text/html').send(DEV_404_HTML);
+      // return reply.status(404).header('content-type', 'text/html').send(DEV_404_HTML);
     });
   },
   { fastify: '5', name: NOT_FOUND_PLUGIN_ID, dependencies: [SERVE_INDEX_PLUGIN_ID] },

diff --git a/server/src/plugins/serve-robots.ts b/server/src/plugins/serve-robots.ts
@@ -0,0 +1,12 @@
+import fastifyPlugin from 'fastify-plugin';
+
+export const SERVE_ROBOTS_PLUGIN_ID = 'serve-robots';
+
+export const serveRobotsPlugin = fastifyPlugin(
+  async (app) => {
+    app.get('/robots.txt', async (_, res) => {
+      res.redirect('https://cdn.nav.no/klage/klang/assets/robots.txt');
+    })
+  },
+  { fastify: '5', name: SERVE_ROBOTS_PLUGIN_ID},
+);
diff --git a/server/src/server.ts b/server/src/server.ts
@@ -23,6 +23,7 @@ import { EmojiIcons, sendToSlack } from '@app/slack';
 import cors from '@fastify/cors';
 import { fastify } from 'fastify';
 import metricsPlugin from 'fastify-metrics';
+import { serveRobotsPlugin } from './plugins/serve-robots';
 
 processErrors();
 
@@ -52,6 +53,7 @@ fastify({ trustProxy: true, querystringParser, bodyLimit, caseSensitive: false }
   .register(frontendLogPlugin)
   .register(errorReportPlugin)
   .register(accessTokenPlugin)
+  .register(serveRobotsPlugin)
   .register(oboAccessTokenPlugin)
   .register(apiProxyPlugin, { appNames: API_CLIENT_IDS, prefix: '/api' })
   .register(localDevPlugin)