gt-next 5.2.9-alpha.0 → 5.2.9-alpha.1
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/loadTranslation.d.ts.map +1 -1
- package/dist/config-dir/loadTranslation.js +1 -1
- package/dist/config-dir/loadTranslation.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +30 -12
- package/dist/config.js.map +1 -1
- package/dist/errors/createErrors.d.ts +1 -0
- package/dist/errors/createErrors.d.ts.map +1 -1
- package/dist/errors/createErrors.js +5 -1
- package/dist/errors/createErrors.js.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts +1 -6
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +87 -268
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +43 -0
- package/dist/middleware-dir/utils.d.ts.map +1 -0
- package/dist/middleware-dir/utils.js +166 -0
- package/dist/middleware-dir/utils.js.map +1 -0
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +4 -9
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/utils/constants.d.ts +4 -0
- package/dist/utils/constants.d.ts.map +1 -0
- package/dist/utils/constants.js +7 -0
- package/dist/utils/constants.js.map +1 -0
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadTranslation.d.ts","sourceRoot":"","sources":["../../src/config-dir/loadTranslation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"loadTranslation.d.ts","sourceRoot":"","sources":["../../src/config-dir/loadTranslation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAOvD,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAsBF;;;;;;GAMG;AACH,wBAA8B,gBAAgB,CAC5C,KAAK,EAAE,2BAA2B,GACjC,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA+CzC"}
|
|
@@ -90,7 +90,7 @@ function loadTranslations(props) {
|
|
|
90
90
|
return [2 /*return*/, parseResult(result)];
|
|
91
91
|
case 2:
|
|
92
92
|
error_1 = _a.sent();
|
|
93
|
-
console.error((0, createErrors_1.customLoadTranslationsError)(), error_1);
|
|
93
|
+
console.error((0, createErrors_1.customLoadTranslationsError)(_props.targetLocale), error_1);
|
|
94
94
|
return [2 /*return*/, undefined];
|
|
95
95
|
case 3: return [2 /*return*/];
|
|
96
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadTranslation.js","sourceRoot":"","sources":["../../src/config-dir/loadTranslation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"loadTranslation.js","sourceRoot":"","sources":["../../src/config-dir/loadTranslation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCA,mCAiDC;AAzFD,uDAGgC;AAChC,iGAA2E;AAS3E,IAAI,wBAEa,CAAC;AAElB,6CAA6C;AAC7C,SAAS,WAAW,CAAC,MAAW;IAC9B,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QACzC,eAAe;QACf,IAAM,YAAY,GAAuB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACpE,UAAC,eAAmC,EAAE,EAA6B;gBAA5B,IAAI,QAAA,EAAE,MAAM,QAAA;YACjD,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,QAAA,EAAE,CAAC;YACrD,OAAO,eAAe,CAAC;QACzB,CAAC,EACD,EAAE,CACH,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,SAA8B,gBAAgB,CAC5C,KAAkC;;;;;;;yBAG9B,wBAAwB,EAAxB,wBAAwB;oBAAS,qBAAM,wBAAwB,CAAC,KAAK,CAAC,EAAA;wBAA5C,sBAAO,SAAqC,EAAC;;oBAKrE,sBAAsB,GAAG,IAAA,kCAAwB,GAAE,CAAC;oBAE1D,IAAI,sBAAsB,EAAE,CAAC;wBAC3B,iDAAiD;wBAEjD,gCAAgC;wBAChC,wBAAwB,GAAG,UAAO,MAAmC;;;;;;wCAGlD,qBAAM,sBAAsB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAA;;wCAA1D,MAAM,GAAG,SAAiD;wCAChE,sBAAO,WAAW,CAAC,MAAM,CAAC,EAAC;;;wCAE3B,OAAO,CAAC,KAAK,CAAC,IAAA,0CAA2B,EAAC,MAAM,CAAC,YAAY,CAAC,EAAE,OAAK,CAAC,CAAC;wCACvE,sBAAO,SAAS,EAAC;;;;6BAEpB,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,2CAA2C;wBAE3C,2CAA2C;wBAC3C,wBAAwB,GAAG,UACzB,MAAmC;;;;;;wCAGhB,qBAAM,KAAK,CAC1B,UAAG,MAAM,CAAC,QAAQ,cAAI,MAAM,CAAC,SAAS,cAAI,MAAM,CAAC,YAAY,SAC3D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,WAAI,MAAM,CAAC,UAAU,CAAE,CAAC,CAAC,CAAC,EAAE,CAChD,CACH,EAAA;;wCAJK,QAAQ,GAAG,SAIhB;wCACc,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;wCAA9B,MAAM,GAAG,SAAqB;wCACpC,sBAAO,WAAW,CAAC,MAAM,CAAC,EAAC;;;wCAE3B,OAAO,CAAC,KAAK,CAAC,sCAAuB,EAAE,OAAK,CAAC,CAAC;wCAC9C,sBAAO,SAAS,EAAC;;;;6BAEpB,CAAC;oBACJ,CAAC;oBAGM,qBAAM,wBAAwB,CAAC,KAAK,CAAC,EAAA;;gBAD5C,sBAAsB;gBACtB,sBAAO,SAAqC,EAAC;;;;CAC9C"}
|
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;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAarE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,CAAC;AAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,UAAU,GAAE,GAAQ,EACpB,KAAK,GAAE,iBAAsB,OA+R9B;AAGD,eAAO,MAAM,MAAM,UAAW,iBAAiB,kBAAkB,GAAG,QACnC,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -107,11 +107,6 @@ function withGTConfig(nextConfig, props) {
|
|
|
107
107
|
// ---------- MERGE CONFIGS ---------- //
|
|
108
108
|
// precedence: input > env > config file > defaults
|
|
109
109
|
var mergedConfig = __assign(__assign(__assign(__assign(__assign({}, defaultWithGTConfigProps_1.default), loadedConfig), envConfig), props), { _usingPlugin: true });
|
|
110
|
-
// ----------- LOCALE STANDARDIZATION ----------- //
|
|
111
|
-
if (mergedConfig.locales && mergedConfig.defaultLocale) {
|
|
112
|
-
mergedConfig.locales.unshift(mergedConfig.defaultLocale);
|
|
113
|
-
}
|
|
114
|
-
mergedConfig.locales = Array.from(new Set(mergedConfig.locales));
|
|
115
110
|
// ----------- RESOLVE ANY EXTERNAL FILES ----------- //
|
|
116
111
|
// Resolve dictionary filepath
|
|
117
112
|
var resolvedDictionaryFilePath = typeof mergedConfig.dictionary === 'string'
|
|
@@ -149,6 +144,30 @@ function withGTConfig(nextConfig, props) {
|
|
|
149
144
|
var customRouterPath = typeof mergedConfig.routerPath === 'string'
|
|
150
145
|
? mergedConfig.routerPath
|
|
151
146
|
: resolveConfigFilepath('routing', ['.ts', '.js']);
|
|
147
|
+
// ----------- LOCALE STANDARDIZATION ----------- //
|
|
148
|
+
// Check if using Services
|
|
149
|
+
var gtRuntimeTranslationEnabled = mergedConfig.runtimeUrl === defaultWithGTConfigProps_1.default.runtimeUrl &&
|
|
150
|
+
((process.env.NODE_ENV === 'production' && mergedConfig.apiKey) ||
|
|
151
|
+
(process.env.NODE_ENV === 'development' && mergedConfig.devApiKey));
|
|
152
|
+
var gtRemoteCacheEnabled = mergedConfig.cacheUrl === defaultWithGTConfigProps_1.default.cacheUrl &&
|
|
153
|
+
mergedConfig.loadTranslationsType === 'remote';
|
|
154
|
+
mergedConfig.gtServicesEnabled =
|
|
155
|
+
(gtRuntimeTranslationEnabled || gtRemoteCacheEnabled) &&
|
|
156
|
+
mergedConfig.projectId;
|
|
157
|
+
// Standardize locales
|
|
158
|
+
if (mergedConfig.locales && mergedConfig.defaultLocale) {
|
|
159
|
+
mergedConfig.locales.unshift(mergedConfig.defaultLocale);
|
|
160
|
+
}
|
|
161
|
+
var updatedLocales = [];
|
|
162
|
+
mergedConfig.locales = Array.from(new Set(mergedConfig.locales)).map(function (locale) {
|
|
163
|
+
var updatedLocale = mergedConfig.gtServicesEnabled
|
|
164
|
+
? (0, generaltranslation_1.standardizeLocale)(locale)
|
|
165
|
+
: locale;
|
|
166
|
+
if (updatedLocale !== locale) {
|
|
167
|
+
updatedLocales.push("".concat(locale, " -> ").concat(updatedLocale));
|
|
168
|
+
}
|
|
169
|
+
return updatedLocale;
|
|
170
|
+
});
|
|
152
171
|
// ---------- ERROR CHECKS ---------- //
|
|
153
172
|
// Local dictionary flag
|
|
154
173
|
if (customLoadDictionaryPath) {
|
|
@@ -197,13 +216,12 @@ function withGTConfig(nextConfig, props) {
|
|
|
197
216
|
console.warn(createErrors_1.APIKeyMissingWarn);
|
|
198
217
|
}
|
|
199
218
|
// Check: if using GT infrastructure, warn about unsupported locales
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
mergedConfig.projectId) {
|
|
219
|
+
if (mergedConfig.gtServicesEnabled) {
|
|
220
|
+
// Warn about standardized locales
|
|
221
|
+
if (updatedLocales.length) {
|
|
222
|
+
console.warn((0, createErrors_1.standardizedLocalesWarning)(updatedLocales));
|
|
223
|
+
}
|
|
224
|
+
// Warn about unsupported locales
|
|
207
225
|
var warningLocales = (mergedConfig.locales || defaultWithGTConfigProps_1.default.locales).filter(function (locale) { return !(0, supported_locales_1.getSupportedLocale)(locale); });
|
|
208
226
|
if (warningLocales.length) {
|
|
209
227
|
console.warn((0, createErrors_1.createUnsupportedLocalesWarning)(warningLocales));
|
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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"}
|
|
@@ -22,4 +22,5 @@ export declare const APIKeyMissingWarn: string;
|
|
|
22
22
|
export declare const translationLoadingWarning: string;
|
|
23
23
|
export declare const runtimeTranslationTimeoutWarning = "gt-next: Runtime translation timed out.";
|
|
24
24
|
export declare const dictionaryNotFoundWarning = "gt-next: Dictionary not found. Make sure you have added a dictionary to your project (either dictionary.js or [defaultLocale].json), and you have added the withGTConfig() plugin.";
|
|
25
|
+
export declare const standardizedLocalesWarning: (locales: string[]) => string;
|
|
25
26
|
//# sourceMappingURL=createErrors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createErrors.d.ts","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,gDACW,CAAC;AAEhD,eAAO,MAAM,2BAA2B,YAAY,MAAM,WAC8F,CAAC;AAEzJ,eAAO,MAAM,2BAA2B,YAAY,MAAM,WACwG,CAAC;AAEnK,eAAO,MAAM,4BAA4B,WAC/B,MAAM,OACT,MAAM,kCAKqB,CAAC;AAEnC,eAAO,MAAM,gCAAgC,OAAQ,MAAM,WACuB,CAAC;AAEnF,eAAO,MAAM,yBAAyB,OAAQ,MAAM,kBAAkB,MAAM,WACsJ,CAAC;AAEnO,eAAO,MAAM,kCAAkC,uKAAuK,CAAC;AAEvN,eAAO,MAAM,2BAA2B,OAAQ,MAAM,gBAAgB,MAAM,WAC2G,CAAC;AAExL,eAAO,MAAM,uBAAuB,8NAA8N,CAAC;AAEnQ,eAAO,MAAM,mCAAmC,kKAAkK,CAAC;AAEnN,eAAO,MAAM,qCAAqC,sKAAsK,CAAC;AAEzN,eAAO,MAAM,kCAAkC,SAAU,MAAM,WACmB,CAAC;AAEnF,eAAO,MAAM,oCAAoC,SAAU,MAAM,WAC4B,CAAC;AAI9F,eAAO,MAAM,oBAAoB,qEACmC,CAAC;AAErE,eAAO,MAAM,yBAAyB,OAAQ,MAAM,WACQ,CAAC;AAE7D,eAAO,MAAM,mCAAmC,OAAQ,MAAM,WACH,CAAC;AAE5D,eAAO,MAAM,+BAA+B,YAAa,MAAM,EAAE,WAMhD,CAAC;AAElB,eAAO,MAAM,4BAA4B,iBACzB,MAAM,gBACN,MAAM,WAE2L,CAAC;AAElN,eAAO,MAAM,oBAAoB,qMAAqM,CAAC;AAEvO,eAAO,MAAM,YAAY,QAIoE,CAAC;AAE9F,eAAO,MAAM,iBAAiB,QAGqF,CAAC;AAEpH,eAAO,MAAM,yBAAyB,QAEmD,CAAC;AAE1F,eAAO,MAAM,gCAAgC,4CAA4C,CAAC;AAE1F,eAAO,MAAM,yBAAyB,uLAAuL,CAAC"}
|
|
1
|
+
{"version":3,"file":"createErrors.d.ts","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,gDACW,CAAC;AAEhD,eAAO,MAAM,2BAA2B,YAAY,MAAM,WAC8F,CAAC;AAEzJ,eAAO,MAAM,2BAA2B,YAAY,MAAM,WACwG,CAAC;AAEnK,eAAO,MAAM,4BAA4B,WAC/B,MAAM,OACT,MAAM,kCAKqB,CAAC;AAEnC,eAAO,MAAM,gCAAgC,OAAQ,MAAM,WACuB,CAAC;AAEnF,eAAO,MAAM,yBAAyB,OAAQ,MAAM,kBAAkB,MAAM,WACsJ,CAAC;AAEnO,eAAO,MAAM,kCAAkC,uKAAuK,CAAC;AAEvN,eAAO,MAAM,2BAA2B,OAAQ,MAAM,gBAAgB,MAAM,WAC2G,CAAC;AAExL,eAAO,MAAM,uBAAuB,8NAA8N,CAAC;AAEnQ,eAAO,MAAM,mCAAmC,kKAAkK,CAAC;AAEnN,eAAO,MAAM,qCAAqC,sKAAsK,CAAC;AAEzN,eAAO,MAAM,kCAAkC,SAAU,MAAM,WACmB,CAAC;AAEnF,eAAO,MAAM,oCAAoC,SAAU,MAAM,WAC4B,CAAC;AAI9F,eAAO,MAAM,oBAAoB,qEACmC,CAAC;AAErE,eAAO,MAAM,yBAAyB,OAAQ,MAAM,WACQ,CAAC;AAE7D,eAAO,MAAM,mCAAmC,OAAQ,MAAM,WACH,CAAC;AAE5D,eAAO,MAAM,+BAA+B,YAAa,MAAM,EAAE,WAMhD,CAAC;AAElB,eAAO,MAAM,4BAA4B,iBACzB,MAAM,gBACN,MAAM,WAE2L,CAAC;AAElN,eAAO,MAAM,oBAAoB,qMAAqM,CAAC;AAEvO,eAAO,MAAM,YAAY,QAIoE,CAAC;AAE9F,eAAO,MAAM,iBAAiB,QAGqF,CAAC;AAEpH,eAAO,MAAM,yBAAyB,QAEmD,CAAC;AAE1F,eAAO,MAAM,gCAAgC,4CAA4C,CAAC;AAE1F,eAAO,MAAM,yBAAyB,uLAAuL,CAAC;AAE9N,eAAO,MAAM,0BAA0B,YAAa,MAAM,EAAE,WAC8B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// ---- ERRORS ---- //
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.dictionaryNotFoundWarning = exports.runtimeTranslationTimeoutWarning = exports.translationLoadingWarning = exports.APIKeyMissingWarn = exports.noInitGTWarn = exports.projectIdMissingWarn = exports.createMismatchingHashWarning = exports.createUnsupportedLocalesWarning = exports.createInvalidDictionaryEntryWarning = exports.createNoEntryFoundWarning = exports.usingDefaultsWarning = exports.unresolvedLoadTranslationsBuildError = exports.unresolvedLoadDictionaryBuildError = exports.unresolvedCustomLoadTranslationsError = exports.unresolvedCustomLoadDictionaryError = exports.dictionaryDisabledError = exports.createDictionarySubsetError = exports.devApiKeyIncludedInProductionError = exports.createRequiredPrefixError = exports.createDictionaryTranslationError = exports.createStringTranslationError = exports.customLoadDictionaryWarning = exports.customLoadTranslationsError = exports.remoteTranslationsError = void 0;
|
|
4
|
+
exports.standardizedLocalesWarning = exports.dictionaryNotFoundWarning = exports.runtimeTranslationTimeoutWarning = exports.translationLoadingWarning = exports.APIKeyMissingWarn = exports.noInitGTWarn = exports.projectIdMissingWarn = exports.createMismatchingHashWarning = exports.createUnsupportedLocalesWarning = exports.createInvalidDictionaryEntryWarning = exports.createNoEntryFoundWarning = exports.usingDefaultsWarning = exports.unresolvedLoadTranslationsBuildError = exports.unresolvedLoadDictionaryBuildError = exports.unresolvedCustomLoadTranslationsError = exports.unresolvedCustomLoadDictionaryError = exports.dictionaryDisabledError = exports.createDictionarySubsetError = exports.devApiKeyIncludedInProductionError = exports.createRequiredPrefixError = exports.createDictionaryTranslationError = exports.createStringTranslationError = exports.customLoadDictionaryWarning = exports.customLoadTranslationsError = exports.remoteTranslationsError = void 0;
|
|
5
5
|
var generaltranslation_1 = require("generaltranslation");
|
|
6
6
|
exports.remoteTranslationsError = 'gt-next Error: fetching remote translation.';
|
|
7
7
|
var customLoadTranslationsError = function (locale) {
|
|
@@ -78,4 +78,8 @@ exports.translationLoadingWarning = "gt-next: [DEV ONLY] Translations have chang
|
|
|
78
78
|
"Translations in production will be preloaded, and page will not need to be refreshed.";
|
|
79
79
|
exports.runtimeTranslationTimeoutWarning = "gt-next: Runtime translation timed out.";
|
|
80
80
|
exports.dictionaryNotFoundWarning = "gt-next: Dictionary not found. Make sure you have added a dictionary to your project (either dictionary.js or [defaultLocale].json), and you have added the withGTConfig() plugin.";
|
|
81
|
+
var standardizedLocalesWarning = function (locales) {
|
|
82
|
+
return "gt-next: You are using The following locales were standardized: ".concat(locales.join(', '), ".");
|
|
83
|
+
};
|
|
84
|
+
exports.standardizedLocalesWarning = standardizedLocalesWarning;
|
|
81
85
|
//# sourceMappingURL=createErrors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createErrors.js","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":";AAAA,sBAAsB;;;AAEtB,yDAAyD;AAE5C,QAAA,uBAAuB,GAClC,6CAA6C,CAAC;AAEzC,IAAM,2BAA2B,GAAG,UAAC,MAAmB;IAAnB,uBAAA,EAAA,WAAmB;IAC7D,OAAA,4GAAoG,MAAM,gDAA4C;AAAtJ,CAAsJ,CAAC;AAD5I,QAAA,2BAA2B,+BACiH;AAElJ,IAAM,2BAA2B,GAAG,UAAC,MAAmB;IAAnB,uBAAA,EAAA,WAAmB;IAC7D,OAAA,sHAA8G,MAAM,gDAA4C;AAAhK,CAAgK,CAAC;AADtJ,QAAA,2BAA2B,+BAC2H;AAE5J,IAAM,4BAA4B,GAAG,UAC1C,MAAc,EACd,EAAW,EACX,YAAmB;IAAnB,6BAAA,EAAA,mBAAmB;IAEnB,OAAA,4CAAqC,YAAY,gBAAK,MAAM,gBAC1D,EAAE,CAAC,CAAC,CAAC,qBAAa,EAAE,OAAG,CAAC,CAAC,CAAC,EAAE,mCACE;AAFhC,CAEgC,CAAC;AAPtB,QAAA,4BAA4B,gCAON;AAE5B,IAAM,gCAAgC,GAAG,UAAC,EAAU;IACzD,OAAA,+DAAwD,EAAE,yBAAsB;AAAhF,CAAgF,CAAC;AADtE,QAAA,gCAAgC,oCACsC;AAE5E,IAAM,yBAAyB,GAAG,UAAC,EAAU,EAAE,cAAsB;IAC1E,OAAA,iFAAyE,cAAc,sEAA0D,EAAE,iFAA6E;AAAhO,CAAgO,CAAC;AADtN,QAAA,yBAAyB,6BAC6L;AAEtN,QAAA,kCAAkC,GAAG,oKAAoK,CAAC;AAEhN,IAAM,2BAA2B,GAAG,UAAC,EAAU,EAAE,YAAoB;IAC1E,OAAA,yBAAkB,YAAY,yBAAc,EAAE,2IAAuI;AAArL,CAAqL,CAAC;AAD3K,QAAA,2BAA2B,+BACgJ;AAE3K,QAAA,uBAAuB,GAAG,2NAA2N,CAAC;AAEtP,QAAA,mCAAmC,GAAG,+JAA+J,CAAC;AAEtM,QAAA,qCAAqC,GAAG,mKAAmK,CAAC;AAElN,IAAM,kCAAkC,GAAG,UAAC,IAAY;IAC7D,OAAA,iFAA0E,IAAI,CAAE;AAAhF,CAAgF,CAAC;AADtE,QAAA,kCAAkC,sCACoC;AAE5E,IAAM,oCAAoC,GAAG,UAAC,IAAY;IAC/D,OAAA,4FAAqF,IAAI,CAAE;AAA3F,CAA2F,CAAC;AADjF,QAAA,oCAAoC,wCAC6C;AAE9F,wBAAwB;AAEX,QAAA,oBAAoB,GAC/B,kEAAkE,CAAC;AAE9D,IAAM,yBAAyB,GAAG,UAAC,EAAU;IAClD,OAAA,6DAAqD,EAAE,OAAG;AAA1D,CAA0D,CAAC;AADhD,QAAA,yBAAyB,6BACuB;AAEtD,IAAM,mCAAmC,GAAG,UAAC,EAAU;IAC5D,OAAA,4DAAoD,EAAE,OAAG;AAAzD,CAAyD,CAAC;AAD/C,QAAA,mCAAmC,uCACY;AAErD,IAAM,+BAA+B,GAAG,UAAC,OAAiB;IAC/D,OAAA,mFAA4E,OAAO;SAChF,GAAG,CAAC,UAAC,MAAM;QACF,IAAA,IAAI,GAAK,IAAA,wCAAmB,EAAC,MAAM,CAAC,KAAhC,CAAiC;QAC7C,OAAO,UAAG,MAAM,eAAK,IAAI,MAAG,CAAC;IAC/B,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAE;AALf,CAKe,CAAC;AANL,QAAA,+BAA+B,mCAM1B;AAEX,IAAM,4BAA4B,GAAG,UAC1C,YAAoB,EACpB,YAAoB;IAEpB,OAAA,sDAA+C,YAAY,6BAAmB,YAAY,wHAAqH;AAA/M,CAA+M,CAAC;AAJrM,QAAA,4BAA4B,gCAIyK;AAErM,QAAA,oBAAoB,GAAG,kMAAkM,CAAC;AAE1N,QAAA,YAAY,GACvB,kFAAkF;IAClF,wHAAwH;IACxH,wDAAwD;IACxD,2FAA2F,CAAC;AAEjF,QAAA,iBAAiB,GAC5B,uEAAuE;IACvE,oEAAoE;IACpE,iHAAiH,CAAC;AAEvG,QAAA,yBAAyB,GACpC,uEAAuE;IACvE,uFAAuF,CAAC;AAE7E,QAAA,gCAAgC,GAAG,yCAAyC,CAAC;AAE7E,QAAA,yBAAyB,GAAG,oLAAoL,CAAC"}
|
|
1
|
+
{"version":3,"file":"createErrors.js","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
import { NextRequest, NextResponse } from 'next/server';
|
|
2
|
-
|
|
3
|
-
[key: string]: string | {
|
|
4
|
-
[key: string]: string;
|
|
5
|
-
};
|
|
6
|
-
};
|
|
2
|
+
import { PathConfig } from './utils';
|
|
7
3
|
/**
|
|
8
4
|
* Middleware factory to create a Next.js middleware for i18n routing and locale detection.
|
|
9
5
|
*
|
|
@@ -21,5 +17,4 @@ export default function createNextMiddleware({ localeRouting, prefixDefaultLocal
|
|
|
21
17
|
prefixDefaultLocale?: boolean;
|
|
22
18
|
pathConfig?: PathConfig;
|
|
23
19
|
}): (req: NextRequest) => NextResponse<unknown>;
|
|
24
|
-
export {};
|
|
25
20
|
//# sourceMappingURL=createNextMiddleware.d.ts.map
|
|
@@ -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":"AAWA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMxD,OAAO,EACL,UAAU,EAOX,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,SAuE8B,WAAW,2BA6MzC"}
|
|
@@ -5,16 +5,8 @@ var generaltranslation_1 = require("generaltranslation");
|
|
|
5
5
|
var internal_1 = require("generaltranslation/internal");
|
|
6
6
|
var createErrors_1 = require("../errors/createErrors");
|
|
7
7
|
var server_1 = require("next/server");
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
*
|
|
11
|
-
* @param {string} pathname - The pathname to extract from.
|
|
12
|
-
* @returns {string} The extracted locale.
|
|
13
|
-
*/
|
|
14
|
-
function extractLocale(pathname) {
|
|
15
|
-
var matches = pathname.match(/^\/([^\/]+)(?:\/|$)/);
|
|
16
|
-
return matches ? matches[1] : null;
|
|
17
|
-
}
|
|
8
|
+
var constants_1 = require("../utils/constants");
|
|
9
|
+
var utils_1 = require("./utils");
|
|
18
10
|
/**
|
|
19
11
|
* Middleware factory to create a Next.js middleware for i18n routing and locale detection.
|
|
20
12
|
*
|
|
@@ -39,6 +31,9 @@ function createNextMiddleware(_a) {
|
|
|
39
31
|
console.error("gt-next middleware:", error);
|
|
40
32
|
}
|
|
41
33
|
}
|
|
34
|
+
// using gt services
|
|
35
|
+
var gtServicesEnabled = envParams === null || envParams === void 0 ? void 0 : envParams.gtServicesEnabled;
|
|
36
|
+
// i18n config
|
|
42
37
|
var defaultLocale = (envParams === null || envParams === void 0 ? void 0 : envParams.defaultLocale) || internal_1.libraryDefaultLocale;
|
|
43
38
|
var locales = (envParams === null || envParams === void 0 ? void 0 : envParams.locales) || [defaultLocale];
|
|
44
39
|
if (!(0, generaltranslation_1.isValidLocale)(defaultLocale))
|
|
@@ -48,197 +43,25 @@ function createNextMiddleware(_a) {
|
|
|
48
43
|
console.warn((0, createErrors_1.createUnsupportedLocalesWarning)(warningLocales));
|
|
49
44
|
var approvedLocales = locales;
|
|
50
45
|
// ---------- PRE-PROCESSING PATHS ---------- //
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
// base case - if no more chunks, set the value and return
|
|
54
|
-
if (chunks.length === 0) {
|
|
55
|
-
node.value = sharedPath;
|
|
56
|
-
return node;
|
|
57
|
-
}
|
|
58
|
-
// get the next chunk
|
|
59
|
-
var chunk = chunks.shift();
|
|
60
|
-
if (!chunk)
|
|
61
|
-
return node;
|
|
62
|
-
// Initialize children if undefined
|
|
63
|
-
if (!node.children) {
|
|
64
|
-
node.children = {};
|
|
65
|
-
}
|
|
66
|
-
// Handle dynamic segments by converting them to [*]
|
|
67
|
-
var normalizedChunk = chunk.startsWith('[') ? '[*]' : chunk;
|
|
68
|
-
// Create or get the child node
|
|
69
|
-
var childNode = node.children[normalizedChunk] || {
|
|
70
|
-
value: undefined,
|
|
71
|
-
children: {},
|
|
72
|
-
};
|
|
73
|
-
// Recursively build the rest of the tree
|
|
74
|
-
node.children[normalizedChunk] = buildTree(chunks, sharedPath, childNode);
|
|
75
|
-
return node;
|
|
76
|
-
};
|
|
77
|
-
var pathToSharedPath = Object.entries(pathConfig)
|
|
78
|
-
// create a flat map of shared paths and their patterns
|
|
79
|
-
.reduce(function (acc, _a) {
|
|
46
|
+
// Standardize pathConfig paths
|
|
47
|
+
pathConfig = Object.entries(pathConfig).reduce(function (acc, _a) {
|
|
80
48
|
var sharedPath = _a[0], localizedPath = _a[1];
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
if (typeof localizedPath === 'object') {
|
|
84
|
-
Object.values(localizedPath).forEach(function (localizedPath) {
|
|
85
|
-
// Convert dynamic path pattern to regex
|
|
86
|
-
var pattern = localizedPath.replace(/\[([^\]]+)\]/g, '[*]');
|
|
87
|
-
// Only add each pattern once
|
|
88
|
-
acc.push([pattern, sharedPath]);
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
return acc;
|
|
92
|
-
}, [])
|
|
93
|
-
// convert the flat map to a nested object for dynamic path matching
|
|
94
|
-
.reduce(function (acc, _a) {
|
|
95
|
-
var localizedPath = _a[0], sharedPath = _a[1];
|
|
96
|
-
// Nested pattern for dynamic params (the tree)
|
|
97
|
-
if (localizedPath.includes('[')) {
|
|
98
|
-
var chunks = localizedPath.replace(/^\//, '').split('/');
|
|
99
|
-
if (chunks.length > 1) {
|
|
100
|
-
acc[chunks[0]] = buildTree(chunks.slice(1), sharedPath, acc[chunks[0]] || {});
|
|
101
|
-
}
|
|
102
|
-
else {
|
|
103
|
-
acc[localizedPath] = sharedPath;
|
|
104
|
-
}
|
|
49
|
+
if (typeof localizedPath === 'string') {
|
|
50
|
+
acc[sharedPath] = localizedPath;
|
|
105
51
|
}
|
|
106
52
|
else {
|
|
107
|
-
acc[
|
|
53
|
+
acc[sharedPath] = Object.entries(localizedPath).reduce(function (acc, _a) {
|
|
54
|
+
var locale = _a[0], localizedPath = _a[1];
|
|
55
|
+
acc[gtServicesEnabled ? (0, generaltranslation_1.standardizeLocale)(locale) : locale] =
|
|
56
|
+
localizedPath;
|
|
57
|
+
return acc;
|
|
58
|
+
}, {});
|
|
108
59
|
}
|
|
109
60
|
return acc;
|
|
110
61
|
}, {});
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
* @returns The shared path or undefined if no match is found
|
|
115
|
-
*
|
|
116
|
-
* Example:
|
|
117
|
-
* pathname: /fr/dashboard/1/le-custom
|
|
118
|
-
* Returns: /dashboard/[id]/custom
|
|
119
|
-
*
|
|
120
|
-
* pathname: /fr/le-about
|
|
121
|
-
* Returns: /about
|
|
122
|
-
*
|
|
123
|
-
* pathname: /fr/blog
|
|
124
|
-
* Returns: /blog
|
|
125
|
-
*/
|
|
126
|
-
var getSharedPath = function (pathname) {
|
|
127
|
-
var _a, _b;
|
|
128
|
-
// Try exact match first
|
|
129
|
-
var sharedPath = pathToSharedPath[pathname];
|
|
130
|
-
if (typeof sharedPath === 'string')
|
|
131
|
-
return sharedPath;
|
|
132
|
-
// Try dynamic pattern match
|
|
133
|
-
var paths = pathname.replace(/^\//, '').split('/');
|
|
134
|
-
var result = pathToSharedPath[paths[0]];
|
|
135
|
-
for (var _i = 0, _c = paths.slice(1); _i < _c.length; _i++) {
|
|
136
|
-
var path = _c[_i];
|
|
137
|
-
// if we have a children object, then we continue traversing
|
|
138
|
-
var next = (_a = result === null || result === void 0 ? void 0 : result.children) === null || _a === void 0 ? void 0 : _a[path]; // check for dynamic pattern
|
|
139
|
-
if (!(next === null || next === void 0 ? void 0 : next.value) && Object.keys((result === null || result === void 0 ? void 0 : result.children) || {}).includes('[*]')) {
|
|
140
|
-
next = (_b = result === null || result === void 0 ? void 0 : result.children) === null || _b === void 0 ? void 0 : _b['[*]'];
|
|
141
|
-
}
|
|
142
|
-
result = next;
|
|
143
|
-
}
|
|
144
|
-
return result === null || result === void 0 ? void 0 : result.value;
|
|
145
|
-
};
|
|
146
|
-
/**
|
|
147
|
-
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
148
|
-
* @param path The actual pathname containing values (includes locale prefix)
|
|
149
|
-
* @param templatePath The shared path containing dynamic segments (does not include locale)
|
|
150
|
-
* @returns Array of parameter values in order of appearance
|
|
151
|
-
*
|
|
152
|
-
* Example:
|
|
153
|
-
* templatePath: /fr/dashboard/[id]/custom
|
|
154
|
-
* path: /fr/dashboard/1/le-custom
|
|
155
|
-
* Returns: ['1']
|
|
156
|
-
*
|
|
157
|
-
* Example with multiple params:
|
|
158
|
-
* templatePath: /fr/dashboard/[id]/[type]/custom
|
|
159
|
-
* path: /fr/dashboard/1/2/le-custom
|
|
160
|
-
* Returns: ['1', '2']
|
|
161
|
-
*/
|
|
162
|
-
var extractDynamicParams = function (templatePath, path) {
|
|
163
|
-
if (!templatePath.includes('['))
|
|
164
|
-
return [];
|
|
165
|
-
var params = [];
|
|
166
|
-
var pathSegments = path.split('/');
|
|
167
|
-
var sharedSegments = templatePath.split('/');
|
|
168
|
-
sharedSegments.forEach(function (segment, index) {
|
|
169
|
-
if (segment.startsWith('[') && segment.endsWith(']')) {
|
|
170
|
-
params.push(pathSegments[index]);
|
|
171
|
-
}
|
|
172
|
-
});
|
|
173
|
-
return params;
|
|
174
|
-
};
|
|
175
|
-
/**
|
|
176
|
-
* Replaces dynamic segments in a path with their actual values
|
|
177
|
-
* @param path The original pathname containing actual values
|
|
178
|
-
* @param templatePath The shared path containing dynamic segments
|
|
179
|
-
* @returns The path with dynamic segments replaced with actual values
|
|
180
|
-
*
|
|
181
|
-
* Example:
|
|
182
|
-
* path: /fr/dashboard/1/custom
|
|
183
|
-
* templatePath: /fr/dashboard/[id]/le-custom
|
|
184
|
-
* Returns: /fr/dashboard/1/le-custom
|
|
185
|
-
*
|
|
186
|
-
* Example:
|
|
187
|
-
* path: /about
|
|
188
|
-
* templatePath: /fr/le-about
|
|
189
|
-
* Returns: /fr/le-about
|
|
190
|
-
*
|
|
191
|
-
* Note: This function only replaces dynamic segments (e.g. [id]) with their actual values.
|
|
192
|
-
* It does not handle localized path parts (e.g. /custom vs /le-custom).
|
|
193
|
-
*/
|
|
194
|
-
var replaceDynamicSegments = function (path, templatePath) {
|
|
195
|
-
if (!templatePath.includes('['))
|
|
196
|
-
return templatePath;
|
|
197
|
-
var params = extractDynamicParams(templatePath, path);
|
|
198
|
-
var paramIndex = 0;
|
|
199
|
-
return templatePath.replace(/\[([^\]]+)\]/g, function (match) {
|
|
200
|
-
return params[paramIndex++] || match;
|
|
201
|
-
});
|
|
202
|
-
};
|
|
203
|
-
/**
|
|
204
|
-
* Gets the full localized path given a shared path and locale
|
|
205
|
-
* @param sharedPath The shared path to localize
|
|
206
|
-
* @param locale The locale to use
|
|
207
|
-
* @param originalUrl Optional URL to preserve query parameters from
|
|
208
|
-
* @returns localized path or undefined if no localized path is found
|
|
209
|
-
*
|
|
210
|
-
* const pathConfig = {
|
|
211
|
-
* '/blog': '/blog',
|
|
212
|
-
* '/about': {
|
|
213
|
-
* fr: '/le-about',
|
|
214
|
-
* },
|
|
215
|
-
* }
|
|
216
|
-
*
|
|
217
|
-
* // exact matches returns full localized path
|
|
218
|
-
* getLocalizedPath('/about', 'en-US') -> '/en-US/about'
|
|
219
|
-
* getLocalizedPath('/about', 'fr') -> '/fr/le-about'
|
|
220
|
-
* getLocalizedPath('/about', 'es') -> '/es/about
|
|
221
|
-
* getLocalizedPath('/blog', 'en-US') -> '/en-US/blog'
|
|
222
|
-
*
|
|
223
|
-
* // with query parameters
|
|
224
|
-
* getLocalizedPath('/about', 'fr', new URL('/about?foo=bar')) -> '/fr/le-about?foo=bar'
|
|
225
|
-
*
|
|
226
|
-
* // non-shared paths return undefined
|
|
227
|
-
* getLocalizedPath('/foo', 'en-US') -> undefined
|
|
228
|
-
*/
|
|
229
|
-
var getLocalizedPath = function (sharedPath, locale) {
|
|
230
|
-
var localizedPath = pathConfig[sharedPath];
|
|
231
|
-
var path;
|
|
232
|
-
if (typeof localizedPath === 'string') {
|
|
233
|
-
path = "/".concat(locale).concat(localizedPath);
|
|
234
|
-
}
|
|
235
|
-
else if (typeof localizedPath === 'object') {
|
|
236
|
-
path = localizedPath[locale]
|
|
237
|
-
? "/".concat(locale).concat(localizedPath[locale])
|
|
238
|
-
: "/".concat(locale).concat(sharedPath);
|
|
239
|
-
}
|
|
240
|
-
return path;
|
|
241
|
-
};
|
|
62
|
+
// Create the path mapping
|
|
63
|
+
var pathToSharedPath = (0, utils_1.createPathToSharedPathMap)(pathConfig);
|
|
64
|
+
// console.log(pathToSharedPath);
|
|
242
65
|
/**
|
|
243
66
|
* Processes the incoming request to determine the user's locale and sets a locale cookie.
|
|
244
67
|
* Optionally redirects the user based on the locale if locale-based routing is enabled.
|
|
@@ -253,7 +76,7 @@ function createNextMiddleware(_a) {
|
|
|
253
76
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
254
77
|
*/
|
|
255
78
|
function nextMiddleware(req) {
|
|
256
|
-
|
|
79
|
+
// console.log('--------------------------------');
|
|
257
80
|
var headerList = new Headers(req.headers);
|
|
258
81
|
var res = server_1.NextResponse.next({
|
|
259
82
|
request: {
|
|
@@ -261,7 +84,6 @@ function createNextMiddleware(_a) {
|
|
|
261
84
|
headers: headerList,
|
|
262
85
|
},
|
|
263
86
|
});
|
|
264
|
-
var candidates = [];
|
|
265
87
|
// routing
|
|
266
88
|
var routingConfig;
|
|
267
89
|
try {
|
|
@@ -270,129 +92,121 @@ function createNextMiddleware(_a) {
|
|
|
270
92
|
catch (e) {
|
|
271
93
|
console.error(e);
|
|
272
94
|
}
|
|
273
|
-
// Clear any existing rewrite flag cookie
|
|
274
|
-
res.cookies.delete(internal_1.localeRewriteFlagName);
|
|
275
95
|
// Check for rewrite flag in cookies
|
|
276
|
-
var rewriteFlag = req.headers.get(
|
|
96
|
+
var rewriteFlag = req.headers.get(constants_1.middlewareLocaleRewriteFlagName) === 'true';
|
|
277
97
|
// ---------- LOCALE DETECTION ---------- //
|
|
278
|
-
|
|
279
|
-
var pathnameLocale;
|
|
280
|
-
var pathname = req.nextUrl.pathname;
|
|
281
|
-
if (localeRouting) {
|
|
282
|
-
// Check if there is any supported locale in the pathname
|
|
283
|
-
var extractedLocale = (0, generaltranslation_1.standardizeLocale)(extractLocale(pathname) || '');
|
|
284
|
-
if ((0, generaltranslation_1.isValidLocale)(extractedLocale)) {
|
|
285
|
-
pathnameLocale = extractedLocale;
|
|
286
|
-
candidates.push(pathnameLocale);
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
// Check cookie locale
|
|
290
|
-
var cookieLocale = req.cookies.get(internal_1.localeCookieName);
|
|
291
|
-
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && (0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
292
|
-
var resetCookieName = 'generaltranslation.locale.reset';
|
|
293
|
-
var resetCookie = req.cookies.get(resetCookieName);
|
|
294
|
-
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
295
|
-
res.cookies.delete(resetCookieName);
|
|
296
|
-
candidates.unshift(cookieLocale.value);
|
|
297
|
-
}
|
|
298
|
-
else {
|
|
299
|
-
candidates.push(cookieLocale.value);
|
|
300
|
-
}
|
|
301
|
-
}
|
|
302
|
-
var refererLocale;
|
|
303
|
-
if (localeRouting) {
|
|
304
|
-
// If there's no locale, try to get one from the referer
|
|
305
|
-
var referer = headerList.get('referer');
|
|
306
|
-
if (referer && typeof referer === 'string') {
|
|
307
|
-
refererLocale = extractLocale((_a = new URL(referer)) === null || _a === void 0 ? void 0 : _a.pathname);
|
|
308
|
-
if ((0, generaltranslation_1.isValidLocale)(refererLocale || ''))
|
|
309
|
-
candidates.push(refererLocale || '');
|
|
310
|
-
}
|
|
311
|
-
}
|
|
312
|
-
// Get locales from accept-language header
|
|
313
|
-
var acceptedLocales = ((_b = headerList
|
|
314
|
-
.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(); })) || [];
|
|
315
|
-
candidates.push.apply(candidates, acceptedLocales);
|
|
316
|
-
// Get default locale
|
|
317
|
-
candidates.push(defaultLocale);
|
|
318
|
-
// determine userLocale
|
|
319
|
-
var userLocale = (0, generaltranslation_1.standardizeLocale)((0, generaltranslation_1.determineLocale)(candidates.filter(generaltranslation_1.isValidLocale), approvedLocales) ||
|
|
320
|
-
defaultLocale);
|
|
98
|
+
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale;
|
|
321
99
|
res.headers.set(internal_1.localeHeaderName, userLocale);
|
|
322
100
|
if (userLocale) {
|
|
323
|
-
|
|
324
|
-
res.cookies.set('generaltranslation.middleware.locale', userLocale);
|
|
101
|
+
res.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
325
102
|
}
|
|
326
|
-
// ---------- ROUTING ---------- //
|
|
327
103
|
if (localeRouting) {
|
|
328
|
-
|
|
329
|
-
|
|
104
|
+
// ---------- GET PATHS ---------- //
|
|
105
|
+
var pathname = req.nextUrl.pathname;
|
|
106
|
+
// Only strip off the locale if it's a valid locale (/fr/le-about -> /about), (/blog -> /blog)
|
|
330
107
|
var unprefixedPathname = pathnameLocale
|
|
331
|
-
?
|
|
332
|
-
:
|
|
108
|
+
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), '')
|
|
109
|
+
: pathname;
|
|
333
110
|
var originalUrl = req.nextUrl;
|
|
111
|
+
// standardize pathname (ie, /tg/welcome -> /fil/welcome), (/blog -> /blog)
|
|
112
|
+
var standardizedPathname = pathnameLocale && pathnameLocale !== unstandardizedPathnameLocale
|
|
113
|
+
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale))
|
|
114
|
+
: pathname;
|
|
334
115
|
// Get the shared path for the unprefixed pathname
|
|
335
|
-
var sharedPath = getSharedPath(unprefixedPathname);
|
|
116
|
+
var sharedPath = (0, utils_1.getSharedPath)(unprefixedPathname, pathToSharedPath);
|
|
336
117
|
// Localized path (/en-US/blog, /fr/le-about, /fr/dashboard/[id]/custom)
|
|
337
|
-
var localizedPath = sharedPath && getLocalizedPath(sharedPath, userLocale);
|
|
118
|
+
var localizedPath = sharedPath && (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig);
|
|
338
119
|
// Combine localized path with dynamic parameters (/en-US/blog, /fr/le-about, /fr/dashboard/1/le-custom)
|
|
339
|
-
var localizedPathWithParameters = localizedPath &&
|
|
340
|
-
|
|
120
|
+
var localizedPathWithParameters = localizedPath &&
|
|
121
|
+
(0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
122
|
+
? standardizedPathname
|
|
123
|
+
: "/".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
|
+
// ---------- ROUTING LOGIC ---------- //
|
|
131
|
+
// BASE CASE: default locale, same path (/en-US/blog -> /en-US/blog), (/en-US/dashboard/1/custom -> /en-US/dashboard/1/custom)
|
|
341
132
|
if (localizedPathWithParameters &&
|
|
342
|
-
|
|
133
|
+
standardizedPathname === localizedPathWithParameters &&
|
|
343
134
|
userLocale === defaultLocale) {
|
|
135
|
+
// console.log(
|
|
136
|
+
// `[Middleware] Default locale path match: ${pathname} -> ${localizedPathWithParameters}`
|
|
137
|
+
// );
|
|
138
|
+
return res;
|
|
139
|
+
}
|
|
140
|
+
// BASE CASE: at localized path, which is the same as the shared path (/fil/blog -> /fil/blog)
|
|
141
|
+
if (pathname === localizedPathWithParameters &&
|
|
142
|
+
"/".concat(userLocale).concat(sharedPath) === localizedPathWithParameters) {
|
|
143
|
+
// console.log(
|
|
144
|
+
// `[Middleware] Localized path match: ${pathname} -> ${localizedPathWithParameters}`
|
|
145
|
+
// );
|
|
344
146
|
return res;
|
|
345
147
|
}
|
|
346
148
|
// If we've already rewritten this path, don't process it again
|
|
347
149
|
if (rewriteFlag) {
|
|
150
|
+
// console.log(
|
|
151
|
+
// `[Middleware] Already rewritten path: ${pathname} (skipping)`
|
|
152
|
+
// );
|
|
348
153
|
return res;
|
|
349
154
|
}
|
|
350
|
-
// REWRITE CASE: proxies a localized path, same locale (/fr/le-about => /fr/about)
|
|
155
|
+
// REWRITE CASE: proxies a localized path, same locale (/fr/le-about => /fr/about) (/fr/dashboard/1/le-custom => /fr/dashboard/1/custom)
|
|
351
156
|
if (localizedPathWithParameters &&
|
|
352
|
-
|
|
353
|
-
|
|
157
|
+
standardizedPathname === localizedPathWithParameters) {
|
|
158
|
+
// convert to shared path with dynamic parameters
|
|
159
|
+
var rewritePath = (0, utils_1.replaceDynamicSegments)(localizedPathWithParameters, "/".concat(userLocale).concat(sharedPath));
|
|
354
160
|
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
355
161
|
rewriteUrl.search = originalUrl.search;
|
|
356
162
|
headerList.set(internal_1.localeHeaderName, userLocale);
|
|
357
163
|
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
358
164
|
headers: headerList,
|
|
359
165
|
});
|
|
360
|
-
response.headers.set(
|
|
166
|
+
response.headers.set(constants_1.middlewareLocaleRewriteFlagName, 'true');
|
|
361
167
|
if (userLocale) {
|
|
362
|
-
response.cookies.set(
|
|
168
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
363
169
|
}
|
|
170
|
+
// console.log(
|
|
171
|
+
// `[Middleware] Rewrite localized path: ${pathname} -> ${rewritePath}`
|
|
172
|
+
// );
|
|
364
173
|
return response;
|
|
365
174
|
}
|
|
366
175
|
// REWRITE CASE: no locale prefix
|
|
367
176
|
if (!pathnameLocale &&
|
|
368
177
|
!prefixDefaultLocale &&
|
|
369
178
|
(0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
370
|
-
var rewritePath = "/".concat(userLocale).concat(
|
|
179
|
+
var rewritePath = "/".concat(userLocale).concat(pathname);
|
|
371
180
|
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
372
181
|
rewriteUrl.search = originalUrl.search;
|
|
373
182
|
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
374
183
|
headers: headerList,
|
|
375
184
|
});
|
|
376
|
-
response.headers.set(
|
|
185
|
+
response.headers.set(constants_1.middlewareLocaleRewriteFlagName, 'true');
|
|
186
|
+
// console.log(
|
|
187
|
+
// `[Middleware] Rewrite no locale prefix: ${pathname} -> ${rewritePath}`
|
|
188
|
+
// );
|
|
377
189
|
return response;
|
|
378
190
|
}
|
|
379
191
|
// REDIRECT CASE: non-i18n path
|
|
380
192
|
// 1. use customized path if it exists (/en-US/about -> /fr/le-about), (/about -> /fr/le-about)
|
|
381
193
|
// 2. otherwise, if pathname has locale prefix, replace it (/en-US/welcome -> /fr/welcome)
|
|
382
194
|
// 3. otherwise, prefix with locale (/welcome -> /fr/welcome)
|
|
383
|
-
if (
|
|
195
|
+
if (unstandardizedPathnameLocale !== userLocale) {
|
|
384
196
|
// determine redirect path
|
|
385
|
-
// TODO: check out standardizeLocale(extractLocale(pathname) || ''); TL which gets standardized to FIL causing an infinite loop, instead standardize later
|
|
386
197
|
var redirectPath = localizedPathWithParameters ||
|
|
387
198
|
(pathnameLocale
|
|
388
|
-
?
|
|
389
|
-
: "/".concat(userLocale).concat(
|
|
199
|
+
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale))
|
|
200
|
+
: "/".concat(userLocale).concat(pathname));
|
|
390
201
|
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
391
202
|
redirectUrl.search = originalUrl.search;
|
|
392
203
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
393
204
|
if (userLocale) {
|
|
394
|
-
response.cookies.set(
|
|
205
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
395
206
|
}
|
|
207
|
+
// console.log(
|
|
208
|
+
// `[Middleware] Redirect non-i18n path: ${pathname} -> ${redirectPath}`
|
|
209
|
+
// );
|
|
396
210
|
return response;
|
|
397
211
|
}
|
|
398
212
|
// REDIRECT CASE: mismatched localized path (/fr/about -> /fr/le-about), mismatched dynamic path (/fr/dashboard/1/custom -> /fr/dashboard/1/le-custom)
|
|
@@ -401,13 +215,18 @@ function createNextMiddleware(_a) {
|
|
|
401
215
|
redirectUrl.search = originalUrl.search;
|
|
402
216
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
403
217
|
if (userLocale) {
|
|
404
|
-
response.cookies.set(
|
|
218
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
405
219
|
}
|
|
220
|
+
// console.log(
|
|
221
|
+
// `[Middleware] Redirect mismatched path: ${pathname} -> ${localizedPathWithParameters}`
|
|
222
|
+
// );
|
|
406
223
|
return response;
|
|
407
224
|
}
|
|
408
225
|
// BASE CASE
|
|
226
|
+
// console.log(`[Middleware] No transformation needed: ${pathname}`);
|
|
409
227
|
return res;
|
|
410
228
|
}
|
|
229
|
+
// console.log(`[Middleware] No locale routing: ${req.nextUrl.pathname}`);
|
|
411
230
|
return res;
|
|
412
231
|
}
|
|
413
232
|
return nextMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { NextRequest } from 'next/server';
|
|
2
|
+
export type PathConfig = {
|
|
3
|
+
[key: string]: string | {
|
|
4
|
+
[key: string]: string;
|
|
5
|
+
};
|
|
6
|
+
};
|
|
7
|
+
/**
|
|
8
|
+
* Extracts the locale from the given pathname.
|
|
9
|
+
*/
|
|
10
|
+
export declare function extractLocale(pathname: string): string | null;
|
|
11
|
+
/**
|
|
12
|
+
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
13
|
+
*/
|
|
14
|
+
export declare function getSharedPath(pathname: string, pathToSharedPath: {
|
|
15
|
+
[key: string]: string;
|
|
16
|
+
}): string | undefined;
|
|
17
|
+
/**
|
|
18
|
+
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
19
|
+
*/
|
|
20
|
+
export declare function extractDynamicParams(templatePath: string, path: string): string[];
|
|
21
|
+
/**
|
|
22
|
+
* Replaces dynamic segments in a path with their actual values
|
|
23
|
+
*/
|
|
24
|
+
export declare function replaceDynamicSegments(path: string, templatePath: string): string;
|
|
25
|
+
/**
|
|
26
|
+
* Gets the full localized path given a shared path and locale
|
|
27
|
+
*/
|
|
28
|
+
export declare function getLocalizedPath(sharedPath: string, locale: string, pathConfig: PathConfig): string | undefined;
|
|
29
|
+
/**
|
|
30
|
+
* Creates a map of localized paths to shared paths using regex patterns
|
|
31
|
+
*/
|
|
32
|
+
export declare function createPathToSharedPathMap(pathConfig: PathConfig): {
|
|
33
|
+
[key: string]: string;
|
|
34
|
+
};
|
|
35
|
+
/**
|
|
36
|
+
* Gets the locale from the request using various sources
|
|
37
|
+
*/
|
|
38
|
+
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean): {
|
|
39
|
+
userLocale: string;
|
|
40
|
+
pathnameLocale: string | undefined;
|
|
41
|
+
unstandardizedPathnameLocale: string | null | undefined;
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +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;AAmB1C,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,GACrB;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,4BAA4B,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACzD,CA+DA"}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.extractLocale = extractLocale;
|
|
4
|
+
exports.getSharedPath = getSharedPath;
|
|
5
|
+
exports.extractDynamicParams = extractDynamicParams;
|
|
6
|
+
exports.replaceDynamicSegments = replaceDynamicSegments;
|
|
7
|
+
exports.getLocalizedPath = getLocalizedPath;
|
|
8
|
+
exports.createPathToSharedPathMap = createPathToSharedPathMap;
|
|
9
|
+
exports.getLocaleFromRequest = getLocaleFromRequest;
|
|
10
|
+
var generaltranslation_1 = require("generaltranslation");
|
|
11
|
+
var internal_1 = require("generaltranslation/internal");
|
|
12
|
+
var constants_1 = require("../utils/constants");
|
|
13
|
+
/**
|
|
14
|
+
* Extracts the locale from the given pathname.
|
|
15
|
+
*/
|
|
16
|
+
function extractLocale(pathname) {
|
|
17
|
+
var matches = pathname.match(/^\/([^\/]+)(?:\/|$)/);
|
|
18
|
+
return matches ? matches[1] : null;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
22
|
+
*/
|
|
23
|
+
function getSharedPath(pathname, pathToSharedPath) {
|
|
24
|
+
// Try exact match first
|
|
25
|
+
if (pathToSharedPath[pathname]) {
|
|
26
|
+
return pathToSharedPath[pathname];
|
|
27
|
+
}
|
|
28
|
+
// Try regex pattern match
|
|
29
|
+
for (var _i = 0, _a = Object.entries(pathToSharedPath); _i < _a.length; _i++) {
|
|
30
|
+
var _b = _a[_i], pattern = _b[0], sharedPath = _b[1];
|
|
31
|
+
if (pattern.includes('[^/]+')) {
|
|
32
|
+
// Convert the pattern to a strict regex that matches the exact path structure
|
|
33
|
+
var regex = new RegExp("^".concat(pattern.replace(/\//g, '\\/'), "$"));
|
|
34
|
+
if (regex.test(pathname)) {
|
|
35
|
+
return sharedPath;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
43
|
+
*/
|
|
44
|
+
function extractDynamicParams(templatePath, path) {
|
|
45
|
+
if (!templatePath.includes('['))
|
|
46
|
+
return [];
|
|
47
|
+
var params = [];
|
|
48
|
+
var pathSegments = path.split('/');
|
|
49
|
+
var sharedSegments = templatePath.split('/');
|
|
50
|
+
sharedSegments.forEach(function (segment, index) {
|
|
51
|
+
if (segment.startsWith('[') && segment.endsWith(']')) {
|
|
52
|
+
params.push(pathSegments[index]);
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
return params;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Replaces dynamic segments in a path with their actual values
|
|
59
|
+
*/
|
|
60
|
+
function replaceDynamicSegments(path, templatePath) {
|
|
61
|
+
if (!templatePath.includes('['))
|
|
62
|
+
return templatePath;
|
|
63
|
+
var params = extractDynamicParams(templatePath, path);
|
|
64
|
+
var paramIndex = 0;
|
|
65
|
+
var result = templatePath.replace(/\[([^\]]+)\]/g, function (match) {
|
|
66
|
+
return params[paramIndex++] || match;
|
|
67
|
+
});
|
|
68
|
+
return result;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Gets the full localized path given a shared path and locale
|
|
72
|
+
*/
|
|
73
|
+
function getLocalizedPath(sharedPath, locale, pathConfig) {
|
|
74
|
+
var localizedPath = pathConfig[sharedPath];
|
|
75
|
+
var path;
|
|
76
|
+
if (typeof localizedPath === 'string') {
|
|
77
|
+
path = "/".concat(locale).concat(localizedPath);
|
|
78
|
+
}
|
|
79
|
+
else if (typeof localizedPath === 'object') {
|
|
80
|
+
path = localizedPath[locale]
|
|
81
|
+
? "/".concat(locale).concat(localizedPath[locale])
|
|
82
|
+
: "/".concat(locale).concat(sharedPath);
|
|
83
|
+
}
|
|
84
|
+
return path;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Creates a map of localized paths to shared paths using regex patterns
|
|
88
|
+
*/
|
|
89
|
+
function createPathToSharedPathMap(pathConfig) {
|
|
90
|
+
return Object.entries(pathConfig).reduce(function (acc, _a) {
|
|
91
|
+
var sharedPath = _a[0], localizedPath = _a[1];
|
|
92
|
+
// Add the shared path itself, converting to regex pattern if it has dynamic segments
|
|
93
|
+
if (sharedPath.includes('[')) {
|
|
94
|
+
var pattern = sharedPath.replace(/\[([^\]]+)\]/g, '[^/]+');
|
|
95
|
+
acc[pattern] = sharedPath;
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
acc[sharedPath] = sharedPath;
|
|
99
|
+
}
|
|
100
|
+
if (typeof localizedPath === 'object') {
|
|
101
|
+
Object.values(localizedPath).forEach(function (localizedPath) {
|
|
102
|
+
// Convert the localized path to a regex pattern
|
|
103
|
+
// Replace [param] with [^/]+ to match any non-slash characters
|
|
104
|
+
var pattern = localizedPath.replace(/\[([^\]]+)\]/g, '[^/]+');
|
|
105
|
+
acc[pattern] = sharedPath;
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
return acc;
|
|
109
|
+
}, {});
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Gets the locale from the request using various sources
|
|
113
|
+
*/
|
|
114
|
+
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting) {
|
|
115
|
+
var _a, _b;
|
|
116
|
+
var headerList = new Headers(req.headers);
|
|
117
|
+
var candidates = [];
|
|
118
|
+
// Check pathname locales
|
|
119
|
+
var pathnameLocale, unstandardizedPathnameLocale;
|
|
120
|
+
var pathname = req.nextUrl.pathname;
|
|
121
|
+
if (localeRouting) {
|
|
122
|
+
unstandardizedPathnameLocale = extractLocale(pathname);
|
|
123
|
+
var extractedLocale = (0, generaltranslation_1.standardizeLocale)(unstandardizedPathnameLocale || '');
|
|
124
|
+
if ((0, generaltranslation_1.isValidLocale)(extractedLocale)) {
|
|
125
|
+
pathnameLocale = extractedLocale;
|
|
126
|
+
candidates.push(pathnameLocale);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
// Check cookie locale
|
|
130
|
+
var cookieLocale = req.cookies.get(internal_1.localeCookieName);
|
|
131
|
+
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && (0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
132
|
+
var resetCookieName = constants_1.middlewareLocaleResetFlagName;
|
|
133
|
+
var resetCookie = req.cookies.get(resetCookieName);
|
|
134
|
+
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
135
|
+
candidates.unshift(cookieLocale.value);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
candidates.push(cookieLocale.value);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
// Check referer locale
|
|
142
|
+
var refererLocale;
|
|
143
|
+
if (localeRouting) {
|
|
144
|
+
var referer = headerList.get('referer');
|
|
145
|
+
if (referer && typeof referer === 'string') {
|
|
146
|
+
refererLocale = extractLocale((_a = new URL(referer)) === null || _a === void 0 ? void 0 : _a.pathname);
|
|
147
|
+
if ((0, generaltranslation_1.isValidLocale)(refererLocale || ''))
|
|
148
|
+
candidates.push(refererLocale || '');
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
// Get locales from accept-language header
|
|
152
|
+
var acceptedLocales = ((_b = headerList
|
|
153
|
+
.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(); })) || [];
|
|
154
|
+
candidates.push.apply(candidates, acceptedLocales);
|
|
155
|
+
// Get default locale
|
|
156
|
+
candidates.push(defaultLocale);
|
|
157
|
+
// determine userLocale
|
|
158
|
+
var userLocale = (0, generaltranslation_1.standardizeLocale)((0, generaltranslation_1.determineLocale)(candidates.filter(generaltranslation_1.isValidLocale), approvedLocales) ||
|
|
159
|
+
defaultLocale);
|
|
160
|
+
return {
|
|
161
|
+
userLocale: userLocale,
|
|
162
|
+
pathnameLocale: pathnameLocale,
|
|
163
|
+
unstandardizedPathnameLocale: unstandardizedPathnameLocale,
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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":"
|
|
1
|
+
{"version":3,"file":"ClientProviderWrapper.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AASxD,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,2CAkCnD"}
|
|
@@ -14,15 +14,15 @@ var __assign = (this && this.__assign) || function () {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.default = ClientProvider;
|
|
16
16
|
var jsx_runtime_1 = require("react/jsx-runtime");
|
|
17
|
-
var internal_1 = require("generaltranslation/internal");
|
|
18
17
|
var client_1 = require("gt-react/client");
|
|
19
18
|
var navigation_1 = require("next/navigation");
|
|
20
19
|
var react_1 = require("react");
|
|
20
|
+
var constants_1 = require("../utils/constants");
|
|
21
21
|
function ClientProvider(props) {
|
|
22
22
|
// locale change on client, trigger page reload
|
|
23
23
|
var router = (0, navigation_1.useRouter)();
|
|
24
24
|
var onLocaleChange = function () {
|
|
25
|
-
document.cookie = "
|
|
25
|
+
document.cookie = "".concat(constants_1.middlewareLocaleResetFlagName, "=true;path=/");
|
|
26
26
|
router.refresh();
|
|
27
27
|
};
|
|
28
28
|
// Trigger page reload when locale changes
|
|
@@ -30,23 +30,18 @@ function ClientProvider(props) {
|
|
|
30
30
|
var pathname = (0, navigation_1.usePathname)();
|
|
31
31
|
(0, react_1.useEffect)(function () {
|
|
32
32
|
var _a, _b;
|
|
33
|
-
console.log("".concat(pathname, " re-rendered"));
|
|
34
33
|
var newLocale = (_a = document.cookie
|
|
35
34
|
.split('; ')
|
|
36
|
-
.find(function (row) { return row.startsWith("
|
|
35
|
+
.find(function (row) { return row.startsWith("".concat(constants_1.middlewareLocaleName, "=")); })) === null || _a === void 0 ? void 0 : _a.split('=')[1];
|
|
37
36
|
if (newLocale && newLocale !== props.locale) {
|
|
38
37
|
var rewriteFlag = ((_b = document
|
|
39
|
-
.querySelector("meta[name=\"".concat(
|
|
38
|
+
.querySelector("meta[name=\"".concat(constants_1.middlewareLocaleRewriteFlagName, "\"]"))) === null || _b === void 0 ? void 0 : _b.getAttribute('content')) === 'true';
|
|
40
39
|
if (!rewriteFlag) {
|
|
41
|
-
console.log('New cookie locale', newLocale, pathname);
|
|
42
40
|
// reload server
|
|
43
41
|
router.refresh();
|
|
44
42
|
// reload client
|
|
45
43
|
window.location.reload();
|
|
46
44
|
}
|
|
47
|
-
else {
|
|
48
|
-
console.log('DO NOTHING: Rewrite flag is true', pathname);
|
|
49
|
-
}
|
|
50
45
|
}
|
|
51
46
|
}, [pathname]); // Re-run when pathname changes
|
|
52
47
|
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;;;;;;;;;;;;;AAWb,iCAmCC;;AA7CD,0CAAoE;AAEpE,8CAAyD;AACzD,+BAAkC;AAClC,gDAI4B;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,IAAM,WAAW,GACf,CAAA,MAAA,QAAQ;iBACL,aAAa,CAAC,sBAAc,2CAA+B,QAAI,CAAC,0CAC/D,YAAY,CAAC,SAAS,CAAC,MAAK,MAAM,CAAC;YAEzC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,gBAAgB;gBAChB,MAAM,CAAC,OAAO,EAAE,CAAC;gBAEjB,gBAAgB;gBAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3B,CAAC;QACH,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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare const middlewareLocaleRewriteFlagName = "generaltranslation.middleware.locale-rewrite";
|
|
2
|
+
export declare const middlewareLocaleName = "generaltranslation.middleware.locale";
|
|
3
|
+
export declare const middlewareLocaleResetFlagName = "generaltranslation.middleware.locale-reset";
|
|
4
|
+
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B,iDACI,CAAC;AACjD,eAAO,MAAM,oBAAoB,yCAAyC,CAAC;AAC3E,eAAO,MAAM,6BAA6B,+CACI,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.middlewareLocaleResetFlagName = exports.middlewareLocaleName = exports.middlewareLocaleRewriteFlagName = void 0;
|
|
4
|
+
exports.middlewareLocaleRewriteFlagName = 'generaltranslation.middleware.locale-rewrite';
|
|
5
|
+
exports.middlewareLocaleName = 'generaltranslation.middleware.locale';
|
|
6
|
+
exports.middlewareLocaleResetFlagName = 'generaltranslation.middleware.locale-reset';
|
|
7
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,+BAA+B,GAC1C,8CAA8C,CAAC;AACpC,QAAA,oBAAoB,GAAG,sCAAsC,CAAC;AAC9D,QAAA,6BAA6B,GACxC,4CAA4C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "5.2.9-alpha.
|
|
3
|
+
"version": "5.2.9-alpha.1",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
7
|
-
"next": ">=13.0.0
|
|
7
|
+
"next": ">=13.0.0 <15.2.1 || >15.2.2",
|
|
8
8
|
"react": ">=16.8.0 <20.0.0",
|
|
9
9
|
"react-dom": ">=16.8.0 <20.0.0"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@generaltranslation/supported-locales": "^2.0.7-alpha.
|
|
13
|
-
"generaltranslation": "^6.2.2-alpha.
|
|
14
|
-
"gt-react": "^9.2.7-alpha.
|
|
12
|
+
"@generaltranslation/supported-locales": "^2.0.7-alpha.1",
|
|
13
|
+
"generaltranslation": "^6.2.2-alpha.1",
|
|
14
|
+
"gt-react": "^9.2.7-alpha.1"
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"patch": "npm version patch",
|