From 2b5fb1b67f1f1012ee75e856560bd8914efe4b4a Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Fri, 6 Dec 2024 19:18:12 +0100
Subject: [PATCH] fix(rari): fix blog and add .env support (#12268)

---
 server/cli.ts   | 10 ++++++++++
 server/index.ts | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/server/cli.ts b/server/cli.ts
index 799e0b04d1ab..fcbffadc176e 100644
--- a/server/cli.ts
+++ b/server/cli.ts
@@ -2,6 +2,13 @@
 import { concurrently } from "concurrently";
 import { rariBin } from "@mdn/rari";
 import { filename } from "./filename.js";
+import { config } from "dotenv";
+import path from "node:path";
+import { cwd } from "node:process";
+
+config({
+  path: path.join(cwd(), process.env.ENV_FILE || ".env"),
+});
 
 const { commands, result } = concurrently(
   [
@@ -17,6 +24,9 @@ const { commands, result } = concurrently(
       command: `${rariBin} serve -vv`,
       name: "rari",
       prefixColor: "blue",
+      env: {
+        ...process.env,
+      },
     },
   ],
   {
diff --git a/server/index.ts b/server/index.ts
index b852678fd73d..77c9c4e604a3 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -346,7 +346,7 @@ if (CURRICULUM_ROOT) {
         data = await findCurriculumPageBySlug(slug);
       } else {
         try {
-          data = await fetch_from_rari(req.path);
+          data = await fetch_from_rari(req.path.replace(/index\.json$/, ""));
         } catch (error) {
           return res.status(500).json(JSON.stringify(error.toString()));
         }
@@ -374,7 +374,9 @@ if (BLOG_ROOT) {
       return res.json({ hyData: { posts } });
     } else {
       try {
-        const index = await fetch_from_rari(req.path);
+        const index = await fetch_from_rari(
+          req.path.replace(/index\.json$/, "")
+        );
         return res.json(index);
       } catch (error) {
         return res.status(500).json(JSON.stringify(error.toString()));
@@ -404,7 +406,9 @@ if (BLOG_ROOT) {
       return res.json(data);
     } else {
       try {
-        const index = await fetch_from_rari(req.path);
+        const index = await fetch_from_rari(
+          req.path.replace(/index\.json$/, "")
+        );
         return res.json(index);
       } catch (error) {
         return res.status(500).json(JSON.stringify(error.toString()));
@@ -446,7 +450,7 @@ if (contentProxy) {
     }
   });
   app.get("/[^/]+/docs/*/index.json", async (req, res) => {
-    const url = decodeURI(req.path.replace(/\/index.json$/, ""));
+    const url = decodeURI(req.path.replace(/\/index\.json$/, ""));
     try {
       const doc = await buildDocumentFromURL(url);
       if (!doc) {
@@ -513,7 +517,9 @@ if (RARI) {
     ],
     async (req, res) => {
       try {
-        const index = await fetch_from_rari(req.path);
+        const index = await fetch_from_rari(
+          req.path.replace(/index\.json$/, "")
+        );
         if (req.path.endsWith(".json")) {
           return res.json(index);
         }