@bleedingdev/modern-js-plugin-i18n 3.2.0-ultramodern.83 → 3.2.0-ultramodern.84

package/dist/cjs/runtime/i18n/backend/defaults.node.js

@@ -28,8 +28,8 @@ __webpack_require__.d(__webpack_exports__, {
     convertBackendOptions: ()=>convertBackendOptions
 });
 const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
-    loadPath: './locales/{{lng}}/{{ns}}.json',
-    addPath: './locales/{{lng}}/{{ns}}.json'
+    loadPath: './config/public/locales/{{lng}}/{{ns}}.json',
+    addPath: './config/public/locales/{{lng}}/{{ns}}.json'
 };
 function convertPath(path) {
     if (!path) return path;

package/dist/cjs/runtime/i18n/react-i18next.js

@@ -26,12 +26,9 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     getReactI18nextIntegration: ()=>getReactI18nextIntegration
 });
-function getOptionalReactI18nextPackageName() {
-    return "react-i18next";
-}
 async function tryImportReactI18next() {
     try {
-        return await import(getOptionalReactI18nextPackageName());
+        return await import("react-i18next");
     } catch (error) {
         return null;
     }

package/dist/cjs/runtime/index.js

@@ -137,6 +137,7 @@ const i18nPlugin = (options)=>({
                         localisedUrls,
                         forceUpdate
                     ]);
+                    const children = props.children;
                     const appContent = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
                         children: [
                             Boolean(htmlLangAttr) && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(head_namespaceObject.Helmet, {
@@ -146,9 +147,10 @@ const i18nPlugin = (options)=>({
                             }),
                             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_context_js_namespaceObject.ModernI18nProvider, {
                                 value: contextValue,
-                                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {
-                                    ...props
-                                })
+                                children: App ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {
+                                    ...props,
+                                    children: children
+                                }) : children
                             })
                         ]
                     });

package/dist/esm/runtime/i18n/backend/defaults.node.mjs

@@ -1,6 +1,6 @@
 const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
-    loadPath: './locales/{{lng}}/{{ns}}.json',
-    addPath: './locales/{{lng}}/{{ns}}.json'
+    loadPath: './config/public/locales/{{lng}}/{{ns}}.json',
+    addPath: './config/public/locales/{{lng}}/{{ns}}.json'
 };
 function convertPath(path) {
     if (!path) return path;

package/dist/esm/runtime/i18n/react-i18next.mjs

@@ -1,9 +1,6 @@
-function getOptionalReactI18nextPackageName() {
-    return "react-i18next";
-}
 async function tryImportReactI18next() {
     try {
-        return await import(getOptionalReactI18nextPackageName());
+        return await import("react-i18next");
     } catch (error) {
         return null;
     }

package/dist/esm/runtime/index.mjs

@@ -105,6 +105,7 @@ const i18nPlugin = (options)=>({
                         localisedUrls,
                         forceUpdate
                     ]);
+                    const children = props.children;
                     const appContent = /*#__PURE__*/ jsxs(Fragment, {
                         children: [
                             Boolean(htmlLangAttr) && /*#__PURE__*/ jsx(Helmet, {
@@ -114,9 +115,10 @@ const i18nPlugin = (options)=>({
                             }),
                             /*#__PURE__*/ jsx(ModernI18nProvider, {
                                 value: contextValue,
-                                children: /*#__PURE__*/ jsx(App, {
-                                    ...props
-                                })
+                                children: App ? /*#__PURE__*/ jsx(App, {
+                                    ...props,
+                                    children: children
+                                }) : children
                             })
                         ]
                     });

package/dist/esm-node/runtime/i18n/backend/defaults.node.mjs

@@ -1,7 +1,7 @@
 import "node:module";
 const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
-    loadPath: './locales/{{lng}}/{{ns}}.json',
-    addPath: './locales/{{lng}}/{{ns}}.json'
+    loadPath: './config/public/locales/{{lng}}/{{ns}}.json',
+    addPath: './config/public/locales/{{lng}}/{{ns}}.json'
 };
 function convertPath(path) {
     if (!path) return path;

package/dist/esm-node/runtime/i18n/react-i18next.mjs

@@ -1,10 +1,7 @@
 import "node:module";
-function getOptionalReactI18nextPackageName() {
-    return "react-i18next";
-}
 async function tryImportReactI18next() {
     try {
-        return await import(getOptionalReactI18nextPackageName());
+        return await import("react-i18next");
     } catch (error) {
         return null;
     }

package/dist/esm-node/runtime/index.mjs

@@ -106,6 +106,7 @@ const i18nPlugin = (options)=>({
                         localisedUrls,
                         forceUpdate
                     ]);
+                    const children = props.children;
                     const appContent = /*#__PURE__*/ jsxs(Fragment, {
                         children: [
                             Boolean(htmlLangAttr) && /*#__PURE__*/ jsx(Helmet, {
@@ -115,9 +116,10 @@ const i18nPlugin = (options)=>({
                             }),
                             /*#__PURE__*/ jsx(ModernI18nProvider, {
                                 value: contextValue,
-                                children: /*#__PURE__*/ jsx(App, {
-                                    ...props
-                                })
+                                children: App ? /*#__PURE__*/ jsx(App, {
+                                    ...props,
+                                    children: children
+                                }) : children
                             })
                         ]
                     });

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0-ultramodern.83",
+  "version": "3.2.0-ultramodern.84",
   "engines": {
     "node": ">=20"
   },
@@ -81,32 +81,29 @@
     }
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.21",
+    "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.4",
     "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.2.0-ultramodern.83",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.83",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.83",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.83",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.83",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.2.0-ultramodern.83"
+    "react-i18next": "17.0.8",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.84",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.84",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.2.0-ultramodern.84",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.2.0-ultramodern.84",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.84",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.84"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.2.0-ultramodern.83",
+    "@modern-js/runtime": "3.2.0-ultramodern.84",
     "i18next": ">=25.7.4",
     "react": "^19.2.6",
-    "react-dom": "^19.2.6",
-    "react-i18next": ">=15.7.4"
+    "react-dom": "^19.2.6"
   },
   "peerDependenciesMeta": {
     "i18next": {
       "optional": true
-    },
-    "react-i18next": {
-      "optional": true
     }
   },
   "devDependencies": {
@@ -118,10 +115,9 @@
     "jest": "^30.4.2",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "react-i18next": "17.0.8",
     "ts-jest": "^29.4.11",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.83",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.83"
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.84",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.84"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/runtime/i18n/backend/defaults.node.ts

@@ -1,6 +1,6 @@
 export const DEFAULT_I18NEXT_BACKEND_OPTIONS = {
-  loadPath: './locales/{{lng}}/{{ns}}.json',
-  addPath: './locales/{{lng}}/{{ns}}.json',
+  loadPath: './config/public/locales/{{lng}}/{{ns}}.json',
+  addPath: './config/public/locales/{{lng}}/{{ns}}.json',
 };
 
 function convertPath(path: string | undefined): string | undefined {

package/src/runtime/i18n/react-i18next.ts

@@ -7,15 +7,9 @@ interface ReactI18nextIntegration {
   initReactI18next: any | null;
 }
 
-function getOptionalReactI18nextPackageName(): string {
-  return ['react', 'i18next'].join('-');
-}
-
 async function tryImportReactI18next(): Promise<ReactI18nextModule | null> {
   try {
-    return (await import(
-      getOptionalReactI18nextPackageName()
-    )) as ReactI18nextModule;
+    return (await import('react-i18next')) as ReactI18nextModule;
   } catch (error) {
     return null;
   }

package/src/runtime/index.tsx

@@ -263,11 +263,12 @@ export const i18nPlugin = (options: I18nPluginOptions): RuntimePlugin => ({
           ],
         );
 
+        const children = (props as React.PropsWithChildren).children;
         const appContent = (
           <>
             {Boolean(htmlLangAttr) && <Helmet htmlAttributes={{ lang }} />}
             <ModernI18nProvider value={contextValue}>
-              <App {...props} />
+              {App ? <App {...props}>{children}</App> : children}
             </ModernI18nProvider>
           </>
         );

package/tests/i18nUtils.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from '@rstest/core';
 import type { I18nInstance } from '../src/runtime/i18n';
+import { DEFAULT_I18NEXT_BACKEND_OPTIONS as NODE_DEFAULT_I18NEXT_BACKEND_OPTIONS } from '../src/runtime/i18n/backend/defaults.node';
 import { initializeI18nInstance } from '../src/runtime/i18n/utils';
 
 function createBackendI18nInstance(): I18nInstance {
@@ -16,6 +17,12 @@ function createBackendI18nInstance(): I18nInstance {
 }
 
 describe('i18n runtime utils', () => {
+  test('uses the generated public locale directory for node fs backend defaults', () => {
+    expect(NODE_DEFAULT_I18NEXT_BACKEND_OPTIONS.loadPath).toBe(
+      './config/public/locales/{{lng}}/{{ns}}.json',
+    );
+  });
+
   test('does not poll for backend resources after init', async () => {
     const i18nInstance = createBackendI18nInstance();
     const init = rstest.fn(async () => {

package/tests/routerAdapter.test.tsx

@@ -1,10 +1,16 @@
-import { InternalRuntimeContext } from '@modern-js/runtime/context';
+import {
+  InternalRuntimeContext,
+  RuntimeContext,
+} from '@modern-js/runtime/context';
 import type React from 'react';
+import type { ComponentType, PropsWithChildren } from 'react';
 import { act } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
+import { i18nPlugin } from '../src/runtime';
 import { ModernI18nProvider, useModernI18n } from '../src/runtime/context';
 import { I18nLink } from '../src/runtime/I18nLink';
 import type { I18nInstance } from '../src/runtime/i18n';
+import { getReactI18nextIntegration } from '../src/runtime/i18n/react-i18next';
 
 (
   globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
@@ -72,6 +78,29 @@ function createReactRouterRuntimeContext(router: unknown) {
   return createRuntimeContext(router, 'react-router');
 }
 
+function collectI18nWrapRoot() {
+  let wrapRoot: ((App: ComponentType<any>) => ComponentType<any>) | undefined;
+
+  i18nPlugin({
+    reactI18next: false,
+    localeDetection: {
+      fallbackLanguage: 'en',
+    },
+  }).setup?.({
+    getRuntimeConfig: () => ({}),
+    onBeforeRender: () => undefined,
+    wrapRoot: (callback: (App: ComponentType<any>) => ComponentType<any>) => {
+      wrapRoot = callback;
+    },
+  } as any);
+
+  if (!wrapRoot) {
+    throw new Error('Expected i18n runtime plugin to register wrapRoot');
+  }
+
+  return wrapRoot;
+}
+
 function createTanstackRouter(pathname = '/en/terms-of-service', lang = 'en') {
   const url = new URL(pathname, 'https://modernjs.test');
 
@@ -94,6 +123,31 @@ function createTanstackRouter(pathname = '/en/terms-of-service', lang = 'en') {
   };
 }
 
+async function renderI18nRoot(node: React.ReactNode) {
+  const container = document.createElement('div');
+  document.body.appendChild(container);
+  const root = createRoot(container);
+
+  await act(async () => {
+    root.render(
+      <RuntimeContext.Provider
+        value={{
+          isBrowser: true,
+          requestContext,
+          context: requestContext,
+        }}
+      >
+        {node}
+      </RuntimeContext.Provider>,
+    );
+  });
+
+  return {
+    container,
+    root,
+  };
+}
+
 async function renderWithRuntime(
   node: React.ReactNode,
   runtimeContext: ReturnType<typeof createTanstackRuntimeContext>,
@@ -126,6 +180,56 @@ function cleanup(rendered?: { container: HTMLElement; root: Root }) {
   rendered.container.remove();
 }
 
+describe('i18n runtime wrapRoot', () => {
+  let rendered: { container: HTMLElement; root: Root } | undefined;
+
+  afterEach(() => {
+    cleanup(rendered);
+    rendered = undefined;
+  });
+
+  test('renders children when no root App exists yet', async () => {
+    const wrapRoot = collectI18nWrapRoot();
+    const I18nRoot = wrapRoot(undefined as unknown as ComponentType<any>);
+
+    rendered = await renderI18nRoot(
+      <I18nRoot>
+        <main>router content</main>
+      </I18nRoot>,
+    );
+
+    expect(rendered.container.textContent).toContain('router content');
+  });
+
+  test('preserves App props and children', async () => {
+    const wrapRoot = collectI18nWrapRoot();
+    const App = ({ children, label }: PropsWithChildren<{ label: string }>) => (
+      <main data-label={label}>{children}</main>
+    );
+    const I18nRoot = wrapRoot(App);
+
+    rendered = await renderI18nRoot(
+      <I18nRoot label="root">
+        <span>router content</span>
+      </I18nRoot>,
+    );
+
+    expect(
+      rendered.container.querySelector('main')?.getAttribute('data-label'),
+    ).toBe('root');
+    expect(rendered.container.textContent).toContain('router content');
+  });
+});
+
+describe('i18n react-i18next integration', () => {
+  test('loads the bundled react-i18next integration', async () => {
+    const integration = await getReactI18nextIntegration();
+
+    expect(integration.I18nextProvider).toEqual(expect.any(Function));
+    expect(integration.initReactI18next).toBeDefined();
+  });
+});
+
 describe('i18n router adapter', () => {
   let rendered: { container: HTMLElement; root: Root } | undefined;