gt-next 1.3.15 → 2.0.2

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,MAAM,CAAC,EACnB,IAAI,EAAE,UAAU,EAChB,MAAkC,EAClC,SAAwC,EACxC,OAAoC,EACpC,QAAsC,EACtC,OAAO,EACP,aAAgE,EAChE,cAAkD,EAClD,sBAAkE,EAClE,cAAkD,EAClD,GAAG,QAAQ,EACd,GAAE,WAAgC,aAqBf,UAAU,KAAQ,UAAU,CA+B/C"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,MAAM,CAAC,EACrB,IAAI,EACJ,UAAU,EACV,MAAkC,EAClC,SAAwC,EACxC,OAAoC,EACpC,QAAsC,EACtC,OAAO,EACP,aAAgE,EAChE,cAAkD,EAClD,sBAAkE,EAClE,cAAkD,EAClD,GAAG,QAAQ,EACZ,GAAE,WAAgC,aAuCjB,UAAU,KAAQ,UAAU,CAiC7C"}

package/dist/config.js

@@ -76,15 +76,20 @@ function initGT(_a) {
     if (_a === void 0) { _a = defaultInitGTProps_1.default; }
     var i18n = _a.i18n, dictionary = _a.dictionary, _b = _a.apiKey, apiKey = _b === void 0 ? defaultInitGTProps_1.default.apiKey : _b, _c = _a.projectID, projectID = _c === void 0 ? defaultInitGTProps_1.default.projectID : _c, _d = _a.baseURL, baseURL = _d === void 0 ? defaultInitGTProps_1.default.baseURL : _d, _e = _a.cacheURL, cacheURL = _e === void 0 ? defaultInitGTProps_1.default.cacheURL : _e, locales = _a.locales, _f = _a.defaultLocale, defaultLocale = _f === void 0 ? (locales === null || locales === void 0 ? void 0 : locales[0]) || defaultInitGTProps_1.default.defaultLocale : _f, _g = _a.renderSettings, renderSettings = _g === void 0 ? defaultInitGTProps_1.default.renderSettings : _g, _h = _a._maxConcurrentRequests, _maxConcurrentRequests = _h === void 0 ? defaultInitGTProps_1.default._maxConcurrectRequests : _h, _j = _a._batchInterval, _batchInterval = _j === void 0 ? defaultInitGTProps_1.default._batchInterval : _j, metadata = __rest(_a, ["i18n", "dictionary", "apiKey", "projectID", "baseURL", "cacheURL", "locales", "defaultLocale", "renderSettings", "_maxConcurrentRequests", "_batchInterval"]);
     // Error checks
-    if (!projectID && ((cacheURL === defaultInitGTProps_1.default.cacheURL) || (baseURL === defaultInitGTProps_1.default.baseURL)))
+    if (!projectID &&
+        (cacheURL === defaultInitGTProps_1.default.cacheURL ||
+            baseURL === defaultInitGTProps_1.default.baseURL))
         console.error('Project ID missing! Set projectID as GT_PROJECT_ID in the environment or by passing the projectID parameter to initGT(). Find your project ID: www.generaltranslation.com/dashboard.');
-    if ((!apiKey || !projectID) && (baseURL === defaultInitGTProps_1.default.baseURL)) {
-        console.error("API key is required for automatic translation! Create an API key: www.generaltranslation.com/dashboard/api-keys. (Or, turn off automatic translation by setting baseURL to an empty string.)");
+    if ((!apiKey || !projectID) && baseURL === defaultInitGTProps_1.default.baseURL) {
+        console.error('API key is required for automatic translation! Create an API key: www.generaltranslation.com/dashboard/api-keys. (Or, turn off automatic translation by setting baseURL to an empty string.)');
     }
+    // Store config params in environment variable to allow for global access (in some cases)
     var I18NConfigParams = JSON.stringify(__assign({ apiKey: apiKey, projectID: projectID, baseURL: baseURL, cacheURL: cacheURL, locales: locales, defaultLocale: defaultLocale, renderSettings: renderSettings, maxConcurrentRequests: _maxConcurrentRequests, batchInterval: _batchInterval }, metadata));
     // Use i18n and dictionary values as file paths if they are provided as such
     var resolvedI18NFilePath = typeof i18n === 'string' ? i18n : resolveConfigFilepath('i18n');
-    var resolvedDictionaryFilePath = typeof dictionary === 'string' ? dictionary : resolveConfigFilepath('dictionary');
+    var resolvedDictionaryFilePath = typeof dictionary === 'string'
+        ? dictionary
+        : resolveConfigFilepath('dictionary');
     return function (config) {
         if (config === void 0) { config = {}; }
         return __assign(__assign({}, config), { env: __assign(__assign({}, config.env), { _GENERALTRANSLATION_I18N_CONFIG_PARAMS: I18NConfigParams }), webpack: function webpack() {
@@ -136,7 +141,7 @@ function withExtensions(localPath) {
         "".concat(localPath, ".ts"),
         "".concat(localPath, ".tsx"),
         "".concat(localPath, ".js"),
-        "".concat(localPath, ".jsx")
+        "".concat(localPath, ".jsx"),
     ];
 }
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/index.server.d.ts

@@ -2,10 +2,10 @@ import Var from './variables/Var';
 import Num from './variables/Num';
 import Currency from './variables/Currency';
 import DateTime from './variables/DateTime';
-import getGT from './server/getGT';
+import { getGT, gt } from './server/getGT';
 import GTProvider from './provider/GTProvider';
 import T from './server/inline/T';
 import Branch from './branches/Branch';
 import Plural from './branches/Plural';
-export { getGT, GTProvider, T, Var, Num, Currency, DateTime, Branch, Plural };
+export { getGT, GTProvider, T, Var, Num, Currency, DateTime, Branch, Plural, gt };
 //# sourceMappingURL=index.server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.server.d.ts","sourceRoot":"","sources":["../src/index.server.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAA;AACjC,OAAO,GAAG,MAAM,iBAAiB,CAAA;AACjC,OAAO,QAAQ,MAAM,sBAAsB,CAAA;AAC3C,OAAO,QAAQ,MAAM,sBAAsB,CAAA;AAC3C,OAAO,KAAK,MAAM,gBAAgB,CAAA;AAClC,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAC9C,OAAO,CAAC,MAAM,mBAAmB,CAAA;AACjC,OAAO,MAAM,MAAM,mBAAmB,CAAA;AACtC,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EACH,KAAK,EAAE,UAAU,EAAE,CAAC,EACpB,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAC5B,MAAM,EAAE,MAAM,EACjB,CAAA"}
+{"version":3,"file":"index.server.d.ts","sourceRoot":"","sources":["../src/index.server.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,iBAAiB,CAAA;AACjC,OAAO,GAAG,MAAM,iBAAiB,CAAA;AACjC,OAAO,QAAQ,MAAM,sBAAsB,CAAA;AAC3C,OAAO,QAAQ,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,UAAU,MAAM,uBAAuB,CAAA;AAC9C,OAAO,CAAC,MAAM,mBAAmB,CAAA;AACjC,OAAO,MAAM,MAAM,mBAAmB,CAAA;AACtC,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EACH,KAAK,EAAE,UAAU,EAAE,CAAC,EACpB,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAC5B,MAAM,EAAE,MAAM,EAAE,EAAE,EACrB,CAAA"}

package/dist/index.server.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plural = exports.Branch = exports.DateTime = exports.Currency = exports.Num = exports.Var = exports.T = exports.GTProvider = exports.getGT = void 0;
+exports.gt = exports.Plural = exports.Branch = exports.DateTime = exports.Currency = exports.Num = exports.Var = exports.T = exports.GTProvider = exports.getGT = void 0;
 var Var_1 = __importDefault(require("./variables/Var"));
 exports.Var = Var_1.default;
 var Num_1 = __importDefault(require("./variables/Num"));
@@ -12,8 +12,9 @@ var Currency_1 = __importDefault(require("./variables/Currency"));
 exports.Currency = Currency_1.default;
 var DateTime_1 = __importDefault(require("./variables/DateTime"));
 exports.DateTime = DateTime_1.default;
-var getGT_1 = __importDefault(require("./server/getGT"));
-exports.getGT = getGT_1.default;
+var getGT_1 = require("./server/getGT");
+Object.defineProperty(exports, "getGT", { enumerable: true, get: function () { return getGT_1.getGT; } });
+Object.defineProperty(exports, "gt", { enumerable: true, get: function () { return getGT_1.gt; } });
 var GTProvider_1 = __importDefault(require("./provider/GTProvider"));
 exports.GTProvider = GTProvider_1.default;
 var T_1 = __importDefault(require("./server/inline/T"));

package/dist/index.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.server.js","sourceRoot":"","sources":["../src/index.server.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AAY7B,cAZG,aAAG,CAYH;AAXP,wDAAiC;AAWxB,cAXF,aAAG,CAWE;AAVZ,kEAA2C;AAU7B,mBAVP,kBAAQ,CAUO;AATtB,kEAA2C;AASnB,mBATjB,kBAAQ,CASiB;AARhC,yDAAkC;AAO9B,gBAPG,eAAK,CAOH;AANT,qEAA8C;AAMnC,qBANJ,oBAAU,CAMI;AALrB,wDAAiC;AAKV,YALhB,WAAC,CAKgB;AAJxB,6DAAsC;AAMlC,iBANG,gBAAM,CAMH;AALV,6DAAsC;AAK1B,iBALL,gBAAM,CAKK"}
+{"version":3,"file":"index.server.js","sourceRoot":"","sources":["../src/index.server.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiC;AAY7B,cAZG,aAAG,CAYH;AAXP,wDAAiC;AAWxB,cAXF,aAAG,CAWE;AAVZ,kEAA2C;AAU7B,mBAVP,kBAAQ,CAUO;AATtB,kEAA2C;AASnB,mBATjB,kBAAQ,CASiB;AARhC,wCAA0C;AAOtC,sFAPK,aAAK,OAOL;AAEW,mFATJ,UAAE,OASI;AARtB,qEAA8C;AAMnC,qBANJ,oBAAU,CAMI;AALrB,wDAAiC;AAKV,YALhB,WAAC,CAKgB;AAJxB,6DAAsC;AAMlC,iBANG,gBAAM,CAMH;AALV,6DAAsC;AAK1B,iBALL,gBAAM,CAKK"}

package/dist/middleware/createNextMiddleware.d.ts

@@ -13,9 +13,10 @@ import { NextResponse } from "next/server";
  * @param {boolean} [config.localeRouting=true] - Flag to enable or disable automatic locale-based routing.
  * @returns {function} - A middleware function that processes the request and response.
  */
-export default function createNextMiddleware({ defaultLocale, locales, localeRouting }?: {
-    defaultLocale: string;
+export default function createNextMiddleware({ defaultLocale, locales, localeRouting, prefixDefaultLocale }?: {
+    defaultLocale?: string;
     locales?: string[];
     localeRouting?: boolean;
+    prefixDefaultLocale?: boolean;
 }): (req: any) => NextResponse<unknown>;
 //# sourceMappingURL=createNextMiddleware.d.ts.map

package/dist/middleware/createNextMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA2C3C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EACzC,aAA+C,EAAE,OAAO,EAAE,aAAoB,EACjF,GAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACE,SAexC,GAAG,2BA0GnC"}
+{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAe3C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EACzC,aAAoC,EACpC,OAAO,EAAE,aAAoB,EAAE,mBAA2B,EAC7D,GAAE;IACC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAIrG,SAegC,GAAG,2BA8GnC"}

package/dist/middleware/createNextMiddleware.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = createNextMiddleware;
 var generaltranslation_1 = require("generaltranslation");
 var server_1 = require("next/server");
-var internal_1 = require("gt-react/internal");
-var cookies_1 = require("next/dist/compiled/@edge-runtime/cookies");
+// import { ResponseCookies, RequestCookies } from "next/dist/compiled/@edge-runtime/cookies";
+var internal_1 = require("generaltranslation/internal");
 /**
  * Extracts the locale from the given pathname.
  *
@@ -15,29 +15,6 @@ function extractLocale(pathname) {
     var matches = pathname.match(/^\/([^\/]+)(?:\/|$)/);
     return matches ? matches[1] : null;
 }
-/**
- * Copy cookies from the Set-Cookie header of the response to the Cookie header of the request,
- * so that it will appear to SSR/RSC as if the user already has the new cookies.
- * via
- */
-function applyNewCookies(req, res) {
-    // 1. Parse Set-Cookie header from the response
-    var setCookies = new cookies_1.ResponseCookies(res.headers);
-    // 2. Construct updated Cookie header for the request
-    var newReqHeaders = new Headers(req.headers);
-    var newReqCookies = new cookies_1.RequestCookies(newReqHeaders);
-    setCookies.getAll().forEach(function (cookie) { return newReqCookies.set(cookie); });
-    // 3. Set up the “request header overrides” (see https://github.com/vercel/next.js/pull/41380)
-    //    on a dummy response
-    // NextResponse.next will set x-middleware-override-headers / x-middleware-request-* headers
-    var dummyRes = server_1.NextResponse.next({ request: { headers: newReqHeaders } });
-    // 4. Copy the “request header overrides” headers from our dummy response to the real response
-    dummyRes.headers.forEach(function (value, key) {
-        if (key === 'x-middleware-override-headers' || key.startsWith('x-middleware-request-')) {
-            res.headers.set(key, value);
-        }
-    });
-}
 /**
  * Middleware factory to create a Next.js middleware for i18n routing and locale detection.
  *
@@ -53,7 +30,9 @@ function applyNewCookies(req, res) {
  * @returns {function} - A middleware function that processes the request and response.
  */
 function createNextMiddleware(_a) {
-    var _b = _a === void 0 ? { defaultLocale: internal_1.primitives.libraryDefaultLocale, localeRouting: true } : _a, _c = _b.defaultLocale, defaultLocale = _c === void 0 ? internal_1.primitives.libraryDefaultLocale : _c, locales = _b.locales, _d = _b.localeRouting, localeRouting = _d === void 0 ? true : _d;
+    var _b = _a === void 0 ? {
+        defaultLocale: internal_1.libraryDefaultLocale, localeRouting: true, prefixDefaultLocale: false
+    } : _a, _c = _b.defaultLocale, defaultLocale = _c === void 0 ? internal_1.libraryDefaultLocale : _c, locales = _b.locales, _d = _b.localeRouting, localeRouting = _d === void 0 ? true : _d, _e = _b.prefixDefaultLocale, prefixDefaultLocale = _e === void 0 ? false : _e;
     /**
     * Processes the incoming request to determine the user's locale and sets a locale cookie.
     * Optionally redirects the user based on the locale if locale-based routing is enabled.
@@ -68,31 +47,31 @@ function createNextMiddleware(_a) {
     * @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
     */
     function nextMiddleware(req) {
-        var _a, _b, _c;
+        var _a;
         var headerList = new Headers(req.headers);
         var res = server_1.NextResponse.next();
-        var userLocale = (0, generaltranslation_1.standardizeLanguageCode)(defaultLocale);
+        var userLocale = (0, generaltranslation_1.standardizeLocale)(defaultLocale);
         if (localeRouting) {
             // Check if there is any supported locale in the pathname
             var pathname = req.nextUrl.pathname;
             var locale = extractLocale(pathname);
             var pathnameHasLocale = false;
-            if (locale && (0, generaltranslation_1.isValidLanguageCode)(locale)) {
+            if (locale && (0, generaltranslation_1.isValidLocale)(locale)) {
                 if (locales) {
-                    var approvedLocale = (0, generaltranslation_1.determineLanguage)(locale, locales);
+                    var approvedLocale = (0, generaltranslation_1.determineLocale)(locale, locales);
                     if (approvedLocale) {
-                        userLocale = (0, generaltranslation_1.standardizeLanguageCode)(approvedLocale);
+                        userLocale = (0, generaltranslation_1.standardizeLocale)(approvedLocale);
                         pathnameHasLocale = true;
                     }
                 }
                 else {
-                    userLocale = (0, generaltranslation_1.standardizeLanguageCode)(locale);
+                    userLocale = (0, generaltranslation_1.standardizeLocale)(locale);
                     pathnameHasLocale = true;
                 }
             }
             if (pathnameHasLocale) {
-                res.cookies.set(internal_1.primitives.localeCookieName, userLocale);
-                applyNewCookies(req, res);
+                res.headers.set(internal_1.localeHeaderName, userLocale);
+                res.cookies.set(internal_1.localeCookieName, userLocale);
                 return res;
             }
             // If there's no locale, try to get one from the referer
@@ -102,54 +81,61 @@ function createNextMiddleware(_a) {
                 if (refererLocale) {
                     var refererLocaleIsValid = false;
                     if (locales) {
-                        var approvedLocale = (0, generaltranslation_1.determineLanguage)(refererLocale, locales);
+                        var approvedLocale = (0, generaltranslation_1.determineLocale)(refererLocale, locales);
                         if (approvedLocale) {
-                            userLocale = (0, generaltranslation_1.standardizeLanguageCode)(approvedLocale);
+                            userLocale = (0, generaltranslation_1.standardizeLocale)(approvedLocale);
                             refererLocaleIsValid = true;
                         }
                     }
                     else {
-                        if ((0, generaltranslation_1.isValidLanguageCode)(refererLocale)) {
-                            userLocale = (0, generaltranslation_1.standardizeLanguageCode)(refererLocale);
+                        if ((0, generaltranslation_1.isValidLocale)(refererLocale)) {
+                            userLocale = (0, generaltranslation_1.standardizeLocale)(refererLocale);
                             refererLocaleIsValid = true;
                         }
                     }
                     if (refererLocaleIsValid) {
                         req.nextUrl.pathname = "/".concat(userLocale, "/").concat(pathname);
-                        applyNewCookies(req, res);
                         return server_1.NextResponse.redirect(req.nextUrl);
                     }
                 }
             }
         }
-        var acceptedLocales = (_c = (_b = headerList.get('accept-language')) === null || _b === void 0 ? void 0 : _b.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); })) === null || _c === void 0 ? void 0 : _c.filter(function (code) { return (0, generaltranslation_1.isValidLanguageCode)(code); });
-        if (acceptedLocales && acceptedLocales.length > 0) {
-            if (locales) {
-                var approvedLocale = (0, generaltranslation_1.determineLanguage)(acceptedLocales, locales);
-                if (approvedLocale) {
-                    userLocale = (0, generaltranslation_1.standardizeLanguageCode)(approvedLocale);
-                }
+        userLocale = (function () {
+            var _a, _b;
+            var cookieLocale = req.cookies.get(internal_1.localeCookieName);
+            if (cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) {
+                if ((0, generaltranslation_1.isValidLocale)(cookieLocale.value))
+                    return (0, generaltranslation_1.standardizeLocale)(cookieLocale.value);
             }
-            else {
-                userLocale = (0, generaltranslation_1.standardizeLanguageCode)(acceptedLocales[0]);
+            var acceptedLocales = (_b = (_a = headerList.get('accept-language')) === null || _a === void 0 ? void 0 : _a.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); })) === null || _b === void 0 ? void 0 : _b.filter(function (code) { return (0, generaltranslation_1.isValidLocale)(code); });
+            if (acceptedLocales && acceptedLocales.length > 0) {
+                if (locales) {
+                    var approvedLocale = (0, generaltranslation_1.determineLocale)(acceptedLocales, locales);
+                    if (approvedLocale) {
+                        userLocale = (0, generaltranslation_1.standardizeLocale)(approvedLocale);
+                    }
+                }
+                else {
+                    return (0, generaltranslation_1.standardizeLocale)(acceptedLocales[0]);
+                }
             }
-        }
-        res.cookies.set(internal_1.primitives.localeCookieName, userLocale);
+            return userLocale;
+        })();
+        res.cookies.set(internal_1.localeCookieName, userLocale);
+        res.headers.set(internal_1.localeHeaderName, userLocale);
         if (localeRouting) {
             var pathname = req.nextUrl.pathname;
-            if (userLocale === defaultLocale) {
+            if (!prefixDefaultLocale && (0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
                 var rewrittenRes = server_1.NextResponse.rewrite(new URL("/".concat(userLocale).concat(pathname), req.nextUrl), req.nextUrl);
-                rewrittenRes.cookies.set(internal_1.primitives.localeCookieName, userLocale);
-                applyNewCookies(req, rewrittenRes);
+                rewrittenRes.cookies.set(internal_1.localeCookieName, userLocale);
+                rewrittenRes.headers.set(internal_1.localeHeaderName, userLocale);
                 return rewrittenRes;
             }
             else {
                 req.nextUrl.pathname = "/".concat(userLocale).concat(pathname);
-                applyNewCookies(req, res);
                 return server_1.NextResponse.redirect(req.nextUrl);
             }
         }
-        applyNewCookies(req, res);
         return res;
     }
     return nextMiddleware;

package/dist/middleware/createNextMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/next/getNextLocale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getNextLocale.d.ts","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,aAAa,GAAE,MAAW,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAa/G"}
+{"version":3,"file":"getNextLocale.d.ts","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,aAAa,GAAE,MAAW,EAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,GAC7B,OAAO,CAAC,MAAM,CAAC,CAyCjB"}

package/dist/next/getNextLocale.js

@@ -39,8 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextLocale = getNextLocale;
 var headers_1 = require("next/headers");
 var headers_2 = require("next/headers");
-var internal_1 = require("gt-react/internal");
 var generaltranslation_1 = require("generaltranslation");
+var internal_1 = require("generaltranslation/internal");
 /**
  * Retrieves the 'accept-language' header from the headers list.
  * If the 'next/headers' module is not available, it attempts to load it. If the
@@ -52,28 +52,41 @@ var generaltranslation_1 = require("generaltranslation");
  */
 function getNextLocale() {
     return __awaiter(this, arguments, void 0, function (defaultLocale, locales) {
-        var cookieStore, localeCookie, headersList, acceptedLocales;
-        var _a;
+        var _a, headersList, cookieStore, userLocale;
         if (defaultLocale === void 0) { defaultLocale = ''; }
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, headers_2.cookies)()];
+                case 0: return [4 /*yield*/, Promise.all([
+                        (0, headers_1.headers)(), (0, headers_2.cookies)()
+                    ])];
                 case 1:
-                    cookieStore = _b.sent();
-                    localeCookie = cookieStore.get(internal_1.primitives.localeCookieName);
-                    if (localeCookie === null || localeCookie === void 0 ? void 0 : localeCookie.value)
-                        return [2 /*return*/, localeCookie.value];
-                    return [4 /*yield*/, (0, headers_1.headers)()];
-                case 2:
-                    headersList = _b.sent();
-                    acceptedLocales = (_a = headersList.get('accept-language')) === null || _a === void 0 ? void 0 : _a.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); });
-                    if (acceptedLocales && acceptedLocales.length) {
+                    _a = _b.sent(), headersList = _a[0], cookieStore = _a[1];
+                    userLocale = (function () {
+                        var _a;
+                        var preferredLocales = [];
+                        // Language routed to by middleware
+                        var headerLocale = headersList.get(internal_1.localeHeaderName);
+                        if (headerLocale)
+                            preferredLocales.push(headerLocale);
+                        var cookieLocale = cookieStore.get(internal_1.localeCookieName);
+                        if (cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) {
+                            preferredLocales.push(cookieLocale.value);
+                        }
+                        // Browser languages, in preference order
+                        var acceptedLocales = (_a = headersList
+                            .get('accept-language')) === null || _a === void 0 ? void 0 : _a.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); });
+                        if (acceptedLocales)
+                            preferredLocales.push.apply(preferredLocales, acceptedLocales);
+                        // add defaultLocale just in case there are no matches
+                        preferredLocales.push(defaultLocale);
+                        // if there are specified allowed locales
                         if (locales) {
-                            return [2 /*return*/, (0, generaltranslation_1.determineLanguage)(acceptedLocales, locales) || defaultLocale];
+                            return (0, generaltranslation_1.determineLocale)(preferredLocales, locales) || defaultLocale;
                         }
-                        return [2 /*return*/, acceptedLocales[0]];
-                    }
-                    return [2 /*return*/, defaultLocale];
+                        // if there are no specified allowed locales
+                        return preferredLocales[0];
+                    })();
+                    return [2 /*return*/, userLocale];
             }
         });
     });

package/dist/next/getNextLocale.js.map

@@ -1 +1 @@
-{"version":3,"file":"getNextLocale.js","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,sCAaC;AA3BD,wCAAuC;AACvC,wCAAuC;AACvC,8CAA8C;AAC9C,yDAAuD;AAEvD;;;;;;;;GAQG;AACH,SAAsB,aAAa;wDAAC,aAA0B,EAAE,OAA8B;;;QAA1D,8BAAA,EAAA,kBAA0B;;;wBACtC,qBAAM,IAAA,iBAAO,GAAE,EAAA;;oBAA7B,WAAW,GAAG,SAAe;oBAC7B,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,qBAAU,CAAC,gBAAgB,CAAC,CAAC;oBAClE,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK;wBAAE,sBAAO,YAAY,CAAC,KAAK,EAAC;oBAC/B,qBAAM,IAAA,iBAAO,GAAE,EAAA;;oBAA7B,WAAW,GAAG,SAAe;oBAC7B,eAAe,GAAG,MAAA,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,0CAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,UAAA,IAAI,YAAI,OAAA,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,0CAAG,CAAC,EAAE,IAAI,EAAE,CAAA,EAAA,CAAC,CAAC;oBAChH,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;wBAC5C,IAAI,OAAO,EAAE,CAAC;4BACV,sBAAO,IAAA,sCAAiB,EAAC,eAAe,EAAE,OAAO,CAAC,IAAI,aAAa,EAAC;wBACxE,CAAC;wBACD,sBAAO,eAAe,CAAC,CAAC,CAAC,EAAA;oBAC7B,CAAC;oBACD,sBAAO,aAAa,EAAC;;;;CACxB"}
+{"version":3,"file":"getNextLocale.js","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,sCA4CC;AA1DD,wCAAuC;AACvC,wCAAuC;AACvC,yDAAuF;AACvF,wDAAiF;AAEjF;;;;;;;;GAQG;AACH,SAAsB,aAAa;wDACjC,aAA0B,EAC1B,OAA8B;;QAD9B,8BAAA,EAAA,kBAA0B;;;wBAIS,qBAAM,OAAO,CAAC,GAAG,CAAC;wBACnD,IAAA,iBAAO,GAAE,EAAE,IAAA,iBAAO,GAAE;qBACrB,CAAC,EAAA;;oBAFI,KAA6B,SAEjC,EAFK,WAAW,QAAA,EAAE,WAAW,QAAA;oBAI3B,UAAU,GAAG,CAAC;;wBAEhB,IAAM,gBAAgB,GAAa,EAAE,CAAC;wBAEtC,mCAAmC;wBACnC,IAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;wBACvD,IAAI,YAAY;4BAAE,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;wBAEtD,IAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;wBACvD,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,EAAE,CAAC;4BACxB,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;wBAC5C,CAAC;wBAED,yCAAyC;wBACzC,IAAM,eAAe,GAAG,MAAA,WAAW;6BAChC,GAAG,CAAC,iBAAiB,CAAC,0CACrB,KAAK,CAAC,GAAG,EACV,GAAG,CAAC,UAAC,IAAI,YAAK,OAAA,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,0CAAG,CAAC,EAAE,IAAI,EAAE,CAAA,EAAA,CAAC,CAAC;wBAE9C,IAAI,eAAe;4BAAE,gBAAgB,CAAC,IAAI,OAArB,gBAAgB,EAAS,eAAe,EAAE;wBAE/D,sDAAsD;wBACtD,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;wBAErC,yCAAyC;wBACzC,IAAI,OAAO,EAAE,CAAC;4BACZ,OAAO,IAAA,oCAAe,EAAC,gBAAgB,EAAE,OAAO,CAAC,IAAI,aAAa,CAAC;wBACrE,CAAC;wBACD,4CAA4C;wBAC5C,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;oBAE7B,CAAC,CAAC,EAAE,CAAC;oBAEL,sBAAO,UAAU,EAAC;;;;CAEnB"}

package/dist/primitives/defaultInitGTProps.js

@@ -39,16 +39,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var internal_1 = require("gt-react/internal");
+var internal_1 = require("generaltranslation/internal");
 var getDefaultFromEnv_1 = __importDefault(require("../utils/getDefaultFromEnv"));
 exports.default = {
     apiKey: (0, getDefaultFromEnv_1.default)('GT_API_KEY'),
     projectID: (0, getDefaultFromEnv_1.default)('GT_PROJECT_ID'),
     baseURL: 'https://prod.gtx.dev',
-    cacheURL: internal_1.primitives.defaultCacheURL,
-    defaultLocale: internal_1.primitives.libraryDefaultLocale,
+    cacheURL: internal_1.defaultCacheURL,
+    defaultLocale: internal_1.libraryDefaultLocale,
     getLocale: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-        return [2 /*return*/, internal_1.primitives.libraryDefaultLocale];
+        return [2 /*return*/, internal_1.libraryDefaultLocale];
     }); }); },
     renderSettings: {
         method: "skeleton",

package/dist/primitives/defaultInitGTProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultInitGTProps.js","sourceRoot":"","sources":["../../src/primitives/defaultInitGTProps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA+C;AAC/C,iFAA2D;AAE3D,kBAAe;IACX,MAAM,EAAE,IAAA,2BAAiB,EAAC,YAAY,CAAC;IACvC,SAAS,EAAE,IAAA,2BAAiB,EAAC,eAAe,CAAC;IAC7C,OAAO,EAAE,sBAAsB;IAC/B,QAAQ,EAAE,qBAAU,CAAC,eAAe;IACpC,aAAa,EAAE,qBAAU,CAAC,oBAAoB;IAC9C,SAAS,EAAE;QAAY,sBAAA,qBAAU,CAAC,oBAAoB,EAAA;aAAA;IACtD,cAAc,EAAE;QACZ,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,IAAI;KAChB;IACD,WAAW,EAAE;QAAY,sBAAA,CAAC,EAAE,CAAC,EAAA;aAAA;IAC7B,sBAAsB,EAAE,CAAC;IACzB,cAAc,EAAE,IAAI;CACd,CAAC"}
+{"version":3,"file":"defaultInitGTProps.js","sourceRoot":"","sources":["../../src/primitives/defaultInitGTProps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAoF;AACpF,iFAA2D;AAE3D,kBAAe;IACX,MAAM,EAAE,IAAA,2BAAiB,EAAC,YAAY,CAAC;IACvC,SAAS,EAAE,IAAA,2BAAiB,EAAC,eAAe,CAAC;IAC7C,OAAO,EAAE,sBAAsB;IAC/B,QAAQ,EAAE,0BAAe;IACzB,aAAa,EAAE,+BAAoB;IACnC,SAAS,EAAE;QAAY,sBAAA,+BAAoB,EAAA;aAAA;IAC3C,cAAc,EAAE;QACZ,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,IAAI;KAChB;IACD,WAAW,EAAE;QAAY,sBAAA,CAAC,EAAE,CAAC,EAAA;aAAA;IAC7B,sBAAsB,EAAE,CAAC;IACzB,cAAc,EAAE,IAAI;CACd,CAAC"}

package/dist/provider/ClientProvider.d.ts

@@ -1,7 +1,8 @@
-export default function ClientProvider({ children, dictionary, translations, locale, defaultLocale, translationRequired }: {
+import { ClientDictionary, ClientTranslations } from './types';
+export default function ClientProvider({ children, dictionary, translations, locale, defaultLocale, translationRequired, }: {
     children: any;
-    dictionary: Record<string, any>;
-    translations: Record<string, any>;
+    dictionary: ClientDictionary;
+    translations: ClientTranslations;
     locale: string;
     defaultLocale: string;
     translationRequired: boolean;

package/dist/provider/ClientProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientProvider.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProvider.tsx"],"names":[],"mappings":"AASA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACnC,QAAQ,EACR,UAAU,EAAE,YAAY,EACxB,MAAM,EAAE,aAAa,EACrB,mBAAmB,EACtB,EAAE;IACC,QAAQ,EAAE,GAAG,CAAC;IACd,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,OAAO,CAAC;CAChC,2CAoFA"}
+{"version":3,"file":"ClientProvider.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProvider.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,MAAM,EACN,aAAa,EACb,mBAAmB,GACpB,EAAE;IACD,QAAQ,EAAE,GAAG,CAAC;IACd,UAAU,EAAE,gBAAgB,CAAC;IAC7B,YAAY,EAAE,kBAAkB,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,2CAoHA"}

package/dist/provider/ClientProvider.js

@@ -20,62 +20,74 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var client_1 = require("gt-react/client");
 var internal_1 = require("gt-react/internal");
+var internal_2 = require("gt-react/internal");
 var generaltranslation_1 = require("generaltranslation");
 var ClientResolver_1 = __importDefault(require("./ClientResolver"));
+var renderVariable_1 = __importDefault(require("../server/rendering/renderVariable"));
 // meant to be used inside the server-side <GTProvider>
 function ClientProvider(_a) {
     var children = _a.children, dictionary = _a.dictionary, translations = _a.translations, locale = _a.locale, defaultLocale = _a.defaultLocale, translationRequired = _a.translationRequired;
+    // For dictionaries
     var translate = (0, react_1.useCallback)(function (id, options, f) {
-        var _a;
         if (options === void 0) { options = {}; }
-        var _b = (0, internal_1.extractEntryMetadata)(dictionary[id]), entry = _b.entry, metadata = _b.metadata;
-        if (!entry) {
+        // Get the entry from the dictionary
+        var _a = (0, internal_2.extractEntryMetadata)(dictionary[id]), entry = _a.entry, metadata = _a.metadata;
+        if (typeof entry === 'undefined') {
             console.warn("Dictionary entry with id \"".concat(id, "\" is null or undefined"));
             return undefined;
         }
-        ;
-        if (metadata && metadata.isFunction) {
-            if (typeof f !== 'function') {
-                throw new Error("You're trying to call a function in the server dictionary on the client-side, but functions can't be passed directly from server to client. "
-                    + "Try including the function you want to call as a parameter in t(), like t(\"".concat(id, "\", ").concat(options ? JSON.stringify(options) : 'undefined', ", MyFunction)"));
+        // Handle functional entries
+        if (metadata === null || metadata === void 0 ? void 0 : metadata.isFunction) {
+            if (typeof f === 'function') {
+                entry = (0, internal_2.addGTIdentifier)(f(options));
+            }
+            else {
+                throw new Error("You're trying to call a function in the server dictionary on the client-side, but functions can't be passed directly from server to client. " +
+                    "Try including the function you want to call as a parameter in t(), like t(\"".concat(id, "\", ").concat(options ? JSON.stringify(options) : 'undefined', ", MyFunction)"));
             }
-            entry = (0, internal_1.addGTIdentifier)(f(options));
         }
+        ;
+        // Initialize and populate variables and variables' metadata
         var variables = options;
         var variablesOptions;
         if (metadata === null || metadata === void 0 ? void 0 : metadata.variablesOptions)
-            variablesOptions = __assign(__assign({}, variablesOptions || {}), metadata.variablesOptions);
+            variablesOptions = __assign(__assign({}, (variablesOptions || {})), metadata.variablesOptions);
         if (options.variablesOptions)
-            variablesOptions = __assign(__assign({}, variablesOptions || {}), options.variablesOptions);
+            variablesOptions = __assign(__assign({}, (variablesOptions || {})), options.variablesOptions);
+        // Handle string and content entries, if and !if translation required
         if (typeof entry === 'string') {
-            var translation_1 = ((_a = translations[id]) === null || _a === void 0 ? void 0 : _a.t) || entry;
-            return (0, generaltranslation_1.renderContentToString)(translationRequired ? translation_1 : entry, [locale, defaultLocale], variables, variablesOptions);
+            var content = translationRequired ? (translations[id] || entry) : entry;
+            return (0, generaltranslation_1.renderContentToString)(content, [locale, defaultLocale], variables, variablesOptions);
         }
-        ;
+        // Fallback if there is no translation present
         if (!translationRequired || !translations[id]) {
-            return (0, client_1._renderDefaultChildren)({
+            return (0, internal_1.renderDefaultChildren)({
                 children: entry,
                 variables: variables,
                 variablesOptions: variablesOptions,
-                defaultLocale: defaultLocale
+                defaultLocale: defaultLocale,
+                renderVariable: renderVariable_1.default
             });
         }
-        var renderTranslation = (function (translationEntry) {
-            return (0, client_1._renderTranslatedChildren)({
-                source: entry, target: translationEntry,
+        var renderTranslation = function (translationEntry) {
+            return (0, internal_1.renderTranslatedChildren)({
+                source: entry,
+                target: translationEntry,
                 variables: variables,
                 variablesOptions: variablesOptions,
-                locales: [locale, defaultLocale]
+                locales: [locale, defaultLocale],
+                renderVariable: renderVariable_1.default
             });
-        });
+        };
         var translation = translations[id];
         if (translation.promise) {
             if (!translation.errorFallback) {
-                translation.errorFallback = (0, client_1._renderDefaultChildren)({
+                translation.errorFallback = (0, internal_1.renderDefaultChildren)({
                     children: entry,
                     variables: variables,
                     variablesOptions: variablesOptions,
-                    defaultLocale: defaultLocale
+                    defaultLocale: defaultLocale,
+                    renderVariable: renderVariable_1.default
                 });
             }
             if (!translation.loadingFallback) {
@@ -83,14 +95,14 @@ function ClientProvider(_a) {
             }
             return ((0, jsx_runtime_1.jsx)(ClientResolver_1.default, { promise: translation.promise, renderTranslation: renderTranslation, errorFallback: translation.errorFallback, loadingFallback: translation.loadingFallback }));
         }
-        return renderTranslation(translation.t);
+        return renderTranslation(translation);
     }, [dictionary, translations]);
-    return ((0, jsx_runtime_1.jsx)(client_1._GTContext.Provider, { value: {
+    return ((0, jsx_runtime_1.jsx)(client_1.GTContext.Provider, { value: {
             translate: translate,
             locale: locale,
             defaultLocale: defaultLocale,
-            translations: translations
+            translations: translations,
+            translationRequired: translationRequired
         }, children: children }));
 }
-;
 //# sourceMappingURL=ClientProvider.js.map