Added middleware to base-stack

.vscode/settings.json

@@ -42,5 +42,8 @@
 	},
 	"[typescriptreact]": {
 		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[typescript]": {
+		"editor.defaultFormatter": "biomejs.biome"
 	}
 }

app/entry.server.tsx

@@ -4,10 +4,11 @@ import { createInstance } from "i18next"
 import { isbot } from "isbot"
 import { renderToPipeableStream } from "react-dom/server"
 import { I18nextProvider, initReactI18next } from "react-i18next"
-import { type AppLoadContext, type EntryContext, ServerRouter } from "react-router"
+import { type EntryContext, ServerRouter, type unstable_RouterContextProvider } from "react-router"
 import i18n from "./localization/i18n" // your i18n configuration file
 import i18nextOpts from "./localization/i18n.server"
 import { resources } from "./localization/resource"
+import { globalAppContext } from "./server/context"
 
 // Reject all pending promises from handler functions after 10 seconds
 export const streamTimeout = 10000
@@ -17,11 +18,12 @@ export default async function handleRequest(
 	responseStatusCode: number,
 	responseHeaders: Headers,
 	context: EntryContext,
-	appContext: AppLoadContext
+	appContext: unstable_RouterContextProvider
 ) {
+	const ctx = appContext.get(globalAppContext)
 	const callbackName = isbot(request.headers.get("user-agent")) ? "onAllReady" : "onShellReady"
 	const instance = createInstance()
-	const lng = appContext.lang
+	const lng = ctx.lang
 	// biome-ignore lint/suspicious/noExplicitAny: <explanation>
 	const ns = i18nextOpts.getRouteNamespaces(context as any)
 
@@ -48,8 +50,8 @@ export default async function handleRequest(
 					responseHeaders.set("Content-Type", "text/html")
 
 					resolve(
-						// @ts-expect-error - We purposely do not define the body as existent so it's not used inside loaders as it's injected there as well
-						appContext.body(stream, {
+						// @ts-expect-error
+						ctx.body(stream, {
 							headers: responseHeaders,
 							status: didError ? 500 : responseStatusCode,
 						})

app/root.tsx

@@ -4,11 +4,12 @@ import type { LinksFunction } from "react-router"
 import { useChangeLanguage } from "remix-i18next/react"
 import type { Route } from "./+types/root"
 import { LanguageSwitcher } from "./library/language-switcher"
+import { globalAppContext } from "./server/context"
 import { ClientHintCheck, getHints } from "./services/client-hints"
 import tailwindcss from "./tailwind.css?url"
 
 export async function loader({ context, request }: Route.LoaderArgs) {
-	const { lang, clientEnv } = context
+	const { lang, clientEnv } = context.get(globalAppContext)
 	const hints = getHints(request)
 	return { lang, clientEnv, hints }
 }

app/routes/resource.locales.ts

@@ -1,10 +1,12 @@
 import { cacheHeader } from "pretty-cache-header"
 import { z } from "zod"
 import { resources } from "~/localization/resource"
+import { globalAppContext } from "~/server/context"
 import type { Route } from "./+types/resource.locales"
 
 export async function loader({ request, context }: Route.LoaderArgs) {
-	const { env } = context
+	const { env } = context.get(globalAppContext)
+
 	const url = new URL(request.url)
 
 	const lng = z

app/routes/robots[.]txt.ts

@@ -1,10 +1,11 @@
 import { generateRobotsTxt } from "@forge42/seo-tools/robots"
 
+import { globalAppContext } from "~/server/context"
 import { createDomain } from "~/utils/http"
 import type { Route } from "./+types/robots[.]txt"
 
 export async function loader({ request, context }: Route.LoaderArgs) {
-	const { env } = context
+	const { env } = context.get(globalAppContext)
 	const isProductionDeployment = env.APP_DEPLOYMENT_ENV === "production"
 	const domain = createDomain(request)
 	const robotsTxt = generateRobotsTxt([

app/server/context.ts

@@ -1,16 +1,17 @@
 import type { Context } from "hono"
+import { unstable_createContext } from "react-router"
 import { i18next } from "remix-hono/i18next"
 import { getClientEnv, initEnv } from "~/env.server"
 
 // Setup the .env vars
 const env = initEnv()
+const globalAppContext = unstable_createContext<GlobalAppContext>()
 
-export const getLoadContext = async (c: Context) => {
+const generateContext = async (c: Context) => {
 	// get the locale from the context
 	const locale = i18next.getLocale(c)
 	// get t function for the default namespace
 	const t = await i18next.getFixedT(c)
-
 	const clientEnv = getClientEnv()
 	return {
 		lang: locale,
@@ -22,11 +23,11 @@ export const getLoadContext = async (c: Context) => {
 	}
 }
 
-interface LoadContext extends Awaited<ReturnType<typeof getLoadContext>> {}
-
-/**
- * Declare our loaders and actions context type
- */
-declare module "react-router" {
-	interface AppLoadContext extends Omit<LoadContext, "body"> {}
+export const getLoadContext = async (c: Context) => {
+	const ctx = await generateContext(c)
+	return new Map([[globalAppContext, ctx]])
 }
+
+interface GlobalAppContext extends Awaited<ReturnType<typeof generateContext>> {}
+
+export { globalAppContext }

app/server/index.ts

@@ -8,5 +8,6 @@ export default await createHonoServer({
 		server.use("*", i18next(i18nextOpts))
 	},
 	defaultLogger: false,
+	// @ts-expect-error
 	getLoadContext,
 })

package.json

@@ -1,4 +1,4 @@
 {
 	"name": "@forge42/base-stack",
 	"version": "0.0.1",
 	"author": "forge-42",
@@ -29,7 +29,7 @@
 	"dependencies": {
 		"@epic-web/client-hints": "1.3.5",
 		"@forge42/seo-tools": "1.3.0",
-		"@react-router/node": "7.2.0",
+		"@react-router/node": "7.3.0",
 		"clsx": "2.1.1",
 		"hono": "4.6.20",
 		"i18next": "24.2.2",
@@ -40,7 +40,7 @@
 		"react": "19.0.0",
 		"react-dom": "19.0.0",
 		"react-i18next": "15.4.0",
-		"react-router": "7.2.0",
+		"react-router": "7.3.0",
 		"react-router-hono-server": "2.10.0",
 		"remix-hono": "0.0.18",
 		"remix-i18next": "7.0.2",
@@ -51,8 +51,8 @@
 		"@babel/preset-typescript": "7.26.0",
 		"@biomejs/biome": "1.9.4",
 		"@dotenvx/dotenvx": "1.34.0",
-		"@react-router/dev": "7.2.0",
-		"@react-router/fs-routes": "7.2.0",
+		"@react-router/dev": "7.3.0",
+		"@react-router/fs-routes": "7.3.0",
 		"@tailwindcss/vite": "4.0.9",
 		"@testing-library/react": "16.2.0",
 		"@types/node": "22.13.1",
@@ -89,6 +89,11 @@
 		"pnpm": ">=10.2.0"
 	},
 	"pnpm": {
-		"onlyBuiltDependencies": ["@biomejs/biome", "esbuild", "lefthook", "msw"]
+		"onlyBuiltDependencies": [
+			"@biomejs/biome",
+			"esbuild",
+			"lefthook",
+			"msw"
+		]
 	}
-}
+}