@bleedingdev/modern-js-plugin-i18n 3.5.0-ultramodern.27 → 3.5.0-ultramodern.29

package/dist/types/runtime/hooks.d.ts

@@ -4,6 +4,11 @@ import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import type { I18nInstance } from './i18n';
 interface RuntimeContextWithI18n extends TRuntimeContext {
     i18nInstance?: I18nInstance;
+    ssrContext?: {
+        request?: {
+            pathname?: string;
+        };
+    };
 }
 export declare function createContextValue(lang: string, i18nInstance: I18nInstance | undefined, entryName: string | undefined, languages: string[], localePathRedirect: boolean, ignoreRedirectRoutes: string[] | ((pathname: string) => boolean) | undefined, localisedUrls: LocalisedUrlsOption | undefined, setLang: (lang: string) => void): {
     language: string;

package/dist/types/runtime/utils.d.ts

@@ -1,6 +1,11 @@
-import { type TInternalRuntimeContext } from '@modern-js/runtime/context';
 import type { LocalisedUrlsOption } from '../shared/localisedUrls';
-export declare const getPathname: (context: TInternalRuntimeContext) => string;
+export declare const getPathname: (context: {
+    ssrContext?: {
+        request?: {
+            pathname?: string;
+        };
+    };
+}) => string;
 export declare const getEntryPath: () => string;
 /**
  * Helper function to get language from current pathname

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.27",
+  "version": "3.5.0-ultramodern.29",
   "engines": {
     "node": ">=20"
   },
@@ -97,15 +97,15 @@
     "i18next-fs-backend": "^2.6.6",
     "i18next-http-backend": "^4.0.0",
     "i18next-http-middleware": "^3.9.7",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.27",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.27",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.27",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.27",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.27",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.27"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.29",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.29",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.5.0-ultramodern.29",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.29",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.5.0-ultramodern.29",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.29"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.5.0-ultramodern.27",
+    "@modern-js/runtime": "3.5.0-ultramodern.29",
     "i18next": ">=26.3.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
@@ -129,8 +129,8 @@
     "react-i18next": "17.0.8",
     "ts-node": "^10.9.2",
     "typescript": "^6.0.3",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.27",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.27"
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.29",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.5.0-ultramodern.29"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/runtime/core.tsx

@@ -121,7 +121,7 @@ export const createI18nPlugin =
         return loadReactI18nextIntegration?.() ?? null;
       };
 
-      api.onBeforeRender(async context => {
+      api.onBeforeRender(async (context: RuntimeContextWithI18n) => {
         const {
           useI18nextBackend,
           changeI18nLanguage,
@@ -228,8 +228,8 @@ export const createI18nPlugin =
         };
       });
 
-      api.wrapRoot(App => {
-        return props => {
+      api.wrapRoot((App: React.ComponentType<any>) => {
+        return (props: Record<string, unknown>) => {
           const runtimeContext = useContext(
             RuntimeContext,
           ) as RuntimeContextWithI18n;

package/src/runtime/hooks.ts

@@ -21,6 +21,9 @@ import {
 
 interface RuntimeContextWithI18n extends TRuntimeContext {
   i18nInstance?: I18nInstance;
+  // Present when the context actually is the internal runtime context;
+  // getPathname only ever reads this on the server.
+  ssrContext?: { request?: { pathname?: string } };
 }
 
 function createMinimalI18nInstance(language: string): I18nInstance {

package/src/runtime/utils.ts

@@ -1,12 +1,14 @@
 import { isBrowser } from '@modern-js/runtime';
-import {
-  getGlobalBasename,
-  type TInternalRuntimeContext,
-} from '@modern-js/runtime/context';
+import { getGlobalBasename } from '@modern-js/runtime/context';
 import type { LocalisedUrlsOption } from '../shared/localisedUrls';
 import { localiseTargetPathname } from '../shared/localisedUrls';
 
-export const getPathname = (context: TInternalRuntimeContext): string => {
+// Structural parameter: hooks.ts passes a public-TRuntimeContext-based
+// context while core.tsx passes the internal one; both carry the request
+// pathname shape this helper needs.
+export const getPathname = (context: {
+  ssrContext?: { request?: { pathname?: string } };
+}): string => {
   if (isBrowser()) {
     return window.location.pathname;
   }

package/tests/reactI18nextRuntimeBoundary.test.ts

@@ -7,7 +7,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const runtimeRoot = resolve(__dirname, '../src/runtime');
 
 const readRuntimeSource = (file: string) =>
-  readFileSync(resolve(runtimeRoot, file), 'utf8');
+  readFileSync(resolve(runtimeRoot, file), 'utf8').replace(/\r\n/gu, '\n');
 
 describe('react-i18next runtime boundary', () => {
   test('keeps the disabled runtime entry free of the optional adapter edge', () => {

package/tests/type-fixture/fixture-globals.d.ts

@@ -0,0 +1,11 @@
+// The Window._SSR_DATA augmentation lives in @modern-js/runtime's internal
+// core/types module, which this fixture's isolated program never pulls in.
+interface Window {
+  _SSR_DATA?: {
+    data?: {
+      i18nData?: {
+        lng?: string;
+      };
+    };
+  };
+}

package/tests/type-fixture/tsconfig.json

@@ -7,6 +7,7 @@
     "noEmit": true,
     "skipLibCheck": true,
     "lib": ["ESNext", "DOM"],
+    "types": ["node"],
     "paths": {
       "@modern-js/plugin-i18n/runtime": ["../../src/runtime/index.tsx"]
     }