gt-next 5.2.9-alpha.1 → 5.2.9-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config-dir/DictionaryManager.d.ts.map +1 -1
- package/dist/config-dir/DictionaryManager.js +3 -1
- package/dist/config-dir/DictionaryManager.js.map +1 -1
- package/dist/config-dir/TranslationManager.d.ts +7 -0
- package/dist/config-dir/TranslationManager.d.ts.map +1 -1
- package/dist/config-dir/TranslationManager.js +14 -4
- package/dist/config-dir/TranslationManager.js.map +1 -1
- package/dist/config.d.ts +0 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +6 -9
- package/dist/config.js.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +10 -55
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +1 -1
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +19 -8
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +5 -9
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/utils/constants.d.ts +0 -1
- package/dist/utils/constants.d.ts.map +1 -1
- package/dist/utils/constants.js +1 -2
- package/dist/utils/constants.js.map +1 -1
- package/package.json +1 -10
- package/dist/_routing.d.ts +0 -3
- package/dist/_routing.d.ts.map +0 -1
- package/dist/_routing.js +0 -6
- package/dist/_routing.js.map +0 -1
- package/dist/config-dir/gt-router.d.ts +0 -2
- package/dist/config-dir/gt-router.d.ts.map +0 -1
- package/dist/config-dir/gt-router.js +0 -8
- package/dist/config-dir/gt-router.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DictionaryManager.d.ts","sourceRoot":"","sources":["../../src/config-dir/DictionaryManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIrD;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,aAAa,CAAgC;IAErD;;;OAGG;;IAMH,cAAc,CACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACxB,SAAS,GAAE,MAAW,EACtB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAC/B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAmBtB;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"DictionaryManager.d.ts","sourceRoot":"","sources":["../../src/config-dir/DictionaryManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIrD;;GAEG;AACH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,aAAa,CAAgC;IAErD;;;OAGG;;IAMH,cAAc,CACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACxB,SAAS,GAAE,MAAW,EACtB,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAC/B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAmBtB;;;;OAIG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CA0B3E;AAED,QAAA,MAAM,iBAAiB,mBAA0B,CAAC;AAClD,eAAe,iBAAiB,CAAC"}
|
|
@@ -85,7 +85,9 @@ var DictionaryManager = /** @class */ (function () {
|
|
|
85
85
|
return __generator(this, function (_b) {
|
|
86
86
|
switch (_b.label) {
|
|
87
87
|
case 0:
|
|
88
|
-
reference =
|
|
88
|
+
reference = process.env._GENERALTRANSLATION_GT_SERVICES_ENABLED === 'true'
|
|
89
|
+
? (0, generaltranslation_1.standardizeLocale)(locale)
|
|
90
|
+
: locale;
|
|
89
91
|
result = this.dictionaryMap.get(reference);
|
|
90
92
|
if (result)
|
|
91
93
|
return [2 /*return*/, result];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DictionaryManager.js","sourceRoot":"","sources":["../../src/config-dir/DictionaryManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAuD;AAEvD,uGAA6E;AAC7E,uDAAqE;AAErE;;GAEG;AACH;IAGE;;;OAGG;IACH;QACE,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,iCAAiC;IACjC,0CAAc,GAAd,UACE,GAAwB,EACxB,SAAsB,EACtB,MAAgC;QADhC,0BAAA,EAAA,cAAsB;QACtB,uBAAA,EAAA,WAAgC;QAEhC,KAAK,IAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBACnD,IAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,UAAG,SAAS,cAAI,GAAG,CAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBACvD,IAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBACvB,IACE,KAAK,KAAK,IAAI;oBACd,OAAO,KAAK,KAAK,QAAQ;oBACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EACrB,CAAC;oBACD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACG,yCAAa,GAAnB,UAAoB,MAAc;;;;;;wBAC1B,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DictionaryManager.js","sourceRoot":"","sources":["../../src/config-dir/DictionaryManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAuD;AAEvD,uGAA6E;AAC7E,uDAAqE;AAErE;;GAEG;AACH;IAGE;;;OAGG;IACH;QACE,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,iCAAiC;IACjC,0CAAc,GAAd,UACE,GAAwB,EACxB,SAAsB,EACtB,MAAgC;QADhC,0BAAA,EAAA,cAAsB;QACtB,uBAAA,EAAA,WAAgC;QAEhC,KAAK,IAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;gBACnD,IAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,UAAG,SAAS,cAAI,GAAG,CAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBACvD,IAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBACvB,IACE,KAAK,KAAK,IAAI;oBACd,OAAO,KAAK,KAAK,QAAQ;oBACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EACrB,CAAC;oBACD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACG,yCAAa,GAAnB,UAAoB,MAAc;;;;;;wBAC1B,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,uCAAuC,KAAK,MAAM;4BAC5D,CAAC,CAAC,IAAA,sCAAiB,EAAC,MAAM,CAAC;4BAC3B,CAAC,CAAC,MAAM,CAAC;wBAGT,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;wBAC/C,IAAI,MAAM;4BAAE,sBAAO,MAAM,EAAC;wBAGpB,oBAAoB,GAAG,IAAA,qCAAuB,GAAE,CAAC;6BACnD,oBAAoB,EAApB,wBAAoB;;;;wBAEX,KAAA,IAAI,CAAC,cAAc,CAAA;wBAAC,qBAAM,oBAAoB,CAAC,SAAS,CAAC,EAAA;;wBAAlE,MAAM,GAAG,SAAA,IAAI,GAAgB,SAAqC,EAAC,CAAC;wBACpE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;;;;wBAE1C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;4BAC3C,OAAO,CAAC,IAAI,CAAC,IAAA,0CAA2B,EAAC,SAAS,CAAC,EAAE,OAAK,CAAC,CAAC;wBAC9D,CAAC;wBACD,sBAAO,SAAS,EAAC;4BAIrB,sBAAO,MAAM,EAAC;;;;KACf;IACH,wBAAC;AAAD,CAAC,AAlED,IAkEC;AAlEY,8CAAiB;AAoE9B,IAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAClD,kBAAe,iBAAiB,CAAC"}
|
|
@@ -22,11 +22,18 @@ export declare class TranslationManager {
|
|
|
22
22
|
private translationTimestamps;
|
|
23
23
|
private fetchPromises;
|
|
24
24
|
private requestedTranslations;
|
|
25
|
+
private gtServicesEnabled;
|
|
25
26
|
/**
|
|
26
27
|
* Creates an instance of TranslationManager.
|
|
27
28
|
* @constructor
|
|
28
29
|
*/
|
|
29
30
|
constructor();
|
|
31
|
+
/**
|
|
32
|
+
* Standardizes a locale if GT services are enabled.
|
|
33
|
+
* @param {string} locale - The locale to standardize.
|
|
34
|
+
* @returns {string} The standardized locale.
|
|
35
|
+
*/
|
|
36
|
+
_standardizeLocale(locale: string): string;
|
|
30
37
|
/**
|
|
31
38
|
* Sets the configuration for the TranslationManager.
|
|
32
39
|
* @param {Partial<TranslationManagerConfig>} newConfig - The new configuration to apply.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TranslationManager.d.ts","sourceRoot":"","sources":["../../src/config-dir/TranslationManager.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B;;;;;GAKG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;CACzD,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,aAAa,CAAuD;IAC5E,OAAO,CAAC,qBAAqB,CAAuB;
|
|
1
|
+
{"version":3,"file":"TranslationManager.d.ts","sourceRoot":"","sources":["../../src/config-dir/TranslationManager.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B;;;;;GAKG;AACH,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;CACzD,CAAC;AAEF;;GAEG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,eAAe,CAAkC;IACzD,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,aAAa,CAAuD;IAC5E,OAAO,CAAC,qBAAqB,CAAuB;IACpD,OAAO,CAAC,iBAAiB,CAAU;IACnC;;;OAGG;;IAiBH;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI1C;;;OAGG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAAG,IAAI;IAI7D;;;;OAIG;YACW,kBAAkB;IAahC;;;;OAIG;IACG,qBAAqB,CACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAiC1C;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAKrE;;;;;;OAMG;IACH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,kBAAkB,GAAG,kBAAkB,GAAG,gBAAgB,GACtE,OAAO;IAWV;;;OAGG;IACH,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK7C;;;;OAIG;IACH,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAIjD;AAED,QAAA,MAAM,kBAAkB,oBAA2B,CAAC;AACpD,eAAe,kBAAkB,CAAC"}
|
|
@@ -75,7 +75,17 @@ var TranslationManager = /** @class */ (function () {
|
|
|
75
75
|
this.translationTimestamps = new Map();
|
|
76
76
|
this.fetchPromises = new Map();
|
|
77
77
|
this.requestedTranslations = new Map();
|
|
78
|
+
this.gtServicesEnabled =
|
|
79
|
+
process.env._GENERALTRANSLATION_GT_SERVICES_ENABLED === 'true';
|
|
78
80
|
}
|
|
81
|
+
/**
|
|
82
|
+
* Standardizes a locale if GT services are enabled.
|
|
83
|
+
* @param {string} locale - The locale to standardize.
|
|
84
|
+
* @returns {string} The standardized locale.
|
|
85
|
+
*/
|
|
86
|
+
TranslationManager.prototype._standardizeLocale = function (locale) {
|
|
87
|
+
return this.gtServicesEnabled ? (0, generaltranslation_1.standardizeLocale)(locale) : locale;
|
|
88
|
+
};
|
|
79
89
|
/**
|
|
80
90
|
* Sets the configuration for the TranslationManager.
|
|
81
91
|
* @param {Partial<TranslationManagerConfig>} newConfig - The new configuration to apply.
|
|
@@ -116,7 +126,7 @@ var TranslationManager = /** @class */ (function () {
|
|
|
116
126
|
return __generator(this, function (_b) {
|
|
117
127
|
switch (_b.label) {
|
|
118
128
|
case 0:
|
|
119
|
-
reference =
|
|
129
|
+
reference = this._standardizeLocale(locale);
|
|
120
130
|
hasExpired = this.config.loadTranslationsType === 'remote' &&
|
|
121
131
|
this.translationsMap.has(reference) &&
|
|
122
132
|
Date.now() - ((_a = this.translationTimestamps.get(reference)) !== null && _a !== void 0 ? _a : 0) >
|
|
@@ -151,7 +161,7 @@ var TranslationManager = /** @class */ (function () {
|
|
|
151
161
|
* @returns {TranslationsObject | undefined} The translations data or undefined if not found.
|
|
152
162
|
*/
|
|
153
163
|
TranslationManager.prototype.getRecentTranslations = function (locale) {
|
|
154
|
-
var reference =
|
|
164
|
+
var reference = this._standardizeLocale(locale);
|
|
155
165
|
return this.translationsMap.get(reference);
|
|
156
166
|
};
|
|
157
167
|
/**
|
|
@@ -165,7 +175,7 @@ var TranslationManager = /** @class */ (function () {
|
|
|
165
175
|
var _a;
|
|
166
176
|
if (!(locale && hash && translation))
|
|
167
177
|
return false;
|
|
168
|
-
var reference =
|
|
178
|
+
var reference = this._standardizeLocale(locale);
|
|
169
179
|
var currentTranslations = this.translationsMap.get(reference) || {};
|
|
170
180
|
this.translationsMap.set(reference, __assign(__assign({}, currentTranslations), (_a = {}, _a[hash] = translation, _a)));
|
|
171
181
|
return true;
|
|
@@ -175,7 +185,7 @@ var TranslationManager = /** @class */ (function () {
|
|
|
175
185
|
* @param {string} locale - The locale code.
|
|
176
186
|
*/
|
|
177
187
|
TranslationManager.prototype.setTranslationRequested = function (locale) {
|
|
178
|
-
var reference =
|
|
188
|
+
var reference = this._standardizeLocale(locale);
|
|
179
189
|
this.requestedTranslations.set(reference, true);
|
|
180
190
|
};
|
|
181
191
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TranslationManager.js","sourceRoot":"","sources":["../../src/config-dir/TranslationManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAuD;AACvD,8FAAwE;AACxE,wDAA8D;AAO9D,sEAAiD;AAiBjD;;GAEG;AACH;IAOE;;;OAGG;IACH;QACE,IAAI,CAAC,MAAM,GAAG;YACZ,QAAQ,EAAE,0BAAe;YACzB,SAAS,EAAE,EAAE;YACb,UAAU,EAAE,SAAS;YACrB,kBAAkB,EAAE,IAAI;YACxB,eAAe,EAAE,kCAAwB,CAAC,eAAe;SAC1D,CAAC;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,qBAAqB,GAAG,IAAI,GAAG,EAAE,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,qBAAqB,GAAG,IAAI,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"TranslationManager.js","sourceRoot":"","sources":["../../src/config-dir/TranslationManager.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAarE
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAarE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,UAAU,GAAE,GAAQ,EACpB,KAAK,GAAE,iBAAsB,OAgS9B;AAGD,eAAO,MAAM,MAAM,UAAW,iBAAiB,kBAAkB,GAAG,QACnC,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
23
23
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.initGT =
|
|
26
|
+
exports.initGT = void 0;
|
|
27
27
|
exports.withGTConfig = withGTConfig;
|
|
28
28
|
var path_1 = __importDefault(require("path"));
|
|
29
29
|
var fs_1 = __importDefault(require("fs"));
|
|
@@ -31,8 +31,6 @@ var defaultWithGTConfigProps_1 = __importDefault(require("./config-dir/props/def
|
|
|
31
31
|
var createErrors_1 = require("./errors/createErrors");
|
|
32
32
|
var supported_locales_1 = require("@generaltranslation/supported-locales");
|
|
33
33
|
var generaltranslation_1 = require("generaltranslation");
|
|
34
|
-
var gt_router_1 = __importDefault(require("./config-dir/gt-router"));
|
|
35
|
-
exports.GTRouter = gt_router_1.default;
|
|
36
34
|
/**
|
|
37
35
|
* Initializes General Translation settings for a Next.js application.
|
|
38
36
|
*
|
|
@@ -151,16 +149,15 @@ function withGTConfig(nextConfig, props) {
|
|
|
151
149
|
(process.env.NODE_ENV === 'development' && mergedConfig.devApiKey));
|
|
152
150
|
var gtRemoteCacheEnabled = mergedConfig.cacheUrl === defaultWithGTConfigProps_1.default.cacheUrl &&
|
|
153
151
|
mergedConfig.loadTranslationsType === 'remote';
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
mergedConfig.projectId;
|
|
152
|
+
var gtServicesEnabled = (gtRuntimeTranslationEnabled || gtRemoteCacheEnabled) &&
|
|
153
|
+
mergedConfig.projectId;
|
|
157
154
|
// Standardize locales
|
|
158
155
|
if (mergedConfig.locales && mergedConfig.defaultLocale) {
|
|
159
156
|
mergedConfig.locales.unshift(mergedConfig.defaultLocale);
|
|
160
157
|
}
|
|
161
158
|
var updatedLocales = [];
|
|
162
159
|
mergedConfig.locales = Array.from(new Set(mergedConfig.locales)).map(function (locale) {
|
|
163
|
-
var updatedLocale =
|
|
160
|
+
var updatedLocale = gtServicesEnabled
|
|
164
161
|
? (0, generaltranslation_1.standardizeLocale)(locale)
|
|
165
162
|
: locale;
|
|
166
163
|
if (updatedLocale !== locale) {
|
|
@@ -216,7 +213,7 @@ function withGTConfig(nextConfig, props) {
|
|
|
216
213
|
console.warn(createErrors_1.APIKeyMissingWarn);
|
|
217
214
|
}
|
|
218
215
|
// Check: if using GT infrastructure, warn about unsupported locales
|
|
219
|
-
if (
|
|
216
|
+
if (gtServicesEnabled) {
|
|
220
217
|
// Warn about standardized locales
|
|
221
218
|
if (updatedLocales.length) {
|
|
222
219
|
console.warn((0, createErrors_1.standardizedLocalesWarning)(updatedLocales));
|
|
@@ -231,7 +228,7 @@ function withGTConfig(nextConfig, props) {
|
|
|
231
228
|
var I18NConfigParams = JSON.stringify(mergedConfig);
|
|
232
229
|
return __assign(__assign({}, nextConfig), { env: __assign(__assign(__assign(__assign({}, nextConfig.env), { _GENERALTRANSLATION_I18N_CONFIG_PARAMS: I18NConfigParams }), (resolvedDictionaryFilePathType && {
|
|
233
230
|
_GENERALTRANSLATION_DICTIONARY_FILE_TYPE: resolvedDictionaryFilePathType,
|
|
234
|
-
})), { _GENERALTRANSLATION_LOCAL_DICTIONARY_ENABLED: mergedConfig.loadDictionaryEnabled.toString(), _GENERALTRANSLATION_LOCAL_TRANSLATION_ENABLED: (mergedConfig.loadTranslationsType === 'custom').toString(), _GENERALTRANSLATION_DEFAULT_LOCALE: (mergedConfig.defaultLocale || defaultWithGTConfigProps_1.default.defaultLocale).toString() }), experimental: __assign(__assign({}, nextConfig.experimental), (process.env.TURBOPACK === '1' || ((_c = nextConfig.experimental) === null || _c === void 0 ? void 0 : _c.turbo)
|
|
231
|
+
})), { _GENERALTRANSLATION_LOCAL_DICTIONARY_ENABLED: mergedConfig.loadDictionaryEnabled.toString(), _GENERALTRANSLATION_LOCAL_TRANSLATION_ENABLED: (mergedConfig.loadTranslationsType === 'custom').toString(), _GENERALTRANSLATION_DEFAULT_LOCALE: (mergedConfig.defaultLocale || defaultWithGTConfigProps_1.default.defaultLocale).toString(), _GENERALTRANSLATION_GT_SERVICES_ENABLED: gtServicesEnabled.toString() }), experimental: __assign(__assign({}, nextConfig.experimental), (process.env.TURBOPACK === '1' || ((_c = nextConfig.experimental) === null || _c === void 0 ? void 0 : _c.turbo)
|
|
235
232
|
? {
|
|
236
233
|
turbo: __assign(__assign({}, (((_d = nextConfig.experimental) === null || _d === void 0 ? void 0 : _d.turbo) || {})), { resolveAlias: __assign(__assign({}, (((_f = (_e = nextConfig.experimental) === null || _e === void 0 ? void 0 : _e.turbo) === null || _f === void 0 ? void 0 : _f.resolveAlias) || {})), { 'gt-next/_dictionary': resolvedDictionaryFilePath || '', 'gt-next/_load-translations': customLoadTranslationsPath || '', 'gt-next/_load-dictionary': customLoadDictionaryPath || '', 'gt-next/_routing': customRouterPath || '' }) }),
|
|
237
234
|
}
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,EACL,UAAU,EAMX,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAoB,EACpB,mBAA2B,EAC3B,UAAe,GAChB,EAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,SAsE8B,WAAW,2BAmKzC"}
|
|
@@ -32,7 +32,7 @@ function createNextMiddleware(_a) {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
// using gt services
|
|
35
|
-
var gtServicesEnabled =
|
|
35
|
+
var gtServicesEnabled = process.env._GENERALTRANSLATION_GT_SERVICES_ENABLED === 'true';
|
|
36
36
|
// i18n config
|
|
37
37
|
var defaultLocale = (envParams === null || envParams === void 0 ? void 0 : envParams.defaultLocale) || internal_1.libraryDefaultLocale;
|
|
38
38
|
var locales = (envParams === null || envParams === void 0 ? void 0 : envParams.locales) || [defaultLocale];
|
|
@@ -61,7 +61,6 @@ function createNextMiddleware(_a) {
|
|
|
61
61
|
}, {});
|
|
62
62
|
// Create the path mapping
|
|
63
63
|
var pathToSharedPath = (0, utils_1.createPathToSharedPathMap)(pathConfig);
|
|
64
|
-
// console.log(pathToSharedPath);
|
|
65
64
|
/**
|
|
66
65
|
* Processes the incoming request to determine the user's locale and sets a locale cookie.
|
|
67
66
|
* Optionally redirects the user based on the locale if locale-based routing is enabled.
|
|
@@ -76,7 +75,6 @@ function createNextMiddleware(_a) {
|
|
|
76
75
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
77
76
|
*/
|
|
78
77
|
function nextMiddleware(req) {
|
|
79
|
-
// console.log('--------------------------------');
|
|
80
78
|
var headerList = new Headers(req.headers);
|
|
81
79
|
var res = server_1.NextResponse.next({
|
|
82
80
|
request: {
|
|
@@ -84,18 +82,8 @@ function createNextMiddleware(_a) {
|
|
|
84
82
|
headers: headerList,
|
|
85
83
|
},
|
|
86
84
|
});
|
|
87
|
-
// routing
|
|
88
|
-
var routingConfig;
|
|
89
|
-
try {
|
|
90
|
-
routingConfig = require('gt-next/_routing');
|
|
91
|
-
}
|
|
92
|
-
catch (e) {
|
|
93
|
-
console.error(e);
|
|
94
|
-
}
|
|
95
|
-
// Check for rewrite flag in cookies
|
|
96
|
-
var rewriteFlag = req.headers.get(constants_1.middlewareLocaleRewriteFlagName) === 'true';
|
|
97
85
|
// ---------- LOCALE DETECTION ---------- //
|
|
98
|
-
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale;
|
|
86
|
+
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale;
|
|
99
87
|
res.headers.set(internal_1.localeHeaderName, userLocale);
|
|
100
88
|
if (userLocale) {
|
|
101
89
|
res.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
@@ -103,7 +91,7 @@ function createNextMiddleware(_a) {
|
|
|
103
91
|
if (localeRouting) {
|
|
104
92
|
// ---------- GET PATHS ---------- //
|
|
105
93
|
var pathname = req.nextUrl.pathname;
|
|
106
|
-
// Only strip off the locale if it's a valid locale (/fr/
|
|
94
|
+
// Only strip off the locale if it's a valid locale (/fr/fr-about -> /about), (/blog -> /blog)
|
|
107
95
|
var unprefixedPathname = pathnameLocale
|
|
108
96
|
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), '')
|
|
109
97
|
: pathname;
|
|
@@ -114,45 +102,26 @@ function createNextMiddleware(_a) {
|
|
|
114
102
|
: pathname;
|
|
115
103
|
// Get the shared path for the unprefixed pathname
|
|
116
104
|
var sharedPath = (0, utils_1.getSharedPath)(unprefixedPathname, pathToSharedPath);
|
|
117
|
-
// Localized path (/en-US/blog, /fr/
|
|
105
|
+
// Localized path (/en-US/blog, /fr/fr-about, /fr/dashboard/[id]/custom)
|
|
118
106
|
var localizedPath = sharedPath && (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig);
|
|
119
|
-
// Combine localized path with dynamic parameters (/en-US/blog, /fr/
|
|
107
|
+
// Combine localized path with dynamic parameters (/en-US/blog, /fr/fr-about, /fr/dashboard/1/fr-custom)
|
|
120
108
|
var localizedPathWithParameters = localizedPath &&
|
|
121
109
|
(0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
122
110
|
? standardizedPathname
|
|
123
111
|
: "/".concat(userLocale).concat(standardizedPathname), localizedPath);
|
|
124
|
-
// console.log('pathname', pathname);
|
|
125
|
-
// console.log('unprefixedPathname', unprefixedPathname);
|
|
126
|
-
// console.log('standardizedPathname', standardizedPathname);
|
|
127
|
-
// console.log('sharedPath', sharedPath);
|
|
128
|
-
// console.log('localizedPath', localizedPath);
|
|
129
|
-
// console.log('localizedPathWithParameters', localizedPathWithParameters);
|
|
130
112
|
// ---------- ROUTING LOGIC ---------- //
|
|
131
113
|
// BASE CASE: default locale, same path (/en-US/blog -> /en-US/blog), (/en-US/dashboard/1/custom -> /en-US/dashboard/1/custom)
|
|
132
114
|
if (localizedPathWithParameters &&
|
|
133
115
|
standardizedPathname === localizedPathWithParameters &&
|
|
134
116
|
userLocale === defaultLocale) {
|
|
135
|
-
// console.log(
|
|
136
|
-
// `[Middleware] Default locale path match: ${pathname} -> ${localizedPathWithParameters}`
|
|
137
|
-
// );
|
|
138
117
|
return res;
|
|
139
118
|
}
|
|
140
119
|
// BASE CASE: at localized path, which is the same as the shared path (/fil/blog -> /fil/blog)
|
|
141
120
|
if (pathname === localizedPathWithParameters &&
|
|
142
121
|
"/".concat(userLocale).concat(sharedPath) === localizedPathWithParameters) {
|
|
143
|
-
// console.log(
|
|
144
|
-
// `[Middleware] Localized path match: ${pathname} -> ${localizedPathWithParameters}`
|
|
145
|
-
// );
|
|
146
|
-
return res;
|
|
147
|
-
}
|
|
148
|
-
// If we've already rewritten this path, don't process it again
|
|
149
|
-
if (rewriteFlag) {
|
|
150
|
-
// console.log(
|
|
151
|
-
// `[Middleware] Already rewritten path: ${pathname} (skipping)`
|
|
152
|
-
// );
|
|
153
122
|
return res;
|
|
154
123
|
}
|
|
155
|
-
// REWRITE CASE: proxies a localized path, same locale (/fr/
|
|
124
|
+
// REWRITE CASE: proxies a localized path, same locale (/fr/fr-about => /fr/about) (/fr/dashboard/1/fr-custom => /fr/dashboard/1/custom)
|
|
156
125
|
if (localizedPathWithParameters &&
|
|
157
126
|
standardizedPathname === localizedPathWithParameters) {
|
|
158
127
|
// convert to shared path with dynamic parameters
|
|
@@ -163,13 +132,10 @@ function createNextMiddleware(_a) {
|
|
|
163
132
|
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
164
133
|
headers: headerList,
|
|
165
134
|
});
|
|
166
|
-
response.headers.set(
|
|
135
|
+
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
167
136
|
if (userLocale) {
|
|
168
137
|
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
169
138
|
}
|
|
170
|
-
// console.log(
|
|
171
|
-
// `[Middleware] Rewrite localized path: ${pathname} -> ${rewritePath}`
|
|
172
|
-
// );
|
|
173
139
|
return response;
|
|
174
140
|
}
|
|
175
141
|
// REWRITE CASE: no locale prefix
|
|
@@ -182,14 +148,11 @@ function createNextMiddleware(_a) {
|
|
|
182
148
|
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
183
149
|
headers: headerList,
|
|
184
150
|
});
|
|
185
|
-
response.headers.set(
|
|
186
|
-
// console.log(
|
|
187
|
-
// `[Middleware] Rewrite no locale prefix: ${pathname} -> ${rewritePath}`
|
|
188
|
-
// );
|
|
151
|
+
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
189
152
|
return response;
|
|
190
153
|
}
|
|
191
154
|
// REDIRECT CASE: non-i18n path
|
|
192
|
-
// 1. use customized path if it exists (/en-US/about -> /fr/
|
|
155
|
+
// 1. use customized path if it exists (/en-US/about -> /fr/fr-about), (/about -> /fr/fr-about)
|
|
193
156
|
// 2. otherwise, if pathname has locale prefix, replace it (/en-US/welcome -> /fr/welcome)
|
|
194
157
|
// 3. otherwise, prefix with locale (/welcome -> /fr/welcome)
|
|
195
158
|
if (unstandardizedPathnameLocale !== userLocale) {
|
|
@@ -204,12 +167,9 @@ function createNextMiddleware(_a) {
|
|
|
204
167
|
if (userLocale) {
|
|
205
168
|
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
206
169
|
}
|
|
207
|
-
// console.log(
|
|
208
|
-
// `[Middleware] Redirect non-i18n path: ${pathname} -> ${redirectPath}`
|
|
209
|
-
// );
|
|
210
170
|
return response;
|
|
211
171
|
}
|
|
212
|
-
// REDIRECT CASE: mismatched localized path (/fr/about -> /fr/
|
|
172
|
+
// REDIRECT CASE: mismatched localized path (/fr/about -> /fr/fr-about), mismatched dynamic path (/fr/dashboard/1/custom -> /fr/dashboard/1/fr-custom)
|
|
213
173
|
if (localizedPathWithParameters) {
|
|
214
174
|
var redirectUrl = new URL(localizedPathWithParameters, originalUrl);
|
|
215
175
|
redirectUrl.search = originalUrl.search;
|
|
@@ -217,16 +177,11 @@ function createNextMiddleware(_a) {
|
|
|
217
177
|
if (userLocale) {
|
|
218
178
|
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
219
179
|
}
|
|
220
|
-
// console.log(
|
|
221
|
-
// `[Middleware] Redirect mismatched path: ${pathname} -> ${localizedPathWithParameters}`
|
|
222
|
-
// );
|
|
223
180
|
return response;
|
|
224
181
|
}
|
|
225
182
|
// BASE CASE
|
|
226
|
-
// console.log(`[Middleware] No transformation needed: ${pathname}`);
|
|
227
183
|
return res;
|
|
228
184
|
}
|
|
229
|
-
// console.log(`[Middleware] No locale routing: ${req.nextUrl.pathname}`);
|
|
230
185
|
return res;
|
|
231
186
|
}
|
|
232
187
|
return nextMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export declare function createPathToSharedPathMap(pathConfig: PathConfig): {
|
|
|
35
35
|
/**
|
|
36
36
|
* Gets the locale from the request using various sources
|
|
37
37
|
*/
|
|
38
|
-
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean): {
|
|
38
|
+
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean, gtServicesEnabled: boolean): {
|
|
39
39
|
userLocale: string;
|
|
40
40
|
pathnameLocale: string | undefined;
|
|
41
41
|
unstandardizedPathnameLocale: string | null | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAiB1C,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACnD,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG7D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC1C,MAAM,GAAG,SAAS,CAkBpB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GACnB,MAAM,CASR;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAapB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,UAAU,GAAG;IACjE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAuBA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,WAAW,EAChB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,OAAO,EACtB,iBAAiB,EAAE,OAAO,GACzB;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,4BAA4B,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACzD,CAyEA"}
|
|
@@ -111,8 +111,8 @@ function createPathToSharedPathMap(pathConfig) {
|
|
|
111
111
|
/**
|
|
112
112
|
* Gets the locale from the request using various sources
|
|
113
113
|
*/
|
|
114
|
-
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting) {
|
|
115
|
-
var _a, _b;
|
|
114
|
+
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled) {
|
|
115
|
+
var _a, _b, _c;
|
|
116
116
|
var headerList = new Headers(req.headers);
|
|
117
117
|
var candidates = [];
|
|
118
118
|
// Check pathname locales
|
|
@@ -120,8 +120,10 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
120
120
|
var pathname = req.nextUrl.pathname;
|
|
121
121
|
if (localeRouting) {
|
|
122
122
|
unstandardizedPathnameLocale = extractLocale(pathname);
|
|
123
|
-
var extractedLocale =
|
|
124
|
-
|
|
123
|
+
var extractedLocale = gtServicesEnabled
|
|
124
|
+
? (0, generaltranslation_1.standardizeLocale)(unstandardizedPathnameLocale || '')
|
|
125
|
+
: unstandardizedPathnameLocale;
|
|
126
|
+
if (extractedLocale && (0, generaltranslation_1.isValidLocale)(extractedLocale)) {
|
|
125
127
|
pathnameLocale = extractedLocale;
|
|
126
128
|
candidates.push(pathnameLocale);
|
|
127
129
|
}
|
|
@@ -148,15 +150,24 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
148
150
|
candidates.push(refererLocale || '');
|
|
149
151
|
}
|
|
150
152
|
}
|
|
153
|
+
// Check middleware cookie locale
|
|
154
|
+
var middlewareCookieLocale = !unstandardizedPathnameLocale &&
|
|
155
|
+
((_b = req.cookies.get(constants_1.middlewareLocaleName)) === null || _b === void 0 ? void 0 : _b.value);
|
|
156
|
+
if (middlewareCookieLocale && (0, generaltranslation_1.isValidLocale)(middlewareCookieLocale)) {
|
|
157
|
+
candidates.push(middlewareCookieLocale);
|
|
158
|
+
}
|
|
151
159
|
// Get locales from accept-language header
|
|
152
|
-
var acceptedLocales = ((
|
|
153
|
-
.get('accept-language')) === null ||
|
|
160
|
+
var acceptedLocales = ((_c = headerList
|
|
161
|
+
.get('accept-language')) === null || _c === void 0 ? void 0 : _c.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); })) || [];
|
|
154
162
|
candidates.push.apply(candidates, acceptedLocales);
|
|
155
163
|
// Get default locale
|
|
156
164
|
candidates.push(defaultLocale);
|
|
157
165
|
// determine userLocale
|
|
158
|
-
var
|
|
159
|
-
defaultLocale
|
|
166
|
+
var unstandardizedUserLocale = (0, generaltranslation_1.determineLocale)(candidates.filter(generaltranslation_1.isValidLocale), approvedLocales) ||
|
|
167
|
+
defaultLocale;
|
|
168
|
+
var userLocale = gtServicesEnabled
|
|
169
|
+
? (0, generaltranslation_1.standardizeLocale)(unstandardizedUserLocale)
|
|
170
|
+
: unstandardizedUserLocale;
|
|
160
171
|
return {
|
|
161
172
|
userLocale: userLocale,
|
|
162
173
|
pathnameLocale: pathnameLocale,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientProviderWrapper.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ClientProviderWrapper.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAQxD,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,2CA2BnD"}
|
|
@@ -29,19 +29,15 @@ function ClientProvider(props) {
|
|
|
29
29
|
// When nav to same route but in diff locale, client components were cached and not re-rendered
|
|
30
30
|
var pathname = (0, navigation_1.usePathname)();
|
|
31
31
|
(0, react_1.useEffect)(function () {
|
|
32
|
-
var _a
|
|
32
|
+
var _a;
|
|
33
33
|
var newLocale = (_a = document.cookie
|
|
34
34
|
.split('; ')
|
|
35
35
|
.find(function (row) { return row.startsWith("".concat(constants_1.middlewareLocaleName, "=")); })) === null || _a === void 0 ? void 0 : _a.split('=')[1];
|
|
36
36
|
if (newLocale && newLocale !== props.locale) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
router.refresh();
|
|
42
|
-
// reload client
|
|
43
|
-
window.location.reload();
|
|
44
|
-
}
|
|
37
|
+
// reload server
|
|
38
|
+
router.refresh();
|
|
39
|
+
// reload client
|
|
40
|
+
window.location.reload();
|
|
45
41
|
}
|
|
46
42
|
}, [pathname]); // Re-run when pathname changes
|
|
47
43
|
return (0, jsx_runtime_1.jsx)(client_1.ClientProvider, __assign({ onLocaleChange: onLocaleChange }, props));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientProviderWrapper.js","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ClientProviderWrapper.js","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;;;;;;;;;;;AAUb,iCA4BC;;AArCD,0CAAoE;AAEpE,8CAAyD;AACzD,+BAAkC;AAClC,gDAG4B;AAE5B,SAAwB,cAAc,CACpC,KAAkD;IAElD,+CAA+C;IAC/C,IAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAC;IAC3B,IAAM,cAAc,GAAG;QACrB,QAAQ,CAAC,MAAM,GAAG,UAAG,yCAA6B,iBAAc,CAAC;QACjE,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC,CAAC;IAEF,0CAA0C;IAC1C,+FAA+F;IAC/F,IAAM,QAAQ,GAAG,IAAA,wBAAW,GAAE,CAAC;IAC/B,IAAA,iBAAS,EAAC;;QACR,IAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,MAAM;aAC9B,KAAK,CAAC,IAAI,CAAC;aACX,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,UAAU,CAAC,UAAG,gCAAoB,MAAG,CAAC,EAA1C,CAA0C,CAAC,0CACxD,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAClB,IAAI,SAAS,IAAI,SAAS,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;YAC5C,gBAAgB;YAChB,MAAM,CAAC,OAAO,EAAE,CAAC;YAEjB,gBAAgB;YAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,+BAA+B;IAE/C,OAAO,uBAAC,uBAAe,aAAC,cAAc,EAAE,cAAc,IAAM,KAAK,EAAI,CAAC;AACxE,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export declare const middlewareLocaleRewriteFlagName = "generaltranslation.middleware.locale-rewrite";
|
|
2
1
|
export declare const middlewareLocaleName = "generaltranslation.middleware.locale";
|
|
3
2
|
export declare const middlewareLocaleResetFlagName = "generaltranslation.middleware.locale-reset";
|
|
4
3
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,yCAAyC,CAAC;AAC3E,eAAO,MAAM,6BAA6B,+CACI,CAAC"}
|
package/dist/utils/constants.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.middlewareLocaleResetFlagName = exports.middlewareLocaleName =
|
|
4
|
-
exports.middlewareLocaleRewriteFlagName = 'generaltranslation.middleware.locale-rewrite';
|
|
3
|
+
exports.middlewareLocaleResetFlagName = exports.middlewareLocaleName = void 0;
|
|
5
4
|
exports.middlewareLocaleName = 'generaltranslation.middleware.locale';
|
|
6
5
|
exports.middlewareLocaleResetFlagName = 'generaltranslation.middleware.locale-reset';
|
|
7
6
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,oBAAoB,GAAG,sCAAsC,CAAC;AAC9D,QAAA,6BAA6B,GACxC,4CAA4C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "5.2.9-alpha.
|
|
3
|
+
"version": "5.2.9-alpha.2",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
@@ -66,9 +66,6 @@
|
|
|
66
66
|
"./_request": {
|
|
67
67
|
"default": "./dist/_request.js"
|
|
68
68
|
},
|
|
69
|
-
"./routing": {
|
|
70
|
-
"default": "./dist/_routing.js"
|
|
71
|
-
},
|
|
72
69
|
"./_dictionary": {
|
|
73
70
|
"default": "./dist/_dictionary.js"
|
|
74
71
|
},
|
|
@@ -96,9 +93,6 @@
|
|
|
96
93
|
"_request": [
|
|
97
94
|
"./dist/_request.d.ts"
|
|
98
95
|
],
|
|
99
|
-
"_routing": [
|
|
100
|
-
"./dist/_routing.d.ts"
|
|
101
|
-
],
|
|
102
96
|
"_dictionary": [
|
|
103
97
|
"./dist/_dictionary.d.ts"
|
|
104
98
|
],
|
|
@@ -128,9 +122,6 @@
|
|
|
128
122
|
"gt-next/_request": [
|
|
129
123
|
"/dist/_request"
|
|
130
124
|
],
|
|
131
|
-
"gt-next/_routing": [
|
|
132
|
-
"./dist/_routing.d.ts"
|
|
133
|
-
],
|
|
134
125
|
"gt-next/_dictionary": [
|
|
135
126
|
"/dist/_dictionary"
|
|
136
127
|
],
|
package/dist/_routing.d.ts
DELETED
package/dist/_routing.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"_routing.d.ts","sourceRoot":"","sources":["../src/_routing.ts"],"names":[],"mappings":";AAIA,wBAAkB"}
|
package/dist/_routing.js
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
// hidden internal route
|
|
4
|
-
throw new Error("Something has gone seriously wrong if you're seeing this error message. Check docs.generaltranslation.com for the latest documentation and make sure you've got the library configured properly.");
|
|
5
|
-
exports.default = {};
|
|
6
|
-
//# sourceMappingURL=_routing.js.map
|
package/dist/_routing.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"_routing.js","sourceRoot":"","sources":["../src/_routing.ts"],"names":[],"mappings":";;AAAA,wBAAwB;AACxB,MAAM,IAAI,KAAK,CACb,kMAAkM,CACnM,CAAC;AACF,kBAAe,EAAE,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"gt-router.d.ts","sourceRoot":"","sources":["../../src/config-dir/gt-router.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,KAAK,EAAE,GAAG,OAG1C"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"gt-router.js","sourceRoot":"","sources":["../../src/config-dir/gt-router.ts"],"names":[],"mappings":";;AAAA,2BAGC;AAHD,SAAwB,QAAQ,CAAC,KAAU;IACzC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1B,OAAO,KAAK,CAAC;AACf,CAAC"}
|