@bleedingdev/modern-js-plugin-i18n 3.9.0-ultramodern.2 → 3.9.0-ultramodern.20

package/dist/esm/runtime/hooks.mjs

@@ -18,7 +18,7 @@ function createMinimalI18nInstance(language) {
     };
     return minimalInstance;
 }
-function createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, localisedUrls, setLang, synchronizeLanguage) {
+function createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, setLang, urlStrategy) {
     const instance = i18nInstance || createMinimalI18nInstance(lang);
     return {
         language: lang,
@@ -27,9 +27,8 @@ function createContextValue(lang, i18nInstance, entryName, languages, localePath
         languages,
         localePathRedirect,
         ignoreRedirectRoutes,
-        localisedUrls,
-        updateLanguage: setLang,
-        synchronizeLanguage
+        urlStrategy,
+        updateLanguage: setLang
     };
 }
 function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
@@ -78,7 +77,7 @@ function useSdkResourcesLoader(i18nInstance, setForceUpdate) {
         setForceUpdate
     ]);
 }
-function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls) {
+function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy) {
     const urlRef = useRef('');
     const { navigate, location, hasRouter } = useI18nRouterAdapter();
     useEffect(()=>{
@@ -95,10 +94,10 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         const currentHash = hasRouter && location ? location.hash : window.location.hash;
         const entryPath = getEntryPath();
         const relativePath = currentPathname.replace(entryPath, '');
-        if (shouldIgnoreRedirect(relativePath, languages, ignoreRedirectRoutes)) return;
+        if (shouldIgnoreRedirect(relativePath, languages, ignoreRedirectRoutes, urlStrategy)) return;
         const pathDetection = detectLanguageFromPath(currentPathname, languages, localePathRedirect);
         const targetLanguage = pathDetection.language || i18nInstance.language || fallbackLanguage || languages[0] || 'en';
-        const newPath = buildLocalizedUrl(relativePath, targetLanguage, languages, localisedUrls);
+        const newPath = buildLocalizedUrl(relativePath, targetLanguage, languages, urlStrategy);
         const newUrl = entryPath + newPath + currentSearch + currentHash;
         urlRef.current = currentPathname;
         if (newUrl !== currentPathname + currentSearch + currentHash) if (hasRouter && navigate && location) navigate(newUrl, {
@@ -114,7 +113,7 @@ function useClientSideRedirect(i18nInstance, localePathRedirect, languages, fall
         languages,
         fallbackLanguage,
         ignoreRedirectRoutes,
-        localisedUrls
+        urlStrategy
     ]);
 }
 function useLanguageSync(i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang) {

package/dist/esm/runtime/localizedPaths.mjs

@@ -1,20 +1,22 @@
-import { canonicalTargetPathname } from "@modern-js/i18n-runtime-extensions";
 import { useMemo } from "react";
 import { useModernI18n } from "./context.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
 import { buildLocalizedUrl, splitUrlTarget } from "./utils.mjs";
-const localizePath = (pathname, language, config)=>buildLocalizedUrl(pathname, language, config.languages, config.localisedUrls);
+const localizePath = (pathname, language, config)=>buildLocalizedUrl(pathname, language, config.languages, config.urlStrategy);
 const canonicalPath = (target, config)=>{
     const { pathname, search, hash } = splitUrlTarget(target);
-    const resolvedPath = canonicalTargetPathname(pathname, config.languages, config.localisedUrls);
+    if (config.urlStrategy) return `${config.urlStrategy.canonicalPathname(pathname, config.languages)}${search}${hash}`;
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments[0] && config.languages.some((language)=>language.toLowerCase() === segments[0].toLowerCase())) segments.shift();
+    const resolvedPath = `/${segments.join('/')}`;
     return `${resolvedPath}${search}${hash}`;
 };
 const useLocalizedPaths = ()=>{
-    const { supportedLanguages, localisedUrls } = useModernI18n();
+    const { supportedLanguages, urlStrategy } = useModernI18n();
     return useMemo(()=>{
         const config = {
             languages: supportedLanguages,
-            localisedUrls
+            urlStrategy
         };
         return {
             localizePath: (pathname, language)=>localizePath(pathname, language, config),
@@ -22,11 +24,11 @@ const useLocalizedPaths = ()=>{
         };
     }, [
         supportedLanguages,
-        localisedUrls
+        urlStrategy
     ]);
 };
 const useLocalizedLocation = ()=>{
-    const { language, supportedLanguages, localisedUrls } = useModernI18n();
+    const { language, supportedLanguages, urlStrategy } = useModernI18n();
     const { location } = useI18nRouterAdapter();
     const pathname = location?.pathname ?? '/';
     const search = location?.search ?? '';
@@ -34,7 +36,7 @@ const useLocalizedLocation = ()=>{
     return useMemo(()=>{
         const config = {
             languages: supportedLanguages,
-            localisedUrls
+            urlStrategy
         };
         const alternates = {};
         for (const supportedLanguage of supportedLanguages)alternates[supportedLanguage] = `${localizePath(pathname, supportedLanguage, config)}${search}${hash}`;
@@ -46,7 +48,7 @@ const useLocalizedLocation = ()=>{
     }, [
         language,
         supportedLanguages,
-        localisedUrls,
+        urlStrategy,
         pathname,
         search,
         hash

package/dist/esm/runtime/navigation.mjs

@@ -0,0 +1,7 @@
+import { createI18nRouterNavigation } from "@modern-js/i18n-runtime-extensions/router-navigation";
+import { I18nNavigationProvider, useNativeI18nRouterAdapter } from "./routerAdapter.mjs";
+const { I18nRouterNavigationProvider: I18nRouterNavigationProvider, useIntegratedRouterAdapter: useIntegratedRouterAdapter } = createI18nRouterNavigation({
+    I18nNavigationProvider: I18nNavigationProvider,
+    useNativeI18nRouterAdapter: useNativeI18nRouterAdapter
+});
+export { I18nRouterNavigationProvider, useIntegratedRouterAdapter };

package/dist/esm/runtime/providerComposition.mjs

@@ -1,14 +1,19 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { useLanguageSync } from "@modern-js/i18n-runtime-extensions";
 import { RuntimeContext } from "@modern-js/runtime";
 import { Helmet } from "@modern-js/runtime/head";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { ModernI18nProvider } from "./context.mjs";
-import { createContextValue, useClientSideRedirect, useSdkResourcesLoader } from "./hooks.mjs";
+import { createContextValue, useClientSideRedirect, useLanguageSync, useSdkResourcesLoader } from "./hooks.mjs";
 import { getI18nextInstanceForProvider } from "./i18n/instance.mjs";
 import { useI18nRouterAdapter } from "./routerAdapter.mjs";
-const createI18nRootWrapper = (options)=>(App)=>(props)=>{
-            const { entryName, htmlLangAttr, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls, getLatestI18nInstance, getI18nextProvider } = options;
+const NativeLanguageSynchronization = ({ i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang, children })=>{
+    const synchronizeLanguage = useLanguageSync(i18nInstance, localePathRedirect, languages, pathname, prevLangRef, setLang);
+    return children(synchronizeLanguage);
+};
+const createI18nRootWrapper = (options)=>(App)=>{
+        const LanguageSynchronization = options.LanguageSynchronization ?? NativeLanguageSynchronization;
+        const I18nRoot = (props)=>{
+            const { entryName, htmlLangAttr, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy, getLatestI18nInstance, getI18nextProvider } = options;
             const runtimeContext = useContext(RuntimeContext);
             const i18nInstance = runtimeContext.i18nInstance || getLatestI18nInstance();
             const initialLang = useMemo(()=>i18nInstance?.language || fallbackLanguage, [
@@ -33,18 +38,16 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                 lang
             ]);
             useSdkResourcesLoader(i18nInstance, setForceUpdate);
-            const synchronizeLanguage = useLanguageSync(i18nInstance, localePathRedirect, languages, location?.pathname, prevLangRef, setLang);
-            useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, localisedUrls);
-            const contextValue = useMemo(()=>createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, localisedUrls, setLang, synchronizeLanguage), [
+            useClientSideRedirect(i18nInstance, localePathRedirect, languages, fallbackLanguage, ignoreRedirectRoutes, urlStrategy);
+            const contextValue = useMemo(()=>createContextValue(lang, i18nInstance, entryName, languages, localePathRedirect, ignoreRedirectRoutes, setLang, urlStrategy), [
                 lang,
                 i18nInstance,
                 entryName,
                 languages,
                 localePathRedirect,
                 ignoreRedirectRoutes,
-                localisedUrls,
-                forceUpdate,
-                synchronizeLanguage
+                urlStrategy,
+                forceUpdate
             ]);
             const I18nextProvider = getI18nextProvider();
             const i18nextInstanceForProvider = useMemo(()=>i18nInstance ? getI18nextInstanceForProvider(i18nInstance, lang) : void 0, [
@@ -67,12 +70,33 @@ const createI18nRootWrapper = (options)=>(App)=>(props)=>{
                             lang
                         }
                     }),
-                    /*#__PURE__*/ jsx(ModernI18nProvider, {
-                        i18nextProvider: I18nextProvider,
-                        value: contextValue,
-                        children: appContent
+                    /*#__PURE__*/ jsx(LanguageSynchronization, {
+                        i18nInstance: i18nInstance,
+                        localePathRedirect: localePathRedirect,
+                        languages: languages,
+                        pathname: location?.pathname,
+                        prevLangRef: prevLangRef,
+                        setLang: setLang,
+                        children: (synchronizeLanguage)=>/*#__PURE__*/ jsx(ModernI18nProvider, {
+                                i18nextProvider: I18nextProvider,
+                                value: {
+                                    ...contextValue,
+                                    synchronizeLanguage
+                                },
+                                children: appContent
+                            })
                     })
                 ]
             });
         };
+        const { NavigationProvider } = options;
+        if (!NavigationProvider) return I18nRoot;
+        return function(props) {
+            return /*#__PURE__*/ jsx(NavigationProvider, {
+                children: /*#__PURE__*/ jsx(I18nRoot, {
+                    ...props
+                })
+            });
+        };
+    };
 export { createI18nRootWrapper };

package/dist/esm/runtime/routerAdapter.mjs

@@ -1,150 +1,37 @@
+import { jsx } from "react/jsx-runtime";
+import { I18nNavigationContext } from "@modern-js/plugin-i18n/runtime/contexts";
 import { RuntimeContext, isBrowser } from "@modern-js/runtime";
-import { InternalRuntimeContext, getRouterRuntimeState } from "@modern-js/runtime/context";
-import { useCallback, useContext, useSyncExternalStore } from "react";
-const normalizeUrlPart = (value, prefix)=>{
-    if ('string' != typeof value || !value) return '';
-    return value.startsWith(prefix) ? value : `${prefix}${value}`;
-};
-const normalizeLocation = (location)=>{
-    if (!location || 'object' != typeof location) return null;
-    const locationValue = location;
-    if ('string' != typeof locationValue.pathname) return null;
-    return {
-        pathname: locationValue.pathname,
-        search: normalizeUrlPart('string' == typeof locationValue.search ? locationValue.search : locationValue.searchStr, '?'),
-        hash: normalizeUrlPart(locationValue.hash, '#')
-    };
-};
-const getWindowLocation = ()=>{
-    if (!isBrowser()) return null;
-    return {
-        pathname: window.location.pathname,
-        search: window.location.search,
-        hash: window.location.hash
-    };
-};
-const getRouterFramework = (runtimeContext, internalContext, inReactRouter)=>{
-    const framework = getRouterRuntimeState(internalContext)?.framework || getRouterRuntimeState(runtimeContext)?.framework;
-    if (framework) return framework;
-    if (internalContext.router?.useRouter || runtimeContext.router?.useRouter) return 'tanstack';
-    if (internalContext.router?.useLocation || internalContext.router?.useHref || runtimeContext.router?.useLocation || runtimeContext.router?.useHref) return 'react-router';
-    if (inReactRouter) return 'react-router';
-};
-const getRouterInstance = (internalContext, contextRouter)=>{
-    if (contextRouter) return contextRouter;
-    const router = getRouterRuntimeState(internalContext)?.instance;
-    if (!router || 'object' != typeof router) return null;
-    return router;
-};
-const getRouterStateLocation = (internalContext, contextRouter)=>{
-    const router = getRouterInstance(internalContext, contextRouter);
-    return normalizeLocation(router?.stores?.location?.get?.()) || normalizeLocation(router?.state?.location);
-};
-const getRouterParams = (internalContext, contextRouter)=>{
-    const router = getRouterInstance(internalContext, contextRouter);
-    const matches = router?.stores?.matches?.get?.() || router?.state?.matches;
-    if (!Array.isArray(matches)) return {};
-    return matches.reduce((params, match)=>{
-        if (match?.params) Object.assign(params, match.params);
-        return params;
-    }, {});
-};
-const getRouterSnapshot = (internalContext, contextRouter)=>{
-    const location = getRouterStateLocation(internalContext, contextRouter);
-    const params = getRouterParams(internalContext, contextRouter);
-    return JSON.stringify([
-        location?.pathname ?? '',
-        location?.search ?? '',
-        location?.hash ?? '',
-        Object.entries(params).sort(([left], [right])=>left.localeCompare(right))
-    ]);
-};
-const useI18nRouterAdapter = ()=>{
+import { InternalRuntimeContext } from "@modern-js/runtime/context";
+import { useContext } from "react";
+const I18nNavigationProvider = ({ children, value })=>/*#__PURE__*/ jsx(I18nNavigationContext.Provider, {
+        value: value,
+        children: children
+    });
+const useNativeI18nRouterAdapter = ()=>{
     const runtimeContext = useContext(RuntimeContext);
     const internalContext = useContext(InternalRuntimeContext);
     const routerApi = internalContext.router || runtimeContext.router;
-    const inReactRouter = routerApi?.useInRouterContext?.() ?? false;
-    const reactRouterNavigate = inReactRouter ? routerApi?.useNavigate?.() ?? null : null;
-    const reactRouterLocation = inReactRouter ? routerApi?.useLocation?.() ?? null : null;
-    const reactRouterParams = inReactRouter ? routerApi?.useParams?.() ?? {} : {};
-    const framework = getRouterFramework(runtimeContext, internalContext, inReactRouter);
-    const contextUseRouter = inReactRouter || 'tanstack' !== framework ? void 0 : internalContext.router?.useRouter || runtimeContext.router?.useRouter;
-    const contextRouter = contextUseRouter ? contextUseRouter({
-        warn: false
-    }) : null;
-    const hasRouter = 'tanstack' === framework || 'react-router' === framework || Boolean(reactRouterNavigate);
-    const subscribeToRouter = useCallback((update)=>{
-        const router = getRouterInstance(internalContext, contextRouter);
-        if (!router) return ()=>void 0;
-        const unsubscribers = [];
-        if ('react-router' === framework && !inReactRouter && 'function' == typeof router.subscribe) {
-            const subscribe = router.subscribe;
-            const unsubscribe = subscribe.call(router, update);
-            if ('function' == typeof unsubscribe) unsubscribers.push(unsubscribe);
-        }
-        if ('tanstack' === framework && 'function' == typeof router.stores?.location?.subscribe) {
-            const unsubscribe = router.stores.location.subscribe(update);
-            if ('function' == typeof unsubscribe) unsubscribers.push(unsubscribe);
-        }
-        if ('tanstack' === framework && 'function' == typeof router.subscribe) {
-            const subscribe = router.subscribe;
-            for (const eventType of [
-                'onBeforeNavigate',
-                'onBeforeLoad'
-            ]){
-                const unsubscribe = subscribe.call(router, eventType, update);
-                if ('function' == typeof unsubscribe) unsubscribers.push(unsubscribe);
-            }
-        }
-        return ()=>{
-            for (const unsubscribe of unsubscribers)unsubscribe();
-        };
-    }, [
-        contextRouter,
-        framework,
-        inReactRouter,
-        internalContext
-    ]);
-    const getSnapshot = useCallback(()=>getRouterSnapshot(internalContext, contextRouter), [
-        contextRouter,
-        internalContext
-    ]);
-    useSyncExternalStore(subscribeToRouter, getSnapshot, getSnapshot);
-    const navigate = useCallback((href, options)=>{
-        const router = getRouterInstance(internalContext, contextRouter);
-        const activeFramework = getRouterFramework(runtimeContext, internalContext, inReactRouter);
-        if ('tanstack' === activeFramework) {
-            if ('function' == typeof router?.navigate) return router.navigate({
-                to: href,
-                replace: options?.replace,
-                ...options?.state === void 0 ? {} : {
-                    state: options.state
-                }
-            });
-            throw new Error('TanStack router instance is not available.');
-        }
-        if (reactRouterNavigate) return reactRouterNavigate(href, options);
-        if ('react-router' === activeFramework) {
-            if ('function' == typeof router?.navigate) return router.navigate(href, options);
-            throw new Error('React Router instance is not available.');
-        }
-    }, [
-        contextRouter,
-        internalContext,
-        inReactRouter,
-        reactRouterNavigate,
-        runtimeContext
-    ]);
-    const location = (reactRouterLocation ? normalizeLocation(reactRouterLocation) : getRouterStateLocation(internalContext, contextRouter)) || getWindowLocation();
-    const params = inReactRouter ? reactRouterParams : getRouterParams(internalContext, contextRouter);
-    const Link = 'tanstack' === framework ? internalContext.router?.Link || runtimeContext.router?.Link || null : 'react-router' === framework || inReactRouter ? routerApi?.Link ?? null : null;
+    const hasRouter = routerApi?.useInRouterContext?.() ?? false;
+    const navigate = hasRouter ? routerApi?.useNavigate?.() ?? null : null;
+    const routerLocation = hasRouter ? routerApi?.useLocation?.() ?? null : null;
+    const params = hasRouter ? routerApi?.useParams?.() ?? {} : {};
+    const location = routerLocation ?? (isBrowser() ? {
+        pathname: window.location.pathname,
+        search: window.location.search,
+        hash: window.location.hash
+    } : null);
     return {
-        framework,
+        framework: hasRouter ? 'react-router' : void 0,
         hasRouter,
+        navigate,
         location,
-        navigate: hasRouter ? navigate : null,
-        Link,
-        params
+        params,
+        Link: hasRouter ? routerApi?.Link ?? null : null
     };
 };
-export { useI18nRouterAdapter };
+const useI18nRouterAdapter = ()=>{
+    const provided = useContext(I18nNavigationContext);
+    const native = useNativeI18nRouterAdapter();
+    return provided ?? native;
+};
+export { I18nNavigationProvider, useI18nRouterAdapter, useNativeI18nRouterAdapter };

package/dist/esm/runtime/sharedContexts.mjs

@@ -0,0 +1 @@
+export { ModernI18nContext, ReactI18nextProviderContext } from "@modern-js/plugin-i18n/runtime/contexts";

package/dist/esm/runtime/utils.mjs

@@ -1,6 +1,8 @@
-import { localiseTargetPathname, shouldSkipLocaleRedirect } from "@modern-js/i18n-runtime-extensions";
 import { isBrowser } from "@modern-js/runtime";
 import { getGlobalBasename } from "@modern-js/runtime/context";
+import { splitUrlTarget } from "@modern-js/runtime-utils/url";
+import { isDefaultLocaleRedirectSkipPath } from "../shared/mappedUrlStrategy.mjs";
+import { asI18nUrlStrategy } from "../shared/urlStrategy.mjs";
 const getPathname = (context)=>{
     if (isBrowser()) return window.location.pathname;
     return context.ssrContext?.request?.pathname || '/';
@@ -16,22 +18,14 @@ const getLanguageFromPath = (pathname, languages, fallbackLanguage)=>{
     if (languages.includes(firstSegment)) return firstSegment;
     return fallbackLanguage;
 };
-const splitUrlTarget = (target)=>{
-    const hashIndex = target.indexOf('#');
-    const hash = hashIndex >= 0 ? target.slice(hashIndex) : '';
-    const beforeHash = hashIndex >= 0 ? target.slice(0, hashIndex) : target;
-    const searchIndex = beforeHash.indexOf('?');
-    const search = searchIndex >= 0 ? beforeHash.slice(searchIndex) : '';
-    const pathname = searchIndex >= 0 ? beforeHash.slice(0, searchIndex) : beforeHash;
-    return {
-        pathname,
-        search,
-        hash
-    };
-};
-const buildLocalizedUrl = (target, language, languages, localisedUrls)=>{
+const buildLocalizedUrl = (target, language, languages, urlStrategy)=>{
     const { pathname, search, hash } = splitUrlTarget(target);
-    const localizedPathname = localiseTargetPathname(pathname, language, languages, localisedUrls);
+    const strategy = asI18nUrlStrategy(urlStrategy);
+    if (strategy) return `${strategy.localizePathname(pathname, language, languages)}${search}${hash}`;
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments[0] && languages.some((item)=>item.toLowerCase() === segments[0].toLowerCase())) segments[0] = language;
+    else segments.unshift(language);
+    const localizedPathname = `/${segments.join('/')}`;
     return `${localizedPathname}${search}${hash}`;
 };
 const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
@@ -51,5 +45,13 @@ const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
         detected: false
     };
 };
-const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>shouldSkipLocaleRedirect(pathname, languages, ignoreRedirectRoutes);
+const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes, urlStrategy)=>{
+    if (isDefaultLocaleRedirectSkipPath(pathname, languages)) return true;
+    if (asI18nUrlStrategy(urlStrategy)?.shouldSkipRedirect?.(pathname, languages)) return true;
+    if (!ignoreRedirectRoutes) return false;
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments[0] && languages.some((item)=>item.toLowerCase() === segments[0].toLowerCase())) segments.shift();
+    const normalizedPath = `/${segments.join('/')}`;
+    return 'function' == typeof ignoreRedirectRoutes ? ignoreRedirectRoutes(normalizedPath) : ignoreRedirectRoutes.some((pattern)=>normalizedPath === pattern || normalizedPath.startsWith(`${pattern}/`));
+};
 export { buildLocalizedUrl, detectLanguageFromPath, getEntryPath, getLanguageFromPath, getPathname, shouldIgnoreRedirect, splitUrlTarget };

package/dist/esm/server/defaultUrlStrategy.mjs

@@ -0,0 +1,7 @@
+import { createMappedUrlStrategy } from "./mappedUrlStrategy.mjs";
+const createDefaultUrlStrategy = (localisedUrls)=>createMappedUrlStrategy(localisedUrls);
+const resolveDefaultUrlStrategy = (localisedUrls)=>{
+    if (!localisedUrls || 'object' != typeof localisedUrls || 0 === Object.keys(localisedUrls).length) return;
+    return createDefaultUrlStrategy(localisedUrls);
+};
+export { createDefaultUrlStrategy, resolveDefaultUrlStrategy };

package/dist/esm/server/index.mjs

@@ -1,6 +1,7 @@
-import { resolveLocalisedUrlsConfig } from "@modern-js/i18n-runtime-extensions";
+import { asI18nUrlStrategy } from "../shared/urlStrategy.mjs";
 import { getLocaleDetectionOptions } from "../shared/utils.mjs";
 import { collectApiPrefixes, matchesApiPrefix } from "./apiPrefix.mjs";
+import { resolveDefaultUrlStrategy } from "./defaultUrlStrategy.mjs";
 import { convertToHonoLanguageDetectorOptions } from "./detectorOptions.mjs";
 import { buildLocalizedUrl, createLocaleRedirectResponse, getLanguageFromPath, isStaticResourceRequest, shouldIgnoreRedirect } from "./redirectPolicy.mjs";
 import * as __rspack_external__modern_js_server_core_hono_0af3baa7 from "@modern-js/server-core/hono";
@@ -24,7 +25,10 @@ const i18nServerPlugin = (options)=>({
                     const { entryName } = route;
                     if (!entryName) return;
                     if (!options.localeDetection) return;
-                    const { localePathRedirect, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes, localisedUrls } = getLocaleDetectionOptions(entryName, options.localeDetection);
+                    const entryLocaleDetection = getLocaleDetectionOptions(entryName, options.localeDetection);
+                    const { localePathRedirect, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes } = entryLocaleDetection;
+                    const legacyLocalisedUrls = Reflect.get(entryLocaleDetection, 'localisedUrls');
+                    const urlStrategy = asI18nUrlStrategy(options.resolveUrlStrategy?.(entryName)) ?? resolveDefaultUrlStrategy(legacyLocalisedUrls);
                     const staticRoutePrefixes = options.staticRoutePrefixes;
                     const originUrlPath = route.urlPath;
                     const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
@@ -39,6 +43,7 @@ const i18nServerPlugin = (options)=>({
                                     const url = new URL(c.req.url);
                                     const pathname = url.pathname;
                                     if (matchesApiPrefix(pathname, apiPrefixes)) return await next();
+                                    if (shouldIgnoreRedirect(pathname, urlPath, ignoreRedirectRoutes, urlStrategy, languages)) return await next();
                                     if (isStaticResourceRequest(pathname, staticRoutePrefixes, languages)) return await next();
                                     if ('/' === originUrlPath) {
                                         const pathSegments = pathname.split('/').filter(Boolean);
@@ -59,7 +64,7 @@ const i18nServerPlugin = (options)=>({
                                 const pathname = url.pathname;
                                 if (matchesApiPrefix(pathname, apiPrefixes)) return await next();
                                 if (isStaticResourceRequest(pathname, staticRoutePrefixes, languages)) return await next();
-                                if (shouldIgnoreRedirect(pathname, urlPath, ignoreRedirectRoutes)) return await next();
+                                if (shouldIgnoreRedirect(pathname, urlPath, ignoreRedirectRoutes, urlStrategy, languages)) return await next();
                                 if ('/' === originUrlPath) {
                                     const pathSegments = pathname.split('/').filter(Boolean);
                                     if (pathSegments.length > 0) {
@@ -72,12 +77,11 @@ const i18nServerPlugin = (options)=>({
                                     let detectedLanguage = null;
                                     if (i18nextDetector) detectedLanguage = c.get('language') || null;
                                     const targetLanguage = detectedLanguage || fallbackLanguage;
-                                    const localizedUrl = buildLocalizedUrl(c.req, originUrlPath, targetLanguage, languages, localisedUrls);
+                                    const localizedUrl = buildLocalizedUrl(c.req, originUrlPath, targetLanguage, languages, urlStrategy);
                                     return createLocaleRedirectResponse(localizedUrl);
                                 }
-                                const localisedUrlsConfig = resolveLocalisedUrlsConfig(localisedUrls);
-                                if (localisedUrlsConfig.enabled) {
-                                    const expectedUrl = buildLocalizedUrl(c.req, originUrlPath, language, languages, localisedUrls);
+                                if (urlStrategy) {
+                                    const expectedUrl = buildLocalizedUrl(c.req, originUrlPath, language, languages, urlStrategy);
                                     if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return createLocaleRedirectResponse(expectedUrl);
                                 }
                                 await next();

package/dist/esm/server/mappedUrlStrategy.mjs

@@ -0,0 +1 @@
+export { createMappedUrlStrategy, resolveMappedUrlStrategy } from "../shared/mappedUrlStrategy.mjs";

package/dist/esm/server/redirectPolicy.mjs

@@ -1,39 +1,48 @@
-import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "@modern-js/i18n-runtime-extensions";
+import { isDefaultLocaleRedirectSkipPath } from "../shared/mappedUrlStrategy.mjs";
+import { asI18nUrlStrategy } from "../shared/urlStrategy.mjs";
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;
-    const remainingPath = pathname.startsWith(basePath) ? pathname.slice(basePath.length) : pathname;
-    return remainingPath || '/';
+    return pathname === basePath || pathname.startsWith(`${basePath}/`) ? pathname.slice(basePath.length) || '/' : pathname;
 };
-const shouldIgnoreRedirect = (pathname, urlPath, ignoreRedirectRoutes)=>{
+const shouldIgnoreRedirect = (pathname, urlPath, ignoreRedirectRoutes, urlStrategy, languages = [])=>{
     const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    return shouldSkipLocaleRedirect(remainingPath, [], ignoreRedirectRoutes);
+    if (isDefaultLocaleRedirectSkipPath(remainingPath, languages)) return true;
+    if (asI18nUrlStrategy(urlStrategy)?.shouldSkipRedirect?.(remainingPath, languages)) return true;
+    if (!ignoreRedirectRoutes) return false;
+    const segments = remainingPath.split('/').filter(Boolean);
+    if (segments[0] && languages.some((language)=>language.toLowerCase() === segments[0].toLowerCase())) segments.shift();
+    const normalizedPath = `/${segments.join('/')}`;
+    return 'function' == typeof ignoreRedirectRoutes ? ignoreRedirectRoutes(normalizedPath) : ignoreRedirectRoutes.some((pattern)=>normalizedPath === pattern || normalizedPath.startsWith(`${pattern}/`));
 };
 const isStaticResourceRequest = (pathname, staticRoutePrefixes, languages = [])=>{
-    if (isDefaultLocaleRedirectSkipPath(pathname, languages)) return true;
-    const matchesStaticRoutePrefix = (targetPathname)=>staticRoutePrefixes.some((prefix)=>matchesPathPrefix(targetPathname, prefix));
-    if (matchesStaticRoutePrefix(pathname)) return true;
-    const pathWithoutLanguage = stripLanguagePrefix(pathname, languages);
-    return pathWithoutLanguage !== pathname && matchesStaticRoutePrefix(pathWithoutLanguage);
+    const prefixes = [
+        ...staticRoutePrefixes,
+        '/static',
+        '/upload'
+    ];
+    const matches = (target)=>prefixes.some((prefix)=>target === prefix || target.startsWith(`${prefix}/`));
+    if (matches(pathname)) return true;
+    const segments = pathname.split('/').filter(Boolean);
+    if (segments[0] && languages.some((language)=>language.toLowerCase() === segments[0].toLowerCase())) return matches(`/${segments.slice(1).join('/')}`);
+    return false;
 };
 const getLanguageFromPath = (req, urlPath, languages)=>{
-    const url = new URL(req.url, `http://${req.header().host}`);
-    const pathname = url.pathname;
-    const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    const segments = remainingPath.split('/').filter(Boolean);
-    const firstSegment = segments[0];
-    if (languages.includes(firstSegment)) return firstSegment;
-    return null;
+    const host = req.header?.().host;
+    const url = new URL(req.url, host ? `http://${host}` : void 0);
+    const firstSegment = stripUrlPathPrefix(url.pathname, urlPath).split('/').filter(Boolean)[0];
+    return languages.find((language)=>language.toLowerCase() === firstSegment?.toLowerCase()) ?? null;
 };
-const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
+const buildLocalizedUrl = (req, urlPath, language, languages, urlStrategy)=>{
     const url = new URL(req.url);
-    const pathname = url.pathname;
     const basePath = urlPath.replace('/*', '');
-    const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    const newPathname = localiseTargetPathname(remainingPath, language, languages, localisedUrls);
-    const suffix = `${url.search}${url.hash}`;
-    const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
-    return localizedUrl;
+    const remainingPath = stripUrlPathPrefix(url.pathname, urlPath);
+    const segments = remainingPath.split('/').filter(Boolean);
+    if (segments[0] && languages.some((item)=>item.toLowerCase() === segments[0].toLowerCase())) segments[0] = language;
+    else segments.unshift(language);
+    const strategy = asI18nUrlStrategy(urlStrategy);
+    const pathname = strategy ? strategy.localizePathname(remainingPath, language, languages) : `/${segments.join('/')}`;
+    return `${'/' === basePath ? '' : basePath}${pathname}${url.search}${url.hash}`;
 };
 const createLocaleRedirectResponse = (location)=>new Response(null, {
         status: 302,

package/dist/esm/shared/mappedUrlStrategy.mjs

@@ -0,0 +1,19 @@
+import { canonicalTargetPathname, isDefaultLocaleRedirectSkipPath, localiseTargetPathname } from "@modern-js/i18n-runtime-extensions";
+const createMappedUrlStrategy = (localisedUrls)=>({
+        localizePathname: (pathname, language, languages)=>localiseTargetPathname(pathname, language, [
+                ...languages
+            ], localisedUrls),
+        canonicalPathname: (pathname, languages)=>canonicalTargetPathname(pathname, [
+                ...languages
+            ], localisedUrls),
+        shouldSkipRedirect: (pathname, languages)=>isDefaultLocaleRedirectSkipPath(pathname, [
+                ...languages
+            ])
+    });
+const resolveMappedUrlStrategy = (localeDetection)=>{
+    if (!localeDetection || 'object' != typeof localeDetection) return;
+    const localisedUrls = Reflect.get(localeDetection, 'localisedUrls');
+    if (!localisedUrls || 'object' != typeof localisedUrls || 0 === Object.keys(localisedUrls).length) return;
+    return createMappedUrlStrategy(localisedUrls);
+};
+export { createMappedUrlStrategy, isDefaultLocaleRedirectSkipPath, resolveMappedUrlStrategy };

package/dist/esm/shared/urlStrategy.mjs

@@ -0,0 +1,7 @@
+const asI18nUrlStrategy = (candidate)=>{
+    if (!candidate || 'object' != typeof candidate) return;
+    const strategy = candidate;
+    return 'function' == typeof strategy.localizePathname && 'function' == typeof strategy.canonicalPathname ? strategy : void 0;
+};
+const isUnusableI18nUrlStrategy = (candidate)=>Boolean(candidate) && 'object' == typeof candidate && void 0 === asI18nUrlStrategy(candidate);
+export { asI18nUrlStrategy, isUnusableI18nUrlStrategy };