@bleedingdev/modern-js-plugin-i18n 3.2.0-ultramodern.12 → 3.2.0-ultramodern.121

package/dist/cjs/runtime/utils.js

@@ -1,25 +1,15 @@
 "use strict";
-var __webpack_modules__ = {
-    "@modern-js/runtime/router" (module) {
-        module.exports = require("@modern-js/runtime/router");
-    }
-};
-var __webpack_module_cache__ = {};
-function __webpack_require__(moduleId) {
-    var cachedModule = __webpack_module_cache__[moduleId];
-    if (void 0 !== cachedModule) return cachedModule.exports;
-    var module = __webpack_module_cache__[moduleId] = {
-        exports: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
+var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -36,92 +26,85 @@ function __webpack_require__(moduleId) {
     };
 })();
 var __webpack_exports__ = {};
-(()=>{
-    __webpack_require__.r(__webpack_exports__);
-    __webpack_require__.d(__webpack_exports__, {
-        buildLocalizedUrl: ()=>buildLocalizedUrl,
-        detectLanguageFromPath: ()=>detectLanguageFromPath,
-        getEntryPath: ()=>getEntryPath,
-        getLanguageFromPath: ()=>getLanguageFromPath,
-        getPathname: ()=>getPathname,
-        shouldIgnoreRedirect: ()=>shouldIgnoreRedirect,
-        useRouterHooks: ()=>useRouterHooks
-    });
-    const runtime_namespaceObject = require("@modern-js/runtime");
-    const context_namespaceObject = require("@modern-js/runtime/context");
-    const getPathname = (context)=>{
-        if ((0, runtime_namespaceObject.isBrowser)()) return window.location.pathname;
-        return context.ssrContext?.request?.pathname || '/';
-    };
-    const getEntryPath = ()=>{
-        const basename = (0, context_namespaceObject.getGlobalBasename)();
-        if (basename) return '/' === basename ? '' : basename;
-        return '';
-    };
-    const getLanguageFromPath = (pathname, languages, fallbackLanguage)=>{
-        const segments = pathname.split('/').filter(Boolean);
-        const firstSegment = segments[0];
-        if (languages.includes(firstSegment)) return firstSegment;
-        return fallbackLanguage;
-    };
-    const buildLocalizedUrl = (pathname, language, languages)=>{
-        const segments = pathname.split('/').filter(Boolean);
-        if (segments.length > 0 && languages.includes(segments[0])) segments[0] = language;
-        else segments.unshift(language);
-        return `/${segments.join('/')}`;
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    buildLocalizedUrl: ()=>buildLocalizedUrl,
+    detectLanguageFromPath: ()=>detectLanguageFromPath,
+    getEntryPath: ()=>getEntryPath,
+    getLanguageFromPath: ()=>getLanguageFromPath,
+    getPathname: ()=>getPathname,
+    shouldIgnoreRedirect: ()=>shouldIgnoreRedirect,
+    splitUrlTarget: ()=>splitUrlTarget
+});
+const runtime_namespaceObject = require("@modern-js/runtime");
+const context_namespaceObject = require("@modern-js/runtime/context");
+const localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
+const getPathname = (context)=>{
+    if ((0, runtime_namespaceObject.isBrowser)()) return window.location.pathname;
+    return context.ssrContext?.request?.pathname || '/';
+};
+const getEntryPath = ()=>{
+    const basename = (0, context_namespaceObject.getGlobalBasename)();
+    if (basename) return '/' === basename ? '' : basename;
+    return '';
+};
+const getLanguageFromPath = (pathname, languages, fallbackLanguage)=>{
+    const segments = pathname.split('/').filter(Boolean);
+    const firstSegment = segments[0];
+    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 detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
-        if (!localePathRedirect) return {
-            detected: false
-        };
-        const entryPath = getEntryPath();
-        const relativePath = pathname.replace(entryPath, '');
-        const segments = relativePath.split('/').filter(Boolean);
-        const segmentsToCheck = !entryPath && segments.length > 1 && segments[0] && !languages.includes(segments[0]) ? segments.slice(1) : segments;
-        const firstSegment = segmentsToCheck[0];
-        if (firstSegment && languages.includes(firstSegment)) return {
-            detected: true,
-            language: firstSegment
-        };
-        return {
-            detected: false
-        };
+};
+const buildLocalizedUrl = (target, language, languages, localisedUrls)=>{
+    const { pathname, search, hash } = splitUrlTarget(target);
+    const localizedPathname = (0, localisedUrls_js_namespaceObject.localiseTargetPathname)(pathname, language, languages, localisedUrls);
+    return `${localizedPathname}${search}${hash}`;
+};
+const detectLanguageFromPath = (pathname, languages, localePathRedirect)=>{
+    if (!localePathRedirect) return {
+        detected: false
     };
-    const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
-        if (!ignoreRedirectRoutes) return false;
-        const segments = pathname.split('/').filter(Boolean);
-        let pathWithoutLang = pathname;
-        if (segments.length > 0 && languages.includes(segments[0])) pathWithoutLang = `/${segments.slice(1).join('/')}`;
-        const normalizedPath = pathWithoutLang.startsWith('/') ? pathWithoutLang : `/${pathWithoutLang}`;
-        if ('function' == typeof ignoreRedirectRoutes) return ignoreRedirectRoutes(normalizedPath);
-        return ignoreRedirectRoutes.some((pattern)=>normalizedPath === pattern || normalizedPath.startsWith(`${pattern}/`));
+    const entryPath = getEntryPath();
+    const relativePath = pathname.replace(entryPath, '');
+    const segments = relativePath.split('/').filter(Boolean);
+    const segmentsToCheck = !entryPath && segments.length > 1 && segments[0] && !languages.includes(segments[0]) ? segments.slice(1) : segments;
+    const firstSegment = segmentsToCheck[0];
+    if (firstSegment && languages.includes(firstSegment)) return {
+        detected: true,
+        language: firstSegment
     };
-    const useRouterHooks = ()=>{
-        try {
-            const { useLocation, useNavigate, useParams } = __webpack_require__("@modern-js/runtime/router");
-            return {
-                navigate: useNavigate(),
-                location: useLocation(),
-                params: useParams(),
-                hasRouter: true
-            };
-        } catch (error) {
-            return {
-                navigate: null,
-                location: null,
-                params: {},
-                hasRouter: false
-            };
-        }
+    return {
+        detected: false
     };
-})();
+};
+const shouldIgnoreRedirect = (pathname, languages, ignoreRedirectRoutes)=>{
+    if (!ignoreRedirectRoutes) return false;
+    const segments = pathname.split('/').filter(Boolean);
+    let pathWithoutLang = pathname;
+    if (segments.length > 0 && languages.includes(segments[0])) pathWithoutLang = `/${segments.slice(1).join('/')}`;
+    const normalizedPath = pathWithoutLang.startsWith('/') ? pathWithoutLang : `/${pathWithoutLang}`;
+    if ('function' == typeof ignoreRedirectRoutes) return ignoreRedirectRoutes(normalizedPath);
+    return ignoreRedirectRoutes.some((pattern)=>normalizedPath === pattern || normalizedPath.startsWith(`${pattern}/`));
+};
 exports.buildLocalizedUrl = __webpack_exports__.buildLocalizedUrl;
 exports.detectLanguageFromPath = __webpack_exports__.detectLanguageFromPath;
 exports.getEntryPath = __webpack_exports__.getEntryPath;
 exports.getLanguageFromPath = __webpack_exports__.getLanguageFromPath;
 exports.getPathname = __webpack_exports__.getPathname;
 exports.shouldIgnoreRedirect = __webpack_exports__.shouldIgnoreRedirect;
-exports.useRouterHooks = __webpack_exports__.useRouterHooks;
+exports.splitUrlTarget = __webpack_exports__.splitUrlTarget;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "buildLocalizedUrl",
     "detectLanguageFromPath",
@@ -129,7 +112,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "getLanguageFromPath",
     "getPathname",
     "shouldIgnoreRedirect",
-    "useRouterHooks"
+    "splitUrlTarget"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/server/index.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -24,13 +28,46 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    collectApiPrefixes: ()=>collectApiPrefixes,
     default: ()=>server,
-    i18nServerPlugin: ()=>i18nServerPlugin
+    i18nServerPlugin: ()=>i18nServerPlugin,
+    matchesApiPrefix: ()=>matchesApiPrefix
 });
 const hono_namespaceObject = require("@modern-js/server-core/hono");
 const config_js_namespaceObject = require("../runtime/i18n/detection/config.js");
+const localisedUrls_js_namespaceObject = require("../shared/localisedUrls.js");
 const utils_js_namespaceObject = require("../shared/utils.js");
 const { languageDetector } = hono_namespaceObject;
+const normalizeApiPrefix = (prefix)=>{
+    const trimmedPrefix = prefix.trim();
+    if (!trimmedPrefix) return null;
+    const prefixedPath = trimmedPrefix.startsWith('/') ? trimmedPrefix : `/${trimmedPrefix}`;
+    const withoutWildcard = prefixedPath.replace(/\/\*$/, '');
+    const normalizedPrefix = withoutWildcard.length > 1 ? withoutWildcard.replace(/\/+$/, '') : withoutWildcard;
+    return '/' === normalizedPrefix ? null : normalizedPrefix;
+};
+const collectApiPrefixes = (routes, bffPrefix)=>{
+    const prefixes = new Set();
+    for (const route of routes){
+        if (!route.isApi || !route.urlPath) continue;
+        const normalizedPrefix = normalizeApiPrefix(route.urlPath);
+        if (normalizedPrefix) prefixes.add(normalizedPrefix);
+    }
+    const bffPrefixes = Array.isArray(bffPrefix) ? bffPrefix : bffPrefix ? [
+        bffPrefix
+    ] : [];
+    for (const prefix of bffPrefixes){
+        const normalizedPrefix = normalizeApiPrefix(prefix);
+        if (normalizedPrefix) prefixes.add(normalizedPrefix);
+    }
+    return [
+        ...prefixes
+    ];
+};
+const matchesApiPrefix = (pathname, apiPrefixes)=>{
+    const normalizedPathname = pathname.startsWith('/') ? pathname : `/${pathname}`;
+    return apiPrefixes.some((prefix)=>normalizedPathname === prefix || normalizedPathname.startsWith(`${prefix}/`));
+};
 const convertToHonoLanguageDetectorOptions = (languages, fallbackLanguage, detectionOptions)=>{
     const mergedDetection = detectionOptions ? (0, config_js_namespaceObject.mergeDetectionOptions)(detectionOptions) : config_js_namespaceObject.DEFAULT_I18NEXT_DETECTION_OPTIONS;
     const order = (mergedDetection.order || []).filter((item)=>![
@@ -120,15 +157,12 @@ const getLanguageFromPath = (req, urlPath, languages)=>{
     if (languages.includes(firstSegment)) return firstSegment;
     return null;
 };
-const buildLocalizedUrl = (req, urlPath, language, languages)=>{
+const buildLocalizedUrl = (req, urlPath, language, languages, localisedUrls)=>{
     const url = new URL(req.url);
     const pathname = url.pathname;
     const basePath = urlPath.replace('/*', '');
     const remainingPath = pathname.startsWith(basePath) ? pathname.slice(basePath.length) : pathname;
-    const segments = remainingPath.split('/').filter(Boolean);
-    if (segments.length > 0 && languages.includes(segments[0])) segments[0] = language;
-    else segments.unshift(language);
-    const newPathname = `/${segments.join('/')}`;
+    const newPathname = (0, localisedUrls_js_namespaceObject.localiseTargetPathname)(remainingPath, language, languages, localisedUrls);
     const suffix = `${url.search}${url.hash}`;
     const localizedUrl = '/' === basePath ? newPathname + suffix : basePath + newPathname + suffix;
     return localizedUrl;
@@ -138,6 +172,9 @@ const i18nServerPlugin = (options)=>({
         setup: (api)=>{
             api.onPrepare(()=>{
                 const { middlewares, routes } = api.getServerContext();
+                const serverConfig = api.getServerConfig();
+                const bffPrefix = serverConfig?.bff ? serverConfig.bff.prefix ?? '/api' : void 0;
+                const apiPrefixes = collectApiPrefixes(routes, bffPrefix);
                 const entryPaths = new Set();
                 routes.forEach((route)=>{
                     if (route.entryName && route.urlPath && '/' !== route.urlPath) {
@@ -149,7 +186,7 @@ const i18nServerPlugin = (options)=>({
                     const { entryName } = route;
                     if (!entryName) return;
                     if (!options.localeDetection) return;
-                    const { localePathRedirect, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes } = (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entryName, options.localeDetection);
+                    const { localePathRedirect, i18nextDetector = true, languages = [], fallbackLanguage = 'en', detection, ignoreRedirectRoutes, localisedUrls } = (0, utils_js_namespaceObject.getLocaleDetectionOptions)(entryName, options.localeDetection);
                     const staticRoutePrefixes = options.staticRoutePrefixes;
                     const originUrlPath = route.urlPath;
                     const urlPath = originUrlPath.endsWith('/') ? `${originUrlPath}*` : `${originUrlPath}/*`;
@@ -163,6 +200,7 @@ const i18nServerPlugin = (options)=>({
                                 handler: async (c, next)=>{
                                     const url = new URL(c.req.url);
                                     const pathname = url.pathname;
+                                    if (matchesApiPrefix(pathname, apiPrefixes)) return await next();
                                     if (isStaticResourceRequest(pathname, staticRoutePrefixes, languages)) return await next();
                                     if ('/' === originUrlPath) {
                                         const pathSegments = pathname.split('/').filter(Boolean);
@@ -181,6 +219,7 @@ const i18nServerPlugin = (options)=>({
                             handler: async (c, next)=>{
                                 const url = new URL(c.req.url);
                                 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 ('/' === originUrlPath) {
@@ -195,9 +234,14 @@ 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);
+                                    const localizedUrl = buildLocalizedUrl(c.req, originUrlPath, targetLanguage, languages, localisedUrls);
                                     return c.redirect(localizedUrl);
                                 }
+                                const localisedUrlsConfig = (0, localisedUrls_js_namespaceObject.resolveLocalisedUrlsConfig)(localisedUrls);
+                                if (localisedUrlsConfig.enabled) {
+                                    const expectedUrl = buildLocalizedUrl(c.req, originUrlPath, language, languages, localisedUrls);
+                                    if (expectedUrl !== `${pathname}${url.search}${url.hash}`) return c.redirect(expectedUrl);
+                                }
                                 await next();
                             }
                         });
@@ -207,11 +251,15 @@ const i18nServerPlugin = (options)=>({
         }
     });
 const server = i18nServerPlugin;
+exports.collectApiPrefixes = __webpack_exports__.collectApiPrefixes;
 exports["default"] = __webpack_exports__["default"];
 exports.i18nServerPlugin = __webpack_exports__.i18nServerPlugin;
+exports.matchesApiPrefix = __webpack_exports__.matchesApiPrefix;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "collectApiPrefixes",
     "default",
-    "i18nServerPlugin"
+    "i18nServerPlugin",
+    "matchesApiPrefix"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/shared/deepMerge.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -23,9 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    deepMerge: ()=>deepMerge
-});
 function isPlainObject(value) {
     return null !== value && 'object' == typeof value && !Array.isArray(value) && !(value instanceof Date);
 }
@@ -45,6 +46,9 @@ function deepMerge(defaultOptions, userOptions) {
     }
     return merged;
 }
+__webpack_require__.d(__webpack_exports__, {
+    deepMerge: ()=>deepMerge
+});
 exports.deepMerge = __webpack_exports__.deepMerge;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "deepMerge"

package/dist/cjs/shared/detection.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{