remix-run · grz-gajda · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025
diff --git a/contributors.yml b/contributors.yml
@@ -369,3 +369,4 @@
 - yuleicul
 - zeromask1337
 - zheng-chuang
+- grz-gajda
diff --git a/integration/helpers/vite-6-lingui-template/.gitignore b/integration/helpers/vite-6-lingui-template/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+
+/.cache
+/build
+.env
+.react-router
diff --git a/integration/helpers/vite-6-lingui-template/app/root.tsx b/integration/helpers/vite-6-lingui-template/app/root.tsx
@@ -0,0 +1,23 @@
+import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
+import { i18n } from "@lingui/core";
+import { I18nProvider } from "@lingui/react";
+
+export default function App() {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        <I18nProvider i18n={i18n}>
+          <Outlet />
+        </I18nProvider>
+        <ScrollRestoration />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
diff --git a/integration/helpers/vite-6-lingui-template/app/routes.ts b/integration/helpers/vite-6-lingui-template/app/routes.ts
@@ -0,0 +1,4 @@
+import { type RouteConfig } from "@react-router/dev/routes";
+import { flatRoutes } from "@react-router/fs-routes";
+
+export default flatRoutes() satisfies RouteConfig;
diff --git a/integration/helpers/vite-6-lingui-template/app/routes/_index.tsx b/integration/helpers/vite-6-lingui-template/app/routes/_index.tsx
@@ -0,0 +1,16 @@
+import type { MetaFunction } from "react-router";
+
+export const meta: MetaFunction = () => {
+  return [
+    { title: "New React Router App" },
+    { name: "description", content: "Welcome to React Router!" },
+  ];
+};
+
+export default function Index() {
+  return (
+    <div style={{ fontFamily: "system-ui, sans-serif", lineHeight: "1.8" }}>
+      <h1>Welcome to React Router</h1>
+    </div>
+  );
+}
diff --git a/integration/helpers/vite-6-lingui-template/env.d.ts b/integration/helpers/vite-6-lingui-template/env.d.ts
@@ -0,0 +1,2 @@
+/// <reference types="@react-router/node" />
+/// <reference types="vite/client" />
diff --git a/integration/helpers/vite-6-lingui-template/package.json b/integration/helpers/vite-6-lingui-template/package.json
@@ -0,0 +1,46 @@
+{
+  "name": "integration-vite-6-template",
+  "version": "0.0.0",
+  "private": true,
+  "sideEffects": false,
+  "type": "module",
+  "scripts": {
+    "dev": "react-router dev",
+    "build": "react-router build",
+    "start": "react-router-serve ./build/server/index.js",
+    "typecheck": "react-router typegen && tsc"
+  },
+  "dependencies": {
+    "@lingui/core": "^5.2.0",
+    "@lingui/react": "^5.2.0",
+    "@react-router/express": "workspace:*",
+    "@react-router/node": "workspace:*",
+    "@react-router/serve": "workspace:*",
+    "@vanilla-extract/css": "^1.10.0",
+    "@vanilla-extract/vite-plugin": "^3.9.2",
+    "express": "^4.19.2",
+    "isbot": "^5.1.11",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router": "workspace:*",
+    "serialize-javascript": "^6.0.1"
+  },
+  "devDependencies": {
+    "@lingui/cli": "^5.2.0",
+    "@lingui/vite-plugin": "^5.2.0",
+    "@react-router/dev": "workspace:*",
+    "@react-router/fs-routes": "workspace:*",
+    "@react-router/remix-routes-option-adapter": "workspace:*",
+    "@types/react": "^18.2.20",
+    "@types/react-dom": "^18.2.7",
+    "eslint": "^8.38.0",
+    "typescript": "^5.1.6",
+    "vite": "^6.1.0",
+    "vite-plugin-babel-macros": "^1.0.6",
+    "vite-env-only": "^3.0.1",
+    "vite-tsconfig-paths": "^4.2.1"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  }
+}
diff --git a/integration/helpers/vite-6-lingui-template/public/favicon.ico b/integration/helpers/vite-6-lingui-template/public/favicon.ico
diff --git a/integration/helpers/vite-6-lingui-template/tsconfig.json b/integration/helpers/vite-6-lingui-template/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "include": ["env.d.ts", "**/*.ts", "**/*.tsx", ".react-router/types/**/*"],
+  "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2022"],
+    "verbatimModuleSyntax": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "resolveJsonModule": true,
+    "target": "ES2022",
+    "strict": true,
+    "allowJs": true,
+    "skipLibCheck": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./app/*"]
+    },
+    "noEmit": true,
+    "rootDirs": [".", ".react-router/types/"]
+  }
+}
diff --git a/integration/helpers/vite-6-lingui-template/vite.config.ts b/integration/helpers/vite-6-lingui-template/vite.config.ts
@@ -0,0 +1,9 @@
+import { reactRouter } from "@react-router/dev/vite";
+import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+import macrosPlugin from "vite-plugin-babel-macros";
+import { lingui } from "@lingui/vite-plugin";
+
+export default defineConfig({
+  plugins: [reactRouter(), macrosPlugin(), lingui(), tsconfigPaths()],
+});
diff --git a/integration/split-route-modules-test.ts b/integration/split-route-modules-test.ts
@@ -543,4 +543,58 @@ test.describe("Split route modules", async () => {
       });
     });
   });
+
+  test.describe("with support for @lingui", () => {
+    let splitRouteModules = true;
+    let port: number;
+    let cwd: string;
+
+    test.beforeAll(async () => {
+      port = await getPort();
+      cwd = await createProject({
+        "react-router.config.ts": reactRouterConfig({ splitRouteModules }),
+        "vite.config.js": await viteConfig.basic({ port }),
+        ...files,
+        "app/routes/unsplittable.tsx": js`
+          import { t } from "@lingui/core/macro";
+          import type { Route } from "./+types/unsplittable";
+          import { Form } from "react-router";
+
+          // Dummy variable to prevent route exports from being split
+          let shared: null = null;
+
+          export const clientLoader = async () => {
+            return shared ?? t\`Hello from unsplittable client loader\`;
+          };
+
+          export const clientAction = async () => {
+            return shared ?? "Hello from unsplittable client action";
+          };
+
+          export function HydrateFallback() {
+            return shared ?? <div>Loading...</div>;
+          }
+
+          export default function UnsplittableRoute({
+            loaderData,
+            actionData,
+          }: Route.ComponentProps) {
+            return (
+              <>
+                <p>{loaderData}</p>
+                <p>{actionData}</p>
+                <Form method="post">
+                  <button>Submit</button>
+                </Form>
+              </>
+            );
+          }`,
+      });
+    });
+
+    test("build passes", async () => {
+      let { status } = build({ cwd });
+      expect(status).toBe(0);
+    });
+  });
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/// <reference types="@react-router/node" />
		/// <reference types="vite/client" />