@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.4 → 3.9.0-ultramodern.6

package/dist/types/server/index.d.ts

@@ -1,9 +1,11 @@
 import type { ServerPlugin } from '@modern-js/server-runtime';
 import type { LocaleDetectionOptions } from '../shared/type.js';
+import type { I18nUrlStrategy } from '../shared/urlStrategy.js';
 export { collectApiPrefixes, matchesApiPrefix } from './apiPrefix.js';
 export interface I18nPluginOptions {
     localeDetection: LocaleDetectionOptions;
     staticRoutePrefixes: string[];
+    resolveUrlStrategy?: (entryName: string) => I18nUrlStrategy | undefined;
 }
 export declare const i18nServerPlugin: (options: I18nPluginOptions) => ServerPlugin;
 export default i18nServerPlugin;

package/dist/types/server/redirectPolicy.d.ts

@@ -1,22 +1,14 @@
-import type { LocaleDetectionOptions } from '../shared/type.js';
+import type { I18nUrlStrategy } from '../shared/urlStrategy.js';
 interface LocaleRedirectRequest {
     url: string;
-    header: () => {
+    header?: () => {
         host?: string;
     };
 }
-/**
- * Check if pathname should ignore automatic locale redirect.
- */
-export declare const shouldIgnoreRedirect: (pathname: string, urlPath: string, ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean)) => boolean;
-/**
- * Check if pathname is a static or federation resource request.
- *
- * This includes configured staticRoutePrefixes, the shared default skip policy
- * from ADR-0002, and language-prefixed variants such as /en/static/app.js.
- */
+export declare const shouldIgnoreRedirect: (pathname: string, urlPath: string, ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean), urlStrategy?: I18nUrlStrategy, languages?: string[]) => boolean;
+/** Native configured/static exclusions remain in effect for every strategy. */
 export declare const isStaticResourceRequest: (pathname: string, staticRoutePrefixes: string[], languages?: string[]) => boolean;
 export declare const getLanguageFromPath: (req: LocaleRedirectRequest, urlPath: string, languages: string[]) => string | null;
-export declare const buildLocalizedUrl: (req: LocaleRedirectRequest, urlPath: string, language: string, languages: string[], localisedUrls?: LocaleDetectionOptions['localisedUrls']) => string;
+export declare const buildLocalizedUrl: (req: LocaleRedirectRequest, urlPath: string, language: string, languages: string[], urlStrategy?: I18nUrlStrategy) => string;
 export declare const createLocaleRedirectResponse: (location: string) => Response;
 export {};

package/dist/types/shared/type.d.ts

@@ -1,4 +1,3 @@
-import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import type { LanguageDetectorOptions, Resources } from '../runtime/i18n/instance.js';
 export interface BaseLocaleDetectionOptions {
     localePathRedirect?: boolean;
@@ -7,19 +6,6 @@ export interface BaseLocaleDetectionOptions {
     fallbackLanguage?: string;
     detection?: LanguageDetectorOptions;
     ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean);
-    /**
-     * Enables localised pathnames in addition to the locale prefix.
-     *
-     * - non-empty object: map canonical route paths to every configured
-     *   language; route generation then validates that every localisable route
-     *   path has entries for all configured languages.
-     * - absent / `false` / `true` / empty object: keep only locale-prefix
-     *   behavior (`/en/about`).
-     *
-     * Strictly opt-in: without a map, `localePathRedirect` + `languages` behave
-     * exactly like upstream Modern.js.
-     */
-    localisedUrls?: LocalisedUrlsOption;
 }
 export interface LocaleDetectionOptions extends BaseLocaleDetectionOptions {
     localeDetectionByEntry?: Record<string, BaseLocaleDetectionOptions>;

package/dist/types/shared/urlStrategy.d.ts

@@ -0,0 +1,7 @@
+/** Per-plugin URL policy. Search and hash remain owned by native URL handling. */
+export interface I18nUrlStrategy {
+    localizePathname(pathname: string, language: string, languages: readonly string[]): string;
+    canonicalPathname(pathname: string, languages: readonly string[]): string;
+    /** Adds exclusions; it cannot enable redirects excluded by native rules. */
+    shouldSkipRedirect?(pathname: string, languages: readonly string[]): boolean;
+}

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.4",
+  "version": "3.9.0-ultramodern.6",
   "engines": {
     "node": ">=20"
   },
@@ -80,6 +80,14 @@
     "./i18n": {
       "types": "./dist/types/runtime/i18n/index.d.ts",
       "default": "./dist/esm/runtime/i18n/index.mjs"
+    },
+    "./config": {
+      "types": "./dist/types/shared/utils.d.ts",
+      "node": {
+        "import": "./dist/esm-node/shared/utils.mjs",
+        "require": "./dist/cjs/shared/utils.js"
+      },
+      "default": "./dist/esm/shared/utils.mjs"
     }
   },
   "typesVersions": {
@@ -107,17 +115,19 @@
       ],
       "i18n": [
         "./dist/types/runtime/i18n/index.d.ts"
+      ],
+      "config": [
+        "./dist/types/shared/utils.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@modern-js/i18n-runtime-extensions": "npm:@bleedingdev/modern-js-i18n-runtime-extensions@3.9.0-ultramodern.4",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.4",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.4",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.4",
-    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.9.0-ultramodern.4",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.4",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.4",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.6",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.6",
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.9.0-ultramodern.6",
+    "@modern-js/server-runtime": "npm:@bleedingdev/modern-js-server-runtime@3.9.0-ultramodern.6",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.6",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.6",
     "@swc/helpers": "^0.5.23",
     "i18next-browser-languagedetector": "^8.2.1",
     "i18next-chained-backend": "^5.0.6",
@@ -126,7 +136,7 @@
     "i18next-http-middleware": "^3.9.8"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.9.0-ultramodern.4",
+    "@modern-js/runtime": "3.9.0-ultramodern.6",
     "i18next": ">=25.7.4",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
@@ -141,8 +151,8 @@
     }
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.4",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.4",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.6",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.9.0-ultramodern.6",
     "@rslib/core": "1.0.0",
     "@types/node": "^26.4.1",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",

package/rstest.config.mts

@@ -29,24 +29,18 @@ export default {
       include: [
         'tests/i18nUtils.test.ts',
         'tests/localisedUrls.test.ts',
-        'tests/localisedUrlRewriteMatrix.fork.test.ts',
         'tests/linkTypes.test.ts',
         'tests/backendDefaults.test.ts',
         'tests/redirectPolicy.test.ts',
-        'tests/peerCohort.test.ts',
         'tests/reactI18nextRuntimeBoundary.test.ts',
-        'tests/federatedI18nBoundary.test.tsx',
+        'tests/federatedI18nBoundaryResolver.test.tsx',
       ],
       extends: commonConfig,
     }),
     withTestPreset({
       name: 'plugin-i18n-client',
       testEnvironment: 'happy-dom',
-      include: [
-        'tests/routerAdapter.test.tsx',
-        'tests/link.test.tsx',
-        'tests/federatedI18nBoundary.client.test.tsx',
-      ],
+      include: ['tests/routerAdapter.test.tsx', 'tests/link.test.tsx'],
       extends: commonConfig,
     }),
   ],

package/src/cli/index.ts

@@ -1,16 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
-import {
-  applyLocalisedUrlsToRoutes,
-  resolveLocalisedUrlsConfig,
-} from '@modern-js/i18n-runtime-extensions';
 import { getPublicDirRoutePrefixes } from '@modern-js/server-core';
-import type {
-  Entrypoint,
-  NestedRouteForCli,
-  PageRoute,
-} from '@modern-js/types';
+import type { Entrypoint } from '@modern-js/types';
 import type { BackendOptions, LocaleDetectionOptions } from '../shared/type';
 import { getBackendOptions, getLocaleDetectionOptions } from '../shared/utils';
 import { applyDetectedBackendPaths, detectLocalesDirectory } from './locales';
@@ -144,40 +136,6 @@ export const i18nPlugin = (
       };
     });
 
-    api.modifyFileSystemRoutes(({ entrypoint, routes }) => {
-      if (!localeDetection) {
-        return { entrypoint, routes };
-      }
-
-      const localeDetectionOptions = getLocaleDetectionOptions(
-        entrypoint.entryName,
-        localeDetection,
-      );
-      const {
-        localePathRedirect,
-        languages = [],
-        localisedUrls,
-      } = localeDetectionOptions;
-
-      if (!localePathRedirect || languages.length === 0) {
-        return { entrypoint, routes };
-      }
-
-      const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
-      if (!localisedUrlsConfig.enabled) {
-        return { entrypoint, routes };
-      }
-
-      return {
-        entrypoint,
-        routes: applyLocalisedUrlsToRoutes(
-          routes as (NestedRouteForCli | PageRoute)[],
-          languages,
-          localisedUrlsConfig.map,
-        ) as (NestedRouteForCli | PageRoute)[],
-      };
-    });
-
     api._internalServerPlugins(({ plugins }) => {
       const { serverRoutes, metaName } = api.getAppContext();
       const normalizedConfig = api.getNormalizedConfig();

package/src/runtime/Link.tsx

@@ -104,11 +104,11 @@ export const Link = <TTo extends string = string>(
   } = props as LinkBaseProps & { to: string; params?: LinkParams };
 
   const adapter = useI18nRouterAdapter();
-  const { language, supportedLanguages, localisedUrls } = useModernI18n();
+  const { language, supportedLanguages, urlStrategy } = useModernI18n();
 
   const config: LocalizedPathsConfig = {
     languages: supportedLanguages,
-    localisedUrls,
+    urlStrategy,
   };
 
   const isExternal = EXTERNAL_TARGET_RE.test(to);
@@ -139,7 +139,7 @@ export const Link = <TTo extends string = string>(
       interpolated,
       language,
       supportedLanguages,
-      localisedUrls,
+      urlStrategy,
     );
     const hash = hashProp ?? (hashFromTo ? hashFromTo.slice(1) : '');
     const { searchString, searchObject } = normalizeSearch(
@@ -164,7 +164,7 @@ export const Link = <TTo extends string = string>(
     isBareHash,
     language,
     supportedLanguages,
-    localisedUrls,
+    urlStrategy,
   ]);
 
   const isActive = useMemo(() => {
@@ -190,7 +190,7 @@ export const Link = <TTo extends string = string>(
     adapter.location,
     activeOptions?.exact,
     supportedLanguages,
-    localisedUrls,
+    urlStrategy,
   ]);
 
   const resolvedActiveProps = splitActiveProps(isActive, activeProps);
@@ -214,7 +214,7 @@ export const Link = <TTo extends string = string>(
     );
   }
 
-  const { Link: RouterLink, hasRouter, framework } = adapter;
+  const { Link: RouterLink, hasRouter } = adapter;
 
   if (!hasRouter || !RouterLink) {
     const { replace: _replace, ...anchorProps } = rest;
@@ -252,43 +252,23 @@ export const Link = <TTo extends string = string>(
     ...(activeStyle as React.CSSProperties | undefined),
   };
 
-  if (framework === 'tanstack') {
-    // TanStack's prop is `preload`; map our react-router-flavored `prefetch`
-    // onto it (`'none'` -> `false`). An explicit native `preload` wins.
-    const tanstackPreload =
-      preload !== undefined
-        ? preload
-        : prefetch === undefined
-          ? undefined
-          : prefetch === 'none'
-            ? false
-            : prefetch;
-
-    // Pass hash/search natively: string-concatenated targets silently break
-    // TanStack navigation.
-    return (
-      <RouterLink
-        to={target.localizedPathname}
-        {...(target.searchObject ? { search: target.searchObject } : {})}
-        {...(target.hash ? { hash: target.hash } : {})}
-        {...(hashScrollIntoView === undefined ? {} : { hashScrollIntoView })}
-        {...(tanstackPreload === undefined ? {} : { preload: tanstackPreload })}
-        {...rest}
-        {...activeRest}
-        {...activeAttributes}
-        className={mergedClassName}
-        style={mergedStyle}
-      >
-        {children}
-      </RouterLink>
-    );
-  }
+  const routerProps = adapter.createLinkProps?.({
+    pathname: target.localizedPathname,
+    href: target.href,
+    search: target.searchObject,
+    hash: target.hash,
+    hashScrollIntoView,
+    prefetch,
+    preload,
+  }) ?? {
+    to: target.href,
+    ...(prefetch === undefined ? {} : { prefetch }),
+    ...(preload === undefined ? {} : { preload }),
+  };
 
   return (
     <RouterLink
-      to={target.href}
-      {...(prefetch === undefined ? {} : { prefetch })}
-      {...(preload === undefined ? {} : { preload })}
+      {...routerProps}
       {...rest}
       {...activeRest}
       {...activeAttributes}

package/src/runtime/context.tsx

@@ -1,4 +1,4 @@
-import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
+import { RuntimeComponentResolverContext } from '@modern-js/runtime/context';
 import type { ComponentType, FC, ReactNode } from 'react';
 import {
   createContext,
@@ -7,6 +7,7 @@ import {
   useEffect,
   useMemo,
 } from 'react';
+import type { I18nUrlStrategy } from '../shared/urlStrategy';
 import {
   changeModernI18nLanguage,
   getPathLanguage,
@@ -16,10 +17,12 @@ import {
 } from './contextHelpers';
 import type { I18nInstance } from './i18n';
 import type { Resources } from './i18n/instance';
-import { getActualI18nextInstance } from './i18n/instance';
+
 import { useI18nRouterAdapter } from './routerAdapter';
 
-interface ModernI18nContextValue {
+export { getActualI18nextInstance } from './i18n/instance';
+
+export interface ModernI18nContextValue {
   language: string;
   i18nInstance: I18nInstance;
   // Plugin configuration for useModernI18n hook
@@ -27,7 +30,7 @@ interface ModernI18nContextValue {
   languages?: string[];
   localePathRedirect?: boolean;
   ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean);
-  localisedUrls?: LocalisedUrlsOption;
+  urlStrategy?: I18nUrlStrategy;
   // Callback to update language in context
   updateLanguage?: (newLang: string) => void;
   synchronizeLanguage?: (newLang: string) => void;
@@ -50,16 +53,15 @@ const getGlobalContext = <T,>(key: symbol, defaultValue: T) => {
   return globalStore[key];
 };
 
-const ModernI18nContext = getGlobalContext<ModernI18nContextValue | null>(
-  modernI18nContextKey,
-  null,
-);
-const ReactI18nextProviderContext = getGlobalContext<ComponentType<any> | null>(
-  reactI18nextProviderContextKey,
-  null,
-);
+export const ModernI18nContext =
+  getGlobalContext<ModernI18nContextValue | null>(modernI18nContextKey, null);
+export const ReactI18nextProviderContext =
+  getGlobalContext<ComponentType<any> | null>(
+    reactI18nextProviderContextKey,
+    null,
+  );
 
-interface ModernI18nProviderProps {
+export interface ModernI18nProviderProps {
   children: ReactNode;
   i18nextProvider?: ComponentType<any> | null;
   value: ModernI18nContextValue;
@@ -92,123 +94,22 @@ export interface FederatedI18nBoundaryProps {
   supportedLanguages?: string[];
 }
 
-/**
- * Keeps a federated surface's translation resources inside its delivery unit.
- * The host supplies only the active language; the remote owns and versions the
- * resources used below this boundary.
- */
-export const FederatedI18nBoundary: FC<FederatedI18nBoundaryProps> = ({
-  children,
-  defaultNamespace,
-  fallbackLanguage,
-  resources,
-  supportedLanguages,
-}) => {
-  const parent = useContext(ModernI18nContext);
-  const I18nextProvider = useContext(ReactI18nextProviderContext);
-  if (!parent) {
-    throw new Error(
-      'FederatedI18nBoundary must be used within ModernI18nProvider',
-    );
-  }
-
-  const languages =
-    supportedLanguages ?? parent.languages ?? Object.keys(resources);
-  const scopedInstance = useMemo(() => {
-    const parentInstance = getActualI18nextInstance(parent.i18nInstance);
-    const clone = parentInstance.cloneInstance?.({
-      defaultNS: defaultNamespace,
-      fallbackLng: fallbackLanguage ?? languages[0] ?? parent.language,
-      forkResourceStore: true,
-      initImmediate: false,
-      lng: parent.language,
-      ns: [defaultNamespace],
-      resources,
-      supportedLngs: languages,
-    });
-    if (!clone) {
-      throw new Error(
-        'FederatedI18nBoundary requires an i18n instance with cloneInstance support',
-      );
-    }
-    const resourceStore = clone.store;
-    const parentResourceStore = parentInstance.store;
-    const sharesNestedResourceState = Object.entries(
-      resourceStore?.data ?? {},
-    ).some(([language, namespaces]) => {
-      const parentNamespaces = parentResourceStore?.data?.[language];
-      return (
-        namespaces === parentNamespaces ||
-        Object.entries(namespaces).some(
-          ([namespace, resource]) =>
-            resource !== null &&
-            typeof resource === 'object' &&
-            resource === parentNamespaces?.[namespace],
-        )
-      );
-    });
-    if (
-      clone === parentInstance ||
-      resourceStore === parentResourceStore ||
-      resourceStore?.data === parentResourceStore?.data ||
-      sharesNestedResourceState
-    ) {
-      throw new Error(
-        'FederatedI18nBoundary cloneInstance did not isolate the host resource store',
-      );
-    }
-    if (
-      !resourceStore?.addResourceBundle ||
-      !clone.removeResourceBundle ||
-      !resourceStore.data
-    ) {
-      throw new Error(
-        'FederatedI18nBoundary requires an isolated mutable i18n resource store',
-      );
-    }
-    for (const [language, namespaces] of Object.entries(resourceStore.data)) {
-      for (const namespace of Object.keys(namespaces)) {
-        clone.removeResourceBundle(language, namespace);
-      }
-    }
-    for (const [language, namespaces] of Object.entries(resources)) {
-      for (const [namespace, resource] of Object.entries(namespaces)) {
-        resourceStore.addResourceBundle(
-          language,
-          namespace,
-          resource as Record<string, string>,
-          true,
-          true,
-        );
-      }
-    }
-    return clone;
-  }, [
-    defaultNamespace,
-    fallbackLanguage,
-    languages,
-    parent.i18nInstance,
-    parent.language,
-    resources,
-  ]);
-  const value = useMemo(
-    () => ({
-      ...parent,
-      i18nInstance: scopedInstance,
-      language: parent.language,
-      languages,
-    }),
-    [languages, parent, scopedInstance],
+const MissingFederatedI18nBoundary: FC<FederatedI18nBoundaryProps> = () => {
+  throw new Error(
+    'FederatedI18nBoundary requires the @modern-js/i18n-integration runtime plugin',
   );
+};
 
-  const scopedContent = (
-    <ModernI18nProvider value={value}>{children}</ModernI18nProvider>
-  );
-  return I18nextProvider ? (
-    <I18nextProvider i18n={scopedInstance}>{scopedContent}</I18nextProvider>
-  ) : (
-    scopedContent
-  );
+export const FederatedI18nBoundary: FC<FederatedI18nBoundaryProps> = props => {
+  const resolveComponent = useContext(RuntimeComponentResolverContext);
+  const Boundary =
+    resolveComponent?.(MissingFederatedI18nBoundary, {
+      name: 'i18n.FederatedI18nBoundary',
+    }) ?? MissingFederatedI18nBoundary;
+  if (Boundary === FederatedI18nBoundary) {
+    throw new Error('FederatedI18nBoundary resolver returned its own wrapper');
+  }
+  return <Boundary {...props} />;
 };
 
 export interface UseModernI18nReturn<
@@ -219,7 +120,7 @@ export interface UseModernI18nReturn<
   t: (key: string | string[], ...args: any[]) => string;
   i18nInstance: TInstance;
   supportedLanguages: string[];
-  localisedUrls?: LocalisedUrlsOption;
+  urlStrategy?: I18nUrlStrategy;
   isLanguageSupported: (lang: string) => boolean;
   // Indicates whether translation resources for current language are ready
   isResourcesReady: boolean;
@@ -258,7 +159,7 @@ export const useModernI18n = <
     languages,
     localePathRedirect,
     ignoreRedirectRoutes,
-    localisedUrls,
+    urlStrategy,
     updateLanguage,
     synchronizeLanguage,
   } = context;
@@ -295,7 +196,7 @@ export const useModernI18n = <
         updateLanguage,
         localePathRedirect,
         ignoreRedirectRoutes,
-        localisedUrls,
+        urlStrategy,
         languages,
         hasRouter,
         navigate,
@@ -306,7 +207,7 @@ export const useModernI18n = <
       updateLanguage,
       localePathRedirect,
       ignoreRedirectRoutes,
-      localisedUrls,
+      urlStrategy,
       languages,
       hasRouter,
       navigate,
@@ -341,7 +242,7 @@ export const useModernI18n = <
     // narrows to the concrete instance type via the TInstance type argument.
     i18nInstance: i18nInstance as TInstance,
     supportedLanguages: languages || [],
-    localisedUrls,
+    urlStrategy,
     isLanguageSupported,
     isResourcesReady,
   };

package/src/runtime/contextHelpers.ts

@@ -1,5 +1,5 @@
-import type { LocalisedUrlsOption } from '@modern-js/i18n-runtime-extensions';
 import { isBrowser } from '@modern-js/runtime';
+import type { I18nUrlStrategy } from '../shared/urlStrategy';
 import type { I18nInstance } from './i18n';
 import type { SdkBackend } from './i18n/backend/sdk-backend';
 import { cacheUserLanguage } from './i18n/detection';
@@ -66,7 +66,7 @@ interface ChangeModernI18nLanguageOptions {
   updateLanguage?: (newLang: string) => void;
   localePathRedirect?: boolean;
   ignoreRedirectRoutes?: string[] | ((pathname: string) => boolean);
-  localisedUrls?: LocalisedUrlsOption;
+  urlStrategy?: I18nUrlStrategy;
   languages?: string[];
   hasRouter: boolean;
   navigate?: Navigate | null;
@@ -82,7 +82,7 @@ export async function changeModernI18nLanguage(
     updateLanguage,
     localePathRedirect,
     ignoreRedirectRoutes,
-    localisedUrls,
+    urlStrategy,
     languages,
     hasRouter,
     navigate,
@@ -123,13 +123,14 @@ export async function changeModernI18nLanguage(
           relativePath,
           languages || [],
           ignoreRedirectRoutes,
+          urlStrategy,
         )
       ) {
         const newPath = buildLocalizedUrl(
           relativePath,
           newLang,
           languages || [],
-          localisedUrls,
+          urlStrategy,
         );
         const newUrl = entryPath + newPath + location.search + location.hash;
 
@@ -155,13 +156,14 @@ export async function changeModernI18nLanguage(
           relativePath,
           languages || [],
           ignoreRedirectRoutes,
+          urlStrategy,
         )
       ) {
         const newPath = buildLocalizedUrl(
           relativePath,
           newLang,
           languages || [],
-          localisedUrls,
+          urlStrategy,
         );
         const newUrl =
           entryPath + newPath + window.location.search + window.location.hash;