next-translate 3.1.1 → 3.1.3

package/README.md

@@ -23,9 +23,14 @@
 
 </div>
 
-> [!NOTE]
->
-> We are working with version **3.0.0** of Next-translate. In recent months we have been very focused on **[Brisa](https://brisa.build/)**. So it has been a long time since the last release, but we have not forgotten about Next-translate. We are working on a new version that will bring many improvements and new features. We are very excited to share it with all of you.
+<p align="center">
+    <b>Sponsored by:</b>
+    <br />
+    <a href="https://kitmul.com/en">
+        <img src="images/kitmul-logo.svg" width="200" alt="Kitmul" />
+    </a>
+</p>
+
 
 - [1. About next-translate](#1-about-next-translate)
   - [How are translations loaded?](#how-are-translations-loaded)

package/lib/cjs/I18nProvider.js

@@ -41,6 +41,7 @@ exports.InternalContext = void 0;
 var react_1 = __importStar(require("react"));
 var router_1 = require("next/router");
 var context_1 = __importDefault(require("./context"));
+var safePluralRules_1 = __importDefault(require("./safePluralRules"));
 var transCore_1 = __importDefault(require("./transCore"));
 var useTranslation_1 = __importDefault(require("./useTranslation"));
 exports.InternalContext = (0, react_1.createContext)({ ns: {}, config: {} });
@@ -54,7 +55,7 @@ function I18nProvider(_a) {
     var config = __assign(__assign({}, internal.config), newConfig);
     var localesToIgnore = config.localesToIgnore || ['default'];
     var ignoreLang = !lang || localesToIgnore.includes(lang);
-    var pluralRules = (0, react_1.useMemo)(function () { return new Intl.PluralRules(ignoreLang ? undefined : lang); }, [ignoreLang, lang]);
+    var pluralRules = (0, react_1.useMemo)(function () { return (0, safePluralRules_1.default)(ignoreLang ? undefined : lang); }, [ignoreLang, lang]);
     var t = (0, react_1.useMemo)(function () { return (0, transCore_1.default)({ config: config, allNamespaces: allNamespaces, pluralRules: pluralRules, lang: lang }); }, [config, allNamespaces, pluralRules, lang]);
     return (react_1.default.createElement(context_1.default.Provider, { value: { lang: lang, t: t } },
         react_1.default.createElement(exports.InternalContext.Provider, { value: { ns: allNamespaces, config: config } }, children)));

package/lib/cjs/createTranslation.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var isServer_1 = __importDefault(require("./isServer"));
+var safePluralRules_1 = __importDefault(require("./safePluralRules"));
 var transCore_1 = __importDefault(require("./transCore"));
 var wrapTWithDefaultNs_1 = __importDefault(require("./wrapTWithDefaultNs"));
 function createTranslation(defaultNS) {
@@ -16,7 +17,7 @@ function createTranslation(defaultNS) {
         var t = (0, transCore_1.default)({
             config: config,
             allNamespaces: namespaces,
-            pluralRules: new Intl.PluralRules(ignoreLang ? undefined : lang),
+            pluralRules: (0, safePluralRules_1.default)(ignoreLang ? undefined : lang),
             lang: lang,
         });
         return (0, wrapTWithDefaultNs_1.default)(t, defaultNS);

package/lib/cjs/getPageNamespaces.js

@@ -48,10 +48,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function flat(a) {
     return a.reduce(function (b, c) { return b.concat(c); }, []);
 }
+function stripRouteGroups(path) {
+    return path.replace(/\/\([^)]+\)/g, '');
+}
 function getPageNamespaces(_a, page, ctx) {
     var _b = _a.pages, pages = _b === void 0 ? {} : _b;
     return __awaiter(this, void 0, void 0, function () {
-        var rgx, getNs, rgxs, _c, _d, _e, _f;
+        var rgx, getNs, normalizedPage, rgxs, pageNs, match, _c, _d, _e, _f;
         var _this = this;
         return __generator(this, function (_g) {
             switch (_g.label) {
@@ -60,6 +63,7 @@ function getPageNamespaces(_a, page, ctx) {
                     getNs = function (ns) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                         return [2, typeof ns === 'function' ? ns(ctx) : ns || []];
                     }); }); };
+                    normalizedPage = stripRouteGroups(page);
                     rgxs = Object.keys(pages).reduce(function (arr, p) {
                         if (p.substring(0, rgx.length) === rgx &&
                             new RegExp(p.replace(rgx, '')).test(page)) {
@@ -67,11 +71,21 @@ function getPageNamespaces(_a, page, ctx) {
                         }
                         return arr;
                     }, []);
+                    pageNs = pages[page];
+                    if (!pageNs) {
+                        match = Object.keys(pages).find(function (p) {
+                            return p !== '*' &&
+                                !p.startsWith(rgx) &&
+                                stripRouteGroups(p) === normalizedPage;
+                        });
+                        if (match)
+                            pageNs = pages[match];
+                    }
                     _c = [[]];
                     return [4, getNs(pages['*'])];
                 case 1:
                     _d = [__spreadArray.apply(void 0, _c.concat([(_g.sent()), true]))];
-                    return [4, getNs(pages[page])];
+                    return [4, getNs(pageNs)];
                 case 2:
                     _e = [__spreadArray.apply(void 0, _d.concat([(_g.sent()), true]))];
                     _f = flat;

package/lib/cjs/getT.js

@@ -40,6 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getConfig_1 = __importDefault(require("./getConfig"));
+var safePluralRules_1 = __importDefault(require("./safePluralRules"));
 var transCore_1 = __importDefault(require("./transCore"));
 var wrapTWithDefaultNs_1 = __importDefault(require("./wrapTWithDefaultNs"));
 function getT(locale, namespace) {
@@ -79,7 +80,7 @@ function getT(locale, namespace) {
                     _b.sent();
                     localesToIgnore = config.localesToIgnore || ['default'];
                     ignoreLang = localesToIgnore.includes(lang);
-                    pluralRules = new Intl.PluralRules(ignoreLang ? undefined : lang);
+                    pluralRules = (0, safePluralRules_1.default)(ignoreLang ? undefined : lang);
                     t = (0, transCore_1.default)({ config: config, allNamespaces: allNamespaces, pluralRules: pluralRules, lang: lang });
                     defaultNamespace = namespaces[0];
                     return [2, (0, wrapTWithDefaultNs_1.default)(t, defaultNamespace)];

package/lib/cjs/safePluralRules.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function safePluralRules(locale) {
+    try {
+        return new Intl.PluralRules(locale);
+    }
+    catch (_e) {
+        return new Intl.PluralRules();
+    }
+}
+exports.default = safePluralRules;

package/lib/esm/I18nProvider.js

@@ -12,6 +12,7 @@ var __assign = (this && this.__assign) || function () {
 import React, { createContext, useContext, useMemo } from 'react';
 import { useRouter } from 'next/router';
 import I18nContext from './context';
+import safePluralRules from './safePluralRules';
 import transCore from './transCore';
 import useTranslation from './useTranslation';
 export var InternalContext = createContext({ ns: {}, config: {} });
@@ -25,7 +26,7 @@ export default function I18nProvider(_a) {
     var config = __assign(__assign({}, internal.config), newConfig);
     var localesToIgnore = config.localesToIgnore || ['default'];
     var ignoreLang = !lang || localesToIgnore.includes(lang);
-    var pluralRules = useMemo(function () { return new Intl.PluralRules(ignoreLang ? undefined : lang); }, [ignoreLang, lang]);
+    var pluralRules = useMemo(function () { return safePluralRules(ignoreLang ? undefined : lang); }, [ignoreLang, lang]);
     var t = useMemo(function () { return transCore({ config: config, allNamespaces: allNamespaces, pluralRules: pluralRules, lang: lang }); }, [config, allNamespaces, pluralRules, lang]);
     return (React.createElement(I18nContext.Provider, { value: { lang: lang, t: t } },
         React.createElement(InternalContext.Provider, { value: { ns: allNamespaces, config: config } }, children)));

package/lib/esm/createTranslation.js

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
 import isServer from './isServer';
+import safePluralRules from './safePluralRules';
 import transCore from './transCore';
 import wrapTWithDefaultNs from './wrapTWithDefaultNs';
 export default function createTranslation(defaultNS) {
@@ -11,7 +12,7 @@ export default function createTranslation(defaultNS) {
         var t = transCore({
             config: config,
             allNamespaces: namespaces,
-            pluralRules: new Intl.PluralRules(ignoreLang ? undefined : lang),
+            pluralRules: safePluralRules(ignoreLang ? undefined : lang),
             lang: lang,
         });
         return wrapTWithDefaultNs(t, defaultNS);

package/lib/esm/getPageNamespaces.js

@@ -46,10 +46,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 function flat(a) {
     return a.reduce(function (b, c) { return b.concat(c); }, []);
 }
+function stripRouteGroups(path) {
+    return path.replace(/\/\([^)]+\)/g, '');
+}
 export default function getPageNamespaces(_a, page, ctx) {
     var _b = _a.pages, pages = _b === void 0 ? {} : _b;
     return __awaiter(this, void 0, void 0, function () {
-        var rgx, getNs, rgxs, _c, _d, _e, _f;
+        var rgx, getNs, normalizedPage, rgxs, pageNs, match, _c, _d, _e, _f;
         var _this = this;
         return __generator(this, function (_g) {
             switch (_g.label) {
@@ -58,6 +61,7 @@ export default function getPageNamespaces(_a, page, ctx) {
                     getNs = function (ns) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                         return [2, typeof ns === 'function' ? ns(ctx) : ns || []];
                     }); }); };
+                    normalizedPage = stripRouteGroups(page);
                     rgxs = Object.keys(pages).reduce(function (arr, p) {
                         if (p.substring(0, rgx.length) === rgx &&
                             new RegExp(p.replace(rgx, '')).test(page)) {
@@ -65,11 +69,21 @@ export default function getPageNamespaces(_a, page, ctx) {
                         }
                         return arr;
                     }, []);
+                    pageNs = pages[page];
+                    if (!pageNs) {
+                        match = Object.keys(pages).find(function (p) {
+                            return p !== '*' &&
+                                !p.startsWith(rgx) &&
+                                stripRouteGroups(p) === normalizedPage;
+                        });
+                        if (match)
+                            pageNs = pages[match];
+                    }
                     _c = [[]];
                     return [4, getNs(pages['*'])];
                 case 1:
                     _d = [__spreadArray.apply(void 0, _c.concat([(_g.sent()), true]))];
-                    return [4, getNs(pages[page])];
+                    return [4, getNs(pageNs)];
                 case 2:
                     _e = [__spreadArray.apply(void 0, _d.concat([(_g.sent()), true]))];
                     _f = flat;

package/lib/esm/getT.js

@@ -35,6 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import getConfig from './getConfig';
+import safePluralRules from './safePluralRules';
 import transCore from './transCore';
 import wrapTWithDefaultNs from './wrapTWithDefaultNs';
 export default function getT(locale, namespace) {
@@ -74,7 +75,7 @@ export default function getT(locale, namespace) {
                     _b.sent();
                     localesToIgnore = config.localesToIgnore || ['default'];
                     ignoreLang = localesToIgnore.includes(lang);
-                    pluralRules = new Intl.PluralRules(ignoreLang ? undefined : lang);
+                    pluralRules = safePluralRules(ignoreLang ? undefined : lang);
                     t = transCore({ config: config, allNamespaces: allNamespaces, pluralRules: pluralRules, lang: lang });
                     defaultNamespace = namespaces[0];
                     return [2, wrapTWithDefaultNs(t, defaultNamespace)];

package/lib/esm/safePluralRules.js

@@ -0,0 +1,8 @@
+export default function safePluralRules(locale) {
+    try {
+        return new Intl.PluralRules(locale);
+    }
+    catch (_e) {
+        return new Intl.PluralRules();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Tiny and powerful i18n tools (Next plugin + API) to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [
@@ -135,7 +135,7 @@
   "scripts": {
     "build": "yarn clean && cross-env NODE_ENV=production && yarn tsc",
     "clean": "yarn clean:build && yarn clean:examples",
-    "clean:build": "del lib appWith* Dynamic* I18n* i18nStore* i18nRequestStore* index context loadNa* setLang* Trans* useT* withT* getP* getC* *.d.ts getT transC* wrapT* types formatElements isServer AppDirI18nProvider* createTrans*",
+    "clean:build": "del lib appWith* Dynamic* I18n* i18nStore* i18nRequestStore* index context loadNa* setLang* Trans* useT* withT* getP* getC* *.d.ts getT transC* wrapT* types formatElements isServer AppDirI18nProvider* createTrans* safePluralRules*",
     "clean:examples": "del examples/**/.next examples/**/node_modules examples/**/yarn.lock",
     "example": "yarn example:complex",
     "example:basic": "yarn build && yarn --cwd examples/basic && yarn --cwd examples/basic dev",

package/safePluralRules.d.ts

@@ -0,0 +1 @@
+export default function safePluralRules(locale?: string): Intl.PluralRules;