@bleedingdev/modern-js-i18n-runtime-extensions 3.9.0-ultramodern.11 → 3.9.0-ultramodern.12

package/dist/cjs/index.js

@@ -9,8 +9,8 @@ var __webpack_modules__ = {
     "./localeRedirectPolicy" (module) {
         module.exports = require("./localeRedirectPolicy.js");
     },
-    "./localisedUrls/index" (module) {
-        module.exports = require("./localisedUrls/index.js");
+    "@modern-js/runtime-extensions/localised-urls" (module) {
+        module.exports = require("@modern-js/runtime-extensions/localised-urls");
     }
 };
 var __webpack_module_cache__ = {};
@@ -60,21 +60,21 @@ function __webpack_require__(moduleId) {
 var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
-    var _language_sync_controller__rspack_import_0 = __webpack_require__("./language-sync/controller");
+    var _modern_js_runtime_extensions_localised_urls__rspack_import_0 = __webpack_require__("@modern-js/runtime-extensions/localised-urls");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _language_sync_controller__rspack_import_0)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_language_sync_controller__rspack_import_0[__rspack_import_key];
+    for(const __rspack_import_key in _modern_js_runtime_extensions_localised_urls__rspack_import_0)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_modern_js_runtime_extensions_localised_urls__rspack_import_0[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _language_sync_react__rspack_import_1 = __webpack_require__("./language-sync/react");
+    var _language_sync_controller__rspack_import_1 = __webpack_require__("./language-sync/controller");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _language_sync_react__rspack_import_1)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_language_sync_react__rspack_import_1[__rspack_import_key];
+    for(const __rspack_import_key in _language_sync_controller__rspack_import_1)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_language_sync_controller__rspack_import_1[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _localeRedirectPolicy__rspack_import_2 = __webpack_require__("./localeRedirectPolicy");
+    var _language_sync_react__rspack_import_2 = __webpack_require__("./language-sync/react");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _localeRedirectPolicy__rspack_import_2)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_localeRedirectPolicy__rspack_import_2[__rspack_import_key];
+    for(const __rspack_import_key in _language_sync_react__rspack_import_2)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_language_sync_react__rspack_import_2[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
-    var _localisedUrls_index__rspack_import_3 = __webpack_require__("./localisedUrls/index");
+    var _localeRedirectPolicy__rspack_import_3 = __webpack_require__("./localeRedirectPolicy");
     var __rspack_reexport = {};
-    for(const __rspack_import_key in _localisedUrls_index__rspack_import_3)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_localisedUrls_index__rspack_import_3[__rspack_import_key];
+    for(const __rspack_import_key in _localeRedirectPolicy__rspack_import_3)if ("default" !== __rspack_import_key) __rspack_reexport[__rspack_import_key] = ()=>_localeRedirectPolicy__rspack_import_3[__rspack_import_key];
     __webpack_require__.d(__webpack_exports__, __rspack_reexport);
 })();
 for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/localeRedirectPolicy.js

@@ -34,7 +34,7 @@ __webpack_require__.d(__webpack_exports__, {
     isStaticResourceRequest: ()=>isStaticResourceRequest,
     shouldIgnoreRedirect: ()=>shouldIgnoreRedirect
 });
-const index_js_namespaceObject = require("./localisedUrls/index.js");
+const localised_urls_namespaceObject = require("@modern-js/runtime-extensions/localised-urls");
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;
@@ -43,13 +43,13 @@ const stripUrlPathPrefix = (pathname, urlPath)=>{
 };
 const shouldIgnoreRedirect = (pathname, urlPath, ignoreRedirectRoutes)=>{
     const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    return (0, index_js_namespaceObject.shouldSkipLocaleRedirect)(remainingPath, [], ignoreRedirectRoutes);
+    return (0, localised_urls_namespaceObject.shouldSkipLocaleRedirect)(remainingPath, [], ignoreRedirectRoutes);
 };
 const isStaticResourceRequest = (pathname, staticRoutePrefixes, languages = [])=>{
-    if ((0, index_js_namespaceObject.isDefaultLocaleRedirectSkipPath)(pathname, languages)) return true;
-    const matchesStaticRoutePrefix = (targetPathname)=>staticRoutePrefixes.some((prefix)=>(0, index_js_namespaceObject.matchesPathPrefix)(targetPathname, prefix));
+    if ((0, localised_urls_namespaceObject.isDefaultLocaleRedirectSkipPath)(pathname, languages)) return true;
+    const matchesStaticRoutePrefix = (targetPathname)=>staticRoutePrefixes.some((prefix)=>(0, localised_urls_namespaceObject.matchesPathPrefix)(targetPathname, prefix));
     if (matchesStaticRoutePrefix(pathname)) return true;
-    const pathWithoutLanguage = (0, index_js_namespaceObject.stripLanguagePrefix)(pathname, languages);
+    const pathWithoutLanguage = (0, localised_urls_namespaceObject.stripLanguagePrefix)(pathname, languages);
     return pathWithoutLanguage !== pathname && matchesStaticRoutePrefix(pathWithoutLanguage);
 };
 const getLanguageFromPath = (req, urlPath, languages)=>{
@@ -66,7 +66,7 @@ const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
     const pathname = url.pathname;
     const basePath = urlPath.replace('/*', '');
     const remainingPath = stripUrlPathPrefix(pathname, urlPath);
-    const newPathname = (0, index_js_namespaceObject.localiseTargetPathname)(remainingPath, language, languages, localisedUrls);
+    const newPathname = (0, localised_urls_namespaceObject.localiseTargetPathname)(remainingPath, language, languages, localisedUrls);
     const suffix = `${url.search}${url.hash}`;
     const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
     return localizedUrl;

package/dist/cjs/paths.js

@@ -32,16 +32,16 @@ __webpack_require__.d(__webpack_exports__, {
     canonicalPath: ()=>canonicalPath,
     localizePath: ()=>localizePath
 });
+const localised_urls_namespaceObject = require("@modern-js/runtime-extensions/localised-urls");
 const url_namespaceObject = require("@modern-js/runtime-utils/url");
-const index_js_namespaceObject = require("./localisedUrls/index.js");
 const buildLocalizedUrl = (target, language, languages, localisedUrls)=>{
     const { pathname, search, hash } = (0, url_namespaceObject.splitUrlTarget)(target);
-    return `${(0, index_js_namespaceObject.localiseTargetPathname)(pathname, language, languages, localisedUrls)}${search}${hash}`;
+    return `${(0, localised_urls_namespaceObject.localiseTargetPathname)(pathname, language, languages, localisedUrls)}${search}${hash}`;
 };
 const localizePath = (target, language, config)=>buildLocalizedUrl(target, language, config.languages, config.localisedUrls);
 const canonicalPath = (target, config)=>{
     const { pathname, search, hash } = (0, url_namespaceObject.splitUrlTarget)(target);
-    return `${(0, index_js_namespaceObject.canonicalTargetPathname)(pathname, config.languages, config.localisedUrls)}${search}${hash}`;
+    return `${(0, localised_urls_namespaceObject.canonicalTargetPathname)(pathname, config.languages, config.localisedUrls)}${search}${hash}`;
 };
 exports.buildLocalizedUrl = __webpack_exports__.buildLocalizedUrl;
 exports.canonicalPath = __webpack_exports__.canonicalPath;

package/dist/cjs/router-navigation/adapter.js

@@ -35,189 +35,47 @@ const runtime_namespaceObject = require("@modern-js/runtime");
 const context_namespaceObject = require("@modern-js/runtime/context");
 const router_state_namespaceObject = require("@modern-js/runtime-extensions/router-state");
 const external_react_namespaceObject = require("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 (!(0, runtime_namespaceObject.isBrowser)()) return null;
-    return {
-        pathname: window.location.pathname,
-        search: window.location.search,
-        hash: window.location.hash
-    };
-};
-const getRouterFramework = (runtimeContext, internalContext, inReactRouter)=>{
-    const framework = (0, router_state_namespaceObject.getRouterRuntimeState)(internalContext)?.framework || (0, router_state_namespaceObject.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 = (0, router_state_namespaceObject.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 subscribeNone = ()=>()=>{};
+const getEmptySnapshot = ()=>null;
 const createI18nRouterNavigation = ({ I18nNavigationProvider, useNativeI18nRouterAdapter })=>{
+    const NavigationProvider = I18nNavigationProvider;
     const useIntegratedRouterAdapter = ()=>{
         const runtimeContext = (0, external_react_namespaceObject.useContext)(runtime_namespaceObject.RuntimeContext);
         const internalContext = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext);
-        const routerApi = internalContext.router || runtimeContext.router;
         const native = useNativeI18nRouterAdapter();
-        const inReactRouter = native.hasRouter;
-        const reactRouterNavigate = native.navigate;
-        const reactRouterLocation = inReactRouter ? native.location : null;
-        const reactRouterParams = native.params;
-        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 slotRouter = getRouterInstance(internalContext, contextRouter);
-        const drivableSlotRouter = ('tanstack' === framework || 'react-router' === framework) && 'function' == typeof slotRouter?.navigate;
-        const hasRouter = Boolean(reactRouterNavigate) || drivableSlotRouter;
-        const subscribeToRouter = (0, external_react_namespaceObject.useCallback)((update)=>{
-            const unsubscribers = [];
-            const unsubscribeFromSlot = (0, router_state_namespaceObject.subscribeRouterRuntimeState)(internalContext, update);
-            if ('function' == typeof unsubscribeFromSlot) unsubscribers.push(unsubscribeFromSlot);
-            const router = getRouterInstance(internalContext, contextRouter);
-            if (!router) return ()=>{
-                for (const unsubscribe of unsubscribers)unsubscribe();
-            };
-            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);
-                }
-            }
+        const getCapability = (0, external_react_namespaceObject.useCallback)(()=>(0, router_state_namespaceObject.getRouterRuntimeState)(internalContext)?.navigation ?? (0, router_state_namespaceObject.getRouterRuntimeState)(runtimeContext)?.navigation, [
+            internalContext,
+            runtimeContext
+        ]);
+        const subscribeCapability = (0, external_react_namespaceObject.useCallback)((update)=>{
+            const stopInternal = (0, router_state_namespaceObject.subscribeRouterRuntimeState)(internalContext, update);
+            const stopPublic = internalContext === runtimeContext ? void 0 : (0, router_state_namespaceObject.subscribeRouterRuntimeState)(runtimeContext, update);
             return ()=>{
-                for (const unsubscribe of unsubscribers)unsubscribe();
+                stopInternal();
+                stopPublic?.();
             };
         }, [
-            contextRouter,
-            framework,
-            inReactRouter,
-            internalContext
-        ]);
-        const getSnapshot = (0, external_react_namespaceObject.useCallback)(()=>getRouterSnapshot(internalContext, contextRouter), [
-            contextRouter,
-            internalContext
-        ]);
-        (0, external_react_namespaceObject.useSyncExternalStore)(subscribeToRouter, getSnapshot, getSnapshot);
-        const navigate = (0, external_react_namespaceObject.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;
-        return {
-            framework,
-            hasRouter,
-            location,
-            navigate: hasRouter ? navigate : null,
-            Link,
-            params,
-            ...'tanstack' === framework ? {
-                createLinkProps: createTanstackLinkProps
-            } : {}
-        };
-    };
-    const createTanstackLinkProps = (target)=>{
-        const preload = void 0 !== target.preload ? target.preload : 'none' === target.prefetch ? false : target.prefetch;
+        const capability = (0, external_react_namespaceObject.useSyncExternalStore)(subscribeCapability, getCapability, getCapability);
+        const snapshot = (0, external_react_namespaceObject.useSyncExternalStore)(capability?.subscribe ?? subscribeNone, capability?.getSnapshot ?? getEmptySnapshot, capability?.getSnapshot ?? getEmptySnapshot);
+        if (native.hasRouter || !capability || !snapshot) return native;
+        const internalState = (0, router_state_namespaceObject.getRouterRuntimeState)(internalContext);
         return {
-            to: target.pathname,
-            ...target.search ? {
-                search: target.search
-            } : {},
-            ...target.hash ? {
-                hash: target.hash
-            } : {},
-            ...void 0 === target.hashScrollIntoView ? {} : {
-                hashScrollIntoView: target.hashScrollIntoView
-            },
-            ...void 0 === preload ? {} : {
-                preload
-            }
+            framework: internalState?.navigation === capability ? internalState.framework : (0, router_state_namespaceObject.getRouterRuntimeState)(runtimeContext)?.framework,
+            hasRouter: true,
+            ...snapshot,
+            navigate: capability.navigate,
+            Link: capability.Link,
+            createLinkProps: capability.createLinkProps
         };
     };
     const I18nRouterNavigationProvider = ({ children })=>{
         const value = useIntegratedRouterAdapter();
         const native = useNativeI18nRouterAdapter();
-        if (!value.hasRouter || native.hasRouter) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(jsx_runtime_namespaceObject.Fragment, {
-            children: children
-        });
-        return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(I18nNavigationProvider, {
-            value: value,
+        return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(NavigationProvider, {
+            value: value.hasRouter && !native.hasRouter ? value : null,
             children: children
         });
     };

package/dist/esm/index.mjs

@@ -1,4 +1,4 @@
+export * from "@modern-js/runtime-extensions/localised-urls";
 export * from "./language-sync/controller.mjs";
 export * from "./language-sync/react.mjs";
 export * from "./localeRedirectPolicy.mjs";
-export * from "./localisedUrls/index.mjs";

package/dist/esm/localeRedirectPolicy.mjs

@@ -1,4 +1,4 @@
-import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "./localisedUrls/index.mjs";
+import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "@modern-js/runtime-extensions/localised-urls";
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;

package/dist/esm/paths.mjs

@@ -1,5 +1,5 @@
+import { canonicalTargetPathname, localiseTargetPathname } from "@modern-js/runtime-extensions/localised-urls";
 import { splitUrlTarget } from "@modern-js/runtime-utils/url";
-import { canonicalTargetPathname, localiseTargetPathname } from "./localisedUrls/index.mjs";
 const buildLocalizedUrl = (target, language, languages, localisedUrls)=>{
     const { pathname, search, hash } = splitUrlTarget(target);
     return `${localiseTargetPathname(pathname, language, languages, localisedUrls)}${search}${hash}`;

package/dist/esm/router-navigation/adapter.mjs

@@ -1,191 +1,49 @@
-import { Fragment, jsx } from "react/jsx-runtime";
-import { RuntimeContext, isBrowser } from "@modern-js/runtime";
+import { jsx } from "react/jsx-runtime";
+import { RuntimeContext } from "@modern-js/runtime";
 import { InternalRuntimeContext } from "@modern-js/runtime/context";
 import { getRouterRuntimeState, subscribeRouterRuntimeState } from "@modern-js/runtime-extensions/router-state";
 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 subscribeNone = ()=>()=>{};
+const getEmptySnapshot = ()=>null;
 const createI18nRouterNavigation = ({ I18nNavigationProvider, useNativeI18nRouterAdapter })=>{
+    const NavigationProvider = I18nNavigationProvider;
     const useIntegratedRouterAdapter = ()=>{
         const runtimeContext = useContext(RuntimeContext);
         const internalContext = useContext(InternalRuntimeContext);
-        const routerApi = internalContext.router || runtimeContext.router;
         const native = useNativeI18nRouterAdapter();
-        const inReactRouter = native.hasRouter;
-        const reactRouterNavigate = native.navigate;
-        const reactRouterLocation = inReactRouter ? native.location : null;
-        const reactRouterParams = native.params;
-        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 slotRouter = getRouterInstance(internalContext, contextRouter);
-        const drivableSlotRouter = ('tanstack' === framework || 'react-router' === framework) && 'function' == typeof slotRouter?.navigate;
-        const hasRouter = Boolean(reactRouterNavigate) || drivableSlotRouter;
-        const subscribeToRouter = useCallback((update)=>{
-            const unsubscribers = [];
-            const unsubscribeFromSlot = subscribeRouterRuntimeState(internalContext, update);
-            if ('function' == typeof unsubscribeFromSlot) unsubscribers.push(unsubscribeFromSlot);
-            const router = getRouterInstance(internalContext, contextRouter);
-            if (!router) return ()=>{
-                for (const unsubscribe of unsubscribers)unsubscribe();
-            };
-            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);
-                }
-            }
+        const getCapability = useCallback(()=>getRouterRuntimeState(internalContext)?.navigation ?? getRouterRuntimeState(runtimeContext)?.navigation, [
+            internalContext,
+            runtimeContext
+        ]);
+        const subscribeCapability = useCallback((update)=>{
+            const stopInternal = subscribeRouterRuntimeState(internalContext, update);
+            const stopPublic = internalContext === runtimeContext ? void 0 : subscribeRouterRuntimeState(runtimeContext, update);
             return ()=>{
-                for (const unsubscribe of unsubscribers)unsubscribe();
+                stopInternal();
+                stopPublic?.();
             };
         }, [
-            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;
-        return {
-            framework,
-            hasRouter,
-            location,
-            navigate: hasRouter ? navigate : null,
-            Link,
-            params,
-            ...'tanstack' === framework ? {
-                createLinkProps: createTanstackLinkProps
-            } : {}
-        };
-    };
-    const createTanstackLinkProps = (target)=>{
-        const preload = void 0 !== target.preload ? target.preload : 'none' === target.prefetch ? false : target.prefetch;
+        const capability = useSyncExternalStore(subscribeCapability, getCapability, getCapability);
+        const snapshot = useSyncExternalStore(capability?.subscribe ?? subscribeNone, capability?.getSnapshot ?? getEmptySnapshot, capability?.getSnapshot ?? getEmptySnapshot);
+        if (native.hasRouter || !capability || !snapshot) return native;
+        const internalState = getRouterRuntimeState(internalContext);
         return {
-            to: target.pathname,
-            ...target.search ? {
-                search: target.search
-            } : {},
-            ...target.hash ? {
-                hash: target.hash
-            } : {},
-            ...void 0 === target.hashScrollIntoView ? {} : {
-                hashScrollIntoView: target.hashScrollIntoView
-            },
-            ...void 0 === preload ? {} : {
-                preload
-            }
+            framework: internalState?.navigation === capability ? internalState.framework : getRouterRuntimeState(runtimeContext)?.framework,
+            hasRouter: true,
+            ...snapshot,
+            navigate: capability.navigate,
+            Link: capability.Link,
+            createLinkProps: capability.createLinkProps
         };
     };
     const I18nRouterNavigationProvider = ({ children })=>{
         const value = useIntegratedRouterAdapter();
         const native = useNativeI18nRouterAdapter();
-        if (!value.hasRouter || native.hasRouter) return /*#__PURE__*/ jsx(Fragment, {
-            children: children
-        });
-        return /*#__PURE__*/ jsx(I18nNavigationProvider, {
-            value: value,
+        return /*#__PURE__*/ jsx(NavigationProvider, {
+            value: value.hasRouter && !native.hasRouter ? value : null,
             children: children
         });
     };

package/dist/esm-node/index.mjs

@@ -1,5 +1,5 @@
 import "node:module";
+export * from "@modern-js/runtime-extensions/localised-urls";
 export * from "./language-sync/controller.mjs";
 export * from "./language-sync/react.mjs";
 export * from "./localeRedirectPolicy.mjs";
-export * from "./localisedUrls/index.mjs";

package/dist/esm-node/localeRedirectPolicy.mjs

@@ -1,5 +1,5 @@
 import "node:module";
-import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "./localisedUrls/index.mjs";
+import { isDefaultLocaleRedirectSkipPath, localiseTargetPathname, matchesPathPrefix, shouldSkipLocaleRedirect, stripLanguagePrefix } from "@modern-js/runtime-extensions/localised-urls";
 const stripUrlPathPrefix = (pathname, urlPath)=>{
     const basePath = urlPath.replace('/*', '');
     if (!basePath || '/' === basePath) return pathname;

package/dist/esm-node/paths.mjs

@@ -1,6 +1,6 @@
 import "node:module";
+import { canonicalTargetPathname, localiseTargetPathname } from "@modern-js/runtime-extensions/localised-urls";
 import { splitUrlTarget } from "@modern-js/runtime-utils/url";
-import { canonicalTargetPathname, localiseTargetPathname } from "./localisedUrls/index.mjs";
 const buildLocalizedUrl = (target, language, languages, localisedUrls)=>{
     const { pathname, search, hash } = splitUrlTarget(target);
     return `${localiseTargetPathname(pathname, language, languages, localisedUrls)}${search}${hash}`;