gt-next 5.2.8 → 5.2.9-alpha.0
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/_routing.d.ts +3 -0
- package/dist/_routing.d.ts.map +1 -0
- package/dist/_routing.js +6 -0
- package/dist/_routing.js.map +1 -0
- package/dist/config-dir/TranslationManager.d.ts.map +1 -1
- package/dist/config-dir/TranslationManager.js.map +1 -1
- package/dist/config-dir/gt-router.d.ts +2 -0
- package/dist/config-dir/gt-router.d.ts.map +1 -0
- package/dist/config-dir/gt-router.js +8 -0
- package/dist/config-dir/gt-router.js.map +1 -0
- package/dist/config-dir/props/defaultWithGTConfigProps.d.ts +2 -2
- package/dist/config.d.ts +2 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +11 -2
- package/dist/config.js.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts +11 -6
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +302 -28
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +26 -0
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/request/getLocale.d.ts.map +1 -1
- package/dist/request/getLocale.js +4 -1
- package/dist/request/getLocale.js.map +1 -1
- package/dist/server-dir/buildtime/T.d.ts.map +1 -1
- package/dist/server-dir/buildtime/T.js +4 -1
- package/dist/server-dir/buildtime/T.js.map +1 -1
- package/dist/server-dir/buildtime/getGT.d.ts.map +1 -1
- package/dist/server-dir/buildtime/getGT.js +18 -2
- package/dist/server-dir/buildtime/getGT.js.map +1 -1
- package/dist/variables/Currency.js +1 -1
- package/dist/variables/Currency.js.map +1 -1
- package/dist/variables/DateTime.js +12 -1
- package/dist/variables/DateTime.js.map +1 -1
- package/dist/variables/Num.js +12 -1
- package/dist/variables/Num.js.map +1 -1
- package/package.json +13 -4
- package/dist/translations/index.d.ts +0 -1
- package/dist/translations/index.d.ts.map +0 -1
- package/dist/translations/index.js +0 -2
- package/dist/translations/index.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_routing.d.ts","sourceRoot":"","sources":["../src/_routing.ts"],"names":[],"mappings":";AAIA,wBAAkB"}
|
package/dist/_routing.js
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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 +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;IAEpD;;;OAGG;;IAeH;;;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;
|
|
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;IAEpD;;;OAGG;;IAeH;;;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"}
|
|
@@ -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;IACzC,CAAC;IAED;;;OAGG;IACH,sCAAS,GAAT,UAAU,SAA4C;QACpD,IAAI,CAAC,MAAM,yBAAQ,IAAI,CAAC,MAAM,GAAK,SAAS,CAAE,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACW,+CAAkB,GAAhC,UACE,SAAiB;;;;;;wBAEjB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB;4BAAE,sBAAO,SAAS,EAAC;wBACvC,qBAAM,IAAA,yBAAgB,+BACnC,YAAY,EAAE,SAAS,IACpB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAClE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAC5D,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EAClE,EAAA;;wBALI,MAAM,GAAG,SAKb;wBACF,sBAAO,MAAM,EAAC;;;;KACf;IAED;;;;OAIG;IACG,kDAAqB,GAA3B,UACE,MAAc;;;;;;;wBAER,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;wBAItC,UAAU,GACd,IAAI,CAAC,MAAM,CAAC,oBAAoB,KAAK,QAAQ;4BAC7C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC;4BACnC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,mCAAI,CAAC,CAAC;gCAC3D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;
|
|
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;IACzC,CAAC;IAED;;;OAGG;IACH,sCAAS,GAAT,UAAU,SAA4C;QACpD,IAAI,CAAC,MAAM,yBAAQ,IAAI,CAAC,MAAM,GAAK,SAAS,CAAE,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACW,+CAAkB,GAAhC,UACE,SAAiB;;;;;;wBAEjB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB;4BAAE,sBAAO,SAAS,EAAC;wBACvC,qBAAM,IAAA,yBAAgB,+BACnC,YAAY,EAAE,SAAS,IACpB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAClE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAC5D,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,EAClE,EAAA;;wBALI,MAAM,GAAG,SAKb;wBACF,sBAAO,MAAM,EAAC;;;;KACf;IAED;;;;OAIG;IACG,kDAAqB,GAA3B,UACE,MAAc;;;;;;;wBAER,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;wBAItC,UAAU,GACd,IAAI,CAAC,MAAM,CAAC,oBAAoB,KAAK,QAAQ;4BAC7C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC;4BACnC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAA,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,mCAAI,CAAC,CAAC;gCAC3D,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;wBAEhC,0CAA0C;wBAC1C,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;4BACvD,sBAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAC;wBAC7C,CAAC;6BAEG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAjC,wBAAiC;wBAC5B,qBAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAA;4BAA9C,sBAAO,SAAuC,EAAC;;wBAG3C,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;wBACxD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;wBAClB,qBAAM,YAAY,EAAA;;wBAA1C,qBAAqB,GAAG,SAAkB;wBAChD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;wBAErC,mCAAmC;wBACnC,IAAI,qBAAqB,EAAE,CAAC;4BAC1B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;4BAC3D,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;wBACxD,CAAC;wBACD,sBAAO,qBAAqB,EAAC;;;;KAC9B;IAED;;;;OAIG;IACH,kDAAqB,GAArB,UAAsB,MAAc;QAClC,IAAM,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;OAMG;IACH,4CAAe,GAAf,UACE,MAAc,EACd,IAAY,EACZ,WAAuE;;QAEvE,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,IAAI,WAAW,CAAC;YAAE,OAAO,KAAK,CAAC;QACnD,IAAM,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;QAC5C,IAAM,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACtE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,wBAC7B,mBAAmB,gBACrB,IAAI,IAAG,WAAW,OACnB,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,oDAAuB,GAAvB,UAAwB,MAAc;QACpC,IAAM,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,oDAAuB,GAAvB,UAAwB,MAAc;QACpC,IAAM,SAAS,GAAG,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,CAAC;IACH,yBAAC;AAAD,CAAC,AA7ID,IA6IC;AA7IY,gDAAkB;AA+I/B,IAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;AACpD,kBAAe,kBAAkB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -2,8 +2,8 @@ declare const defaultWithGTConfigProps: {
|
|
|
2
2
|
readonly config: "./gt.config.json";
|
|
3
3
|
readonly runtimeUrl: "https://runtime.gtx.dev";
|
|
4
4
|
readonly cacheUrl: "https://cdn.gtx.dev";
|
|
5
|
-
readonly defaultLocale: "en
|
|
6
|
-
readonly getLocale: () => Promise<"en
|
|
5
|
+
readonly defaultLocale: "en";
|
|
6
|
+
readonly getLocale: () => Promise<"en">;
|
|
7
7
|
readonly locales: string[];
|
|
8
8
|
readonly maxConcurrentRequests: 100;
|
|
9
9
|
readonly maxBatchSize: 25;
|
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;AAYrE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,UAAU,GAAE,GAAQ,EACpB,KAAK,GAAE,iBAAsB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAYrE,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,CAAC;AAEpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,UAAU,GAAE,GAAQ,EACpB,KAAK,GAAE,iBAAsB,OA0Q9B;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 = void 0;
|
|
26
|
+
exports.initGT = exports.GTRouter = void 0;
|
|
27
27
|
exports.withGTConfig = withGTConfig;
|
|
28
28
|
var path_1 = __importDefault(require("path"));
|
|
29
29
|
var fs_1 = __importDefault(require("fs"));
|
|
@@ -31,6 +31,8 @@ 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;
|
|
34
36
|
/**
|
|
35
37
|
* Initializes General Translation settings for a Next.js application.
|
|
36
38
|
*
|
|
@@ -143,6 +145,10 @@ function withGTConfig(nextConfig, props) {
|
|
|
143
145
|
var customLoadTranslationsPath = typeof mergedConfig.loadTranslationsPath === 'string'
|
|
144
146
|
? mergedConfig.loadTranslationsPath
|
|
145
147
|
: resolveConfigFilepath('loadTranslations');
|
|
148
|
+
// Resolve router
|
|
149
|
+
var customRouterPath = typeof mergedConfig.routerPath === 'string'
|
|
150
|
+
? mergedConfig.routerPath
|
|
151
|
+
: resolveConfigFilepath('routing', ['.ts', '.js']);
|
|
146
152
|
// ---------- ERROR CHECKS ---------- //
|
|
147
153
|
// Local dictionary flag
|
|
148
154
|
if (customLoadDictionaryPath) {
|
|
@@ -209,7 +215,7 @@ function withGTConfig(nextConfig, props) {
|
|
|
209
215
|
_GENERALTRANSLATION_DICTIONARY_FILE_TYPE: resolvedDictionaryFilePathType,
|
|
210
216
|
})), { _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)
|
|
211
217
|
? {
|
|
212
|
-
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 || '' }) }),
|
|
218
|
+
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 || '' }) }),
|
|
213
219
|
}
|
|
214
220
|
: {})), webpack: function webpack() {
|
|
215
221
|
var _a = [];
|
|
@@ -235,6 +241,9 @@ function withGTConfig(nextConfig, props) {
|
|
|
235
241
|
webpackConfig.resolve.alias["gt-next/_load-dictionary"] =
|
|
236
242
|
path_1.default.resolve(webpackConfig.context, customLoadDictionaryPath);
|
|
237
243
|
}
|
|
244
|
+
if (customLoadDictionaryPath) {
|
|
245
|
+
webpackConfig.resolve.alias["gt-next/_routing"] = path_1.default.resolve(webpackConfig.context, customLoadDictionaryPath);
|
|
246
|
+
}
|
|
238
247
|
}
|
|
239
248
|
if (typeof (nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.webpack) === 'function') {
|
|
240
249
|
return nextConfig.webpack(webpackConfig, options);
|
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,4 +1,9 @@
|
|
|
1
|
-
import { NextResponse } from 'next/server';
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
|
+
type PathConfig = {
|
|
3
|
+
[key: string]: string | {
|
|
4
|
+
[key: string]: string;
|
|
5
|
+
};
|
|
6
|
+
};
|
|
2
7
|
/**
|
|
3
8
|
* Middleware factory to create a Next.js middleware for i18n routing and locale detection.
|
|
4
9
|
*
|
|
@@ -7,14 +12,14 @@ import { NextResponse } from 'next/server';
|
|
|
7
12
|
* If locale routing is enabled, it redirects to the localized pathname and
|
|
8
13
|
* updates the locale cookie.
|
|
9
14
|
*
|
|
10
|
-
* @param {Object} config - Configuration object for the middleware.
|
|
11
|
-
* @param {string} [config.defaultLocale='en'] - The default locale to use if no locale is detected.
|
|
12
|
-
* @param {string[]} [config.locales] - Array of supported locales. If provided, the locale will be validated against this list.
|
|
13
15
|
* @param {boolean} [config.localeRouting=true] - Flag to enable or disable automatic locale-based routing.
|
|
16
|
+
* @param {boolean} [config.prefixDefaultLocale=false] - Flag to enable or disable prefixing the default locale to the pathname, i.e., /en/about -> /about
|
|
14
17
|
* @returns {function} - A middleware function that processes the request and response.
|
|
15
18
|
*/
|
|
16
|
-
export default function createNextMiddleware({ localeRouting, prefixDefaultLocale, }
|
|
19
|
+
export default function createNextMiddleware({ localeRouting, prefixDefaultLocale, pathConfig, }: {
|
|
17
20
|
localeRouting?: boolean;
|
|
18
21
|
prefixDefaultLocale?: boolean;
|
|
19
|
-
|
|
22
|
+
pathConfig?: PathConfig;
|
|
23
|
+
}): (req: NextRequest) => NextResponse<unknown>;
|
|
24
|
+
export {};
|
|
20
25
|
//# sourceMappingURL=createNextMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAaxD,KAAK,UAAU,GAAG;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACnD,CAAC;AAEF;;;;;;;;;;;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,SAiR8B,WAAW,2BAoNzC"}
|
|
@@ -23,17 +23,13 @@ function extractLocale(pathname) {
|
|
|
23
23
|
* If locale routing is enabled, it redirects to the localized pathname and
|
|
24
24
|
* updates the locale cookie.
|
|
25
25
|
*
|
|
26
|
-
* @param {Object} config - Configuration object for the middleware.
|
|
27
|
-
* @param {string} [config.defaultLocale='en'] - The default locale to use if no locale is detected.
|
|
28
|
-
* @param {string[]} [config.locales] - Array of supported locales. If provided, the locale will be validated against this list.
|
|
29
26
|
* @param {boolean} [config.localeRouting=true] - Flag to enable or disable automatic locale-based routing.
|
|
27
|
+
* @param {boolean} [config.prefixDefaultLocale=false] - Flag to enable or disable prefixing the default locale to the pathname, i.e., /en/about -> /about
|
|
30
28
|
* @returns {function} - A middleware function that processes the request and response.
|
|
31
29
|
*/
|
|
32
30
|
function createNextMiddleware(_a) {
|
|
33
|
-
var _b = _a === void 0 ? {
|
|
34
|
-
|
|
35
|
-
prefixDefaultLocale: false,
|
|
36
|
-
} : _a, _c = _b.localeRouting, localeRouting = _c === void 0 ? true : _c, _d = _b.prefixDefaultLocale, prefixDefaultLocale = _d === void 0 ? false : _d;
|
|
31
|
+
var _b = _a.localeRouting, localeRouting = _b === void 0 ? true : _b, _c = _a.prefixDefaultLocale, prefixDefaultLocale = _c === void 0 ? false : _c, _d = _a.pathConfig, pathConfig = _d === void 0 ? {} : _d;
|
|
32
|
+
// i18n config
|
|
37
33
|
var envParams;
|
|
38
34
|
if (process.env._GENERALTRANSLATION_I18N_CONFIG_PARAMS) {
|
|
39
35
|
try {
|
|
@@ -51,6 +47,198 @@ function createNextMiddleware(_a) {
|
|
|
51
47
|
if (warningLocales.length)
|
|
52
48
|
console.warn((0, createErrors_1.createUnsupportedLocalesWarning)(warningLocales));
|
|
53
49
|
var approvedLocales = locales;
|
|
50
|
+
// ---------- PRE-PROCESSING PATHS ---------- //
|
|
51
|
+
// recursively build a tree for the shared path lookup
|
|
52
|
+
var buildTree = function (chunks, sharedPath, node) {
|
|
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) {
|
|
80
|
+
var sharedPath = _a[0], localizedPath = _a[1];
|
|
81
|
+
// Add the shared path itself
|
|
82
|
+
acc.push([sharedPath, sharedPath]);
|
|
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
|
+
}
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
acc[localizedPath] = sharedPath;
|
|
108
|
+
}
|
|
109
|
+
return acc;
|
|
110
|
+
}, {});
|
|
111
|
+
/**
|
|
112
|
+
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
113
|
+
* @param pathname The pathname to extract the shared path from
|
|
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
|
+
};
|
|
54
242
|
/**
|
|
55
243
|
* Processes the incoming request to determine the user's locale and sets a locale cookie.
|
|
56
244
|
* Optionally redirects the user based on the locale if locale-based routing is enabled.
|
|
@@ -61,19 +249,37 @@ function createNextMiddleware(_a) {
|
|
|
61
249
|
* - Sets a cookie with the detected or default locale.
|
|
62
250
|
* - Redirects to the correct locale route if locale routing is enabled.
|
|
63
251
|
*
|
|
64
|
-
* @param {
|
|
252
|
+
* @param {NextRequest} req - The incoming request object, containing URL and headers.
|
|
65
253
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
66
254
|
*/
|
|
67
255
|
function nextMiddleware(req) {
|
|
68
256
|
var _a, _b;
|
|
69
257
|
var headerList = new Headers(req.headers);
|
|
70
|
-
var res = server_1.NextResponse.next(
|
|
258
|
+
var res = server_1.NextResponse.next({
|
|
259
|
+
request: {
|
|
260
|
+
// New request headers
|
|
261
|
+
headers: headerList,
|
|
262
|
+
},
|
|
263
|
+
});
|
|
71
264
|
var candidates = [];
|
|
265
|
+
// routing
|
|
266
|
+
var routingConfig;
|
|
267
|
+
try {
|
|
268
|
+
routingConfig = require('gt-next/_routing');
|
|
269
|
+
}
|
|
270
|
+
catch (e) {
|
|
271
|
+
console.error(e);
|
|
272
|
+
}
|
|
273
|
+
// Clear any existing rewrite flag cookie
|
|
274
|
+
res.cookies.delete(internal_1.localeRewriteFlagName);
|
|
275
|
+
// Check for rewrite flag in cookies
|
|
276
|
+
var rewriteFlag = req.headers.get(internal_1.localeRewriteFlagName) === 'true';
|
|
277
|
+
// ---------- LOCALE DETECTION ---------- //
|
|
72
278
|
// Check pathname locales
|
|
73
279
|
var pathnameLocale;
|
|
280
|
+
var pathname = req.nextUrl.pathname;
|
|
74
281
|
if (localeRouting) {
|
|
75
282
|
// Check if there is any supported locale in the pathname
|
|
76
|
-
var pathname = req.nextUrl.pathname;
|
|
77
283
|
var extractedLocale = (0, generaltranslation_1.standardizeLocale)(extractLocale(pathname) || '');
|
|
78
284
|
if ((0, generaltranslation_1.isValidLocale)(extractedLocale)) {
|
|
79
285
|
pathnameLocale = extractedLocale;
|
|
@@ -82,7 +288,7 @@ function createNextMiddleware(_a) {
|
|
|
82
288
|
}
|
|
83
289
|
// Check cookie locale
|
|
84
290
|
var cookieLocale = req.cookies.get(internal_1.localeCookieName);
|
|
85
|
-
if ((0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
291
|
+
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && (0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
86
292
|
var resetCookieName = 'generaltranslation.locale.reset';
|
|
87
293
|
var resetCookie = req.cookies.get(resetCookieName);
|
|
88
294
|
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
@@ -93,11 +299,12 @@ function createNextMiddleware(_a) {
|
|
|
93
299
|
candidates.push(cookieLocale.value);
|
|
94
300
|
}
|
|
95
301
|
}
|
|
302
|
+
var refererLocale;
|
|
96
303
|
if (localeRouting) {
|
|
97
304
|
// If there's no locale, try to get one from the referer
|
|
98
305
|
var referer = headerList.get('referer');
|
|
99
306
|
if (referer && typeof referer === 'string') {
|
|
100
|
-
|
|
307
|
+
refererLocale = extractLocale((_a = new URL(referer)) === null || _a === void 0 ? void 0 : _a.pathname);
|
|
101
308
|
if ((0, generaltranslation_1.isValidLocale)(refererLocale || ''))
|
|
102
309
|
candidates.push(refererLocale || '');
|
|
103
310
|
}
|
|
@@ -112,27 +319,94 @@ function createNextMiddleware(_a) {
|
|
|
112
319
|
var userLocale = (0, generaltranslation_1.standardizeLocale)((0, generaltranslation_1.determineLocale)(candidates.filter(generaltranslation_1.isValidLocale), approvedLocales) ||
|
|
113
320
|
defaultLocale);
|
|
114
321
|
res.headers.set(internal_1.localeHeaderName, userLocale);
|
|
322
|
+
if (userLocale) {
|
|
323
|
+
// TODO: make sure this is compatable with user changing browser langugage
|
|
324
|
+
res.cookies.set('generaltranslation.middleware.locale', userLocale);
|
|
325
|
+
}
|
|
326
|
+
// ---------- ROUTING ---------- //
|
|
115
327
|
if (localeRouting) {
|
|
116
|
-
var
|
|
328
|
+
var pathname_1 = req.nextUrl.pathname;
|
|
329
|
+
// Only strip off the locale if it's a valid locale
|
|
330
|
+
var unprefixedPathname = pathnameLocale
|
|
331
|
+
? pathname_1.replace(new RegExp("^/".concat(pathnameLocale)), '')
|
|
332
|
+
: pathname_1;
|
|
117
333
|
var originalUrl = req.nextUrl;
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
334
|
+
// Get the shared path for the unprefixed pathname
|
|
335
|
+
var sharedPath = getSharedPath(unprefixedPathname);
|
|
336
|
+
// Localized path (/en-US/blog, /fr/le-about, /fr/dashboard/[id]/custom)
|
|
337
|
+
var localizedPath = sharedPath && getLocalizedPath(sharedPath, userLocale);
|
|
338
|
+
// Combine localized path with dynamic parameters (/en-US/blog, /fr/le-about, /fr/dashboard/1/le-custom)
|
|
339
|
+
var localizedPathWithParameters = localizedPath && replaceDynamicSegments(pathname_1, localizedPath);
|
|
340
|
+
// BASE CASE: same locale, same path (/en-US/blog -> /en-US/blog), (/en-US/dashboard/1/custom -> /en-US/dashboard/1/custom)
|
|
341
|
+
if (localizedPathWithParameters &&
|
|
342
|
+
pathname_1 === localizedPathWithParameters &&
|
|
343
|
+
userLocale === defaultLocale) {
|
|
344
|
+
return res;
|
|
123
345
|
}
|
|
124
|
-
//
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
if (!prefixDefaultLocale && (0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
128
|
-
var rewrittenRes = server_1.NextResponse.rewrite(newUrl, req.nextUrl);
|
|
129
|
-
rewrittenRes.headers.set(internal_1.localeHeaderName, userLocale);
|
|
130
|
-
return rewrittenRes;
|
|
346
|
+
// If we've already rewritten this path, don't process it again
|
|
347
|
+
if (rewriteFlag) {
|
|
348
|
+
return res;
|
|
131
349
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
350
|
+
// REWRITE CASE: proxies a localized path, same locale (/fr/le-about => /fr/about)
|
|
351
|
+
if (localizedPathWithParameters &&
|
|
352
|
+
pathname_1 === localizedPathWithParameters) {
|
|
353
|
+
var rewritePath = replaceDynamicSegments(localizedPathWithParameters, "/".concat(userLocale).concat(sharedPath));
|
|
354
|
+
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
355
|
+
rewriteUrl.search = originalUrl.search;
|
|
356
|
+
headerList.set(internal_1.localeHeaderName, userLocale);
|
|
357
|
+
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
358
|
+
headers: headerList,
|
|
359
|
+
});
|
|
360
|
+
response.headers.set(internal_1.localeRewriteFlagName, 'true');
|
|
361
|
+
if (userLocale) {
|
|
362
|
+
response.cookies.set('generaltranslation.middleware.locale', userLocale);
|
|
363
|
+
}
|
|
364
|
+
return response;
|
|
365
|
+
}
|
|
366
|
+
// REWRITE CASE: no locale prefix
|
|
367
|
+
if (!pathnameLocale &&
|
|
368
|
+
!prefixDefaultLocale &&
|
|
369
|
+
(0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
370
|
+
var rewritePath = "/".concat(userLocale).concat(pathname_1);
|
|
371
|
+
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
372
|
+
rewriteUrl.search = originalUrl.search;
|
|
373
|
+
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
374
|
+
headers: headerList,
|
|
375
|
+
});
|
|
376
|
+
response.headers.set(internal_1.localeRewriteFlagName, 'true');
|
|
377
|
+
return response;
|
|
378
|
+
}
|
|
379
|
+
// REDIRECT CASE: non-i18n path
|
|
380
|
+
// 1. use customized path if it exists (/en-US/about -> /fr/le-about), (/about -> /fr/le-about)
|
|
381
|
+
// 2. otherwise, if pathname has locale prefix, replace it (/en-US/welcome -> /fr/welcome)
|
|
382
|
+
// 3. otherwise, prefix with locale (/welcome -> /fr/welcome)
|
|
383
|
+
if (pathnameLocale !== userLocale) {
|
|
384
|
+
// determine redirect path
|
|
385
|
+
// TODO: check out standardizeLocale(extractLocale(pathname) || ''); TL which gets standardized to FIL causing an infinite loop, instead standardize later
|
|
386
|
+
var redirectPath = localizedPathWithParameters ||
|
|
387
|
+
(pathnameLocale
|
|
388
|
+
? pathname_1.replace(new RegExp("^/".concat(pathnameLocale)), "/".concat(userLocale))
|
|
389
|
+
: "/".concat(userLocale).concat(pathname_1));
|
|
390
|
+
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
391
|
+
redirectUrl.search = originalUrl.search;
|
|
392
|
+
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
393
|
+
if (userLocale) {
|
|
394
|
+
response.cookies.set('generaltranslation.middleware.locale', userLocale);
|
|
395
|
+
}
|
|
396
|
+
return response;
|
|
397
|
+
}
|
|
398
|
+
// REDIRECT CASE: mismatched localized path (/fr/about -> /fr/le-about), mismatched dynamic path (/fr/dashboard/1/custom -> /fr/dashboard/1/le-custom)
|
|
399
|
+
if (localizedPathWithParameters) {
|
|
400
|
+
var redirectUrl = new URL(localizedPathWithParameters, originalUrl);
|
|
401
|
+
redirectUrl.search = originalUrl.search;
|
|
402
|
+
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
403
|
+
if (userLocale) {
|
|
404
|
+
response.cookies.set('generaltranslation.middleware.locale', userLocale);
|
|
405
|
+
}
|
|
406
|
+
return response;
|
|
135
407
|
}
|
|
408
|
+
// BASE CASE
|
|
409
|
+
return res;
|
|
136
410
|
}
|
|
137
411
|
return res;
|
|
138
412
|
}
|
|
@@ -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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"}
|
|
@@ -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":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAIxD,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,2CAsCnD"}
|
|
@@ -14,8 +14,10 @@ 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");
|
|
17
18
|
var client_1 = require("gt-react/client");
|
|
18
19
|
var navigation_1 = require("next/navigation");
|
|
20
|
+
var react_1 = require("react");
|
|
19
21
|
function ClientProvider(props) {
|
|
20
22
|
// locale change on client, trigger page reload
|
|
21
23
|
var router = (0, navigation_1.useRouter)();
|
|
@@ -23,6 +25,30 @@ function ClientProvider(props) {
|
|
|
23
25
|
document.cookie = "generaltranslation.locale.reset=true;path=/";
|
|
24
26
|
router.refresh();
|
|
25
27
|
};
|
|
28
|
+
// Trigger page reload when locale changes
|
|
29
|
+
// When nav to same route but in diff locale, client components were cached and not re-rendered
|
|
30
|
+
var pathname = (0, navigation_1.usePathname)();
|
|
31
|
+
(0, react_1.useEffect)(function () {
|
|
32
|
+
var _a, _b;
|
|
33
|
+
console.log("".concat(pathname, " re-rendered"));
|
|
34
|
+
var newLocale = (_a = document.cookie
|
|
35
|
+
.split('; ')
|
|
36
|
+
.find(function (row) { return row.startsWith("generaltranslation.middleware.locale="); })) === null || _a === void 0 ? void 0 : _a.split('=')[1];
|
|
37
|
+
if (newLocale && newLocale !== props.locale) {
|
|
38
|
+
var rewriteFlag = ((_b = document
|
|
39
|
+
.querySelector("meta[name=\"".concat(internal_1.localeRewriteFlagName, "\"]"))) === null || _b === void 0 ? void 0 : _b.getAttribute('content')) === 'true';
|
|
40
|
+
if (!rewriteFlag) {
|
|
41
|
+
console.log('New cookie locale', newLocale, pathname);
|
|
42
|
+
// reload server
|
|
43
|
+
router.refresh();
|
|
44
|
+
// reload client
|
|
45
|
+
window.location.reload();
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
console.log('DO NOTHING: Rewrite flag is true', pathname);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}, [pathname]); // Re-run when pathname changes
|
|
26
52
|
return (0, jsx_runtime_1.jsx)(client_1.ClientProvider, __assign({ onLocaleChange: onLocaleChange }, props));
|
|
27
53
|
}
|
|
28
54
|
//# sourceMappingURL=ClientProviderWrapper.js.map
|
|
@@ -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;;;;;;;;;;;;;AAOb,iCAuCC;;AA7CD,wDAAoE;AACpE,0CAAoE;AAEpE,8CAAyD;AACzD,+BAAkC;AAElC,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,6CAA6C,CAAC;QAChE,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,OAAO,CAAC,GAAG,CAAC,UAAG,QAAQ,iBAAc,CAAC,CAAC;QACvC,IAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,MAAM;aAC9B,KAAK,CAAC,IAAI,CAAC;aACX,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,UAAU,CAAC,uCAAuC,CAAC,EAAvD,CAAuD,CAAC,0CACrE,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,gCAAqB,QAAI,CAAC,0CACrD,YAAY,CAAC,SAAS,CAAC,MAAK,MAAM,CAAC;YAEzC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACtD,gBAAgB;gBAChB,MAAM,CAAC,OAAO,EAAE,CAAC;gBAEjB,gBAAgB;gBAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;YAC5D,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLocale.d.ts","sourceRoot":"","sources":["../../src/request/getLocale.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAA8B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"getLocale.d.ts","sourceRoot":"","sources":["../../src/request/getLocale.ts"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,wBAA8B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAqBzD"}
|
|
@@ -76,10 +76,13 @@ function getLocale() {
|
|
|
76
76
|
_a = _c.sent();
|
|
77
77
|
I18NConfig_1 = (0, getI18NConfig_1.default)();
|
|
78
78
|
getLocaleFunction = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
79
|
+
var res;
|
|
79
80
|
return __generator(this, function (_a) {
|
|
80
81
|
switch (_a.label) {
|
|
81
82
|
case 0: return [4 /*yield*/, (0, getNextLocale_1.getNextLocale)(I18NConfig_1.getDefaultLocale(), I18NConfig_1.getLocales())];
|
|
82
|
-
case 1:
|
|
83
|
+
case 1:
|
|
84
|
+
res = _a.sent();
|
|
85
|
+
return [2 /*return*/, res];
|
|
83
86
|
}
|
|
84
87
|
});
|
|
85
88
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLocale.js","sourceRoot":"","sources":["../../src/request/getLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,
|
|
1
|
+
{"version":3,"file":"getLocale.js","sourceRoot":"","sources":["../../src/request/getLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,4BAqBC;AAnCD,8EAAwD;AACxD,uDAAsD;AAEtD,IAAI,iBAAwC,CAAC;AAE7C;;;;;;;;GAQG;AACH,SAA8B,SAAS;;;;;;;;yBACjC,iBAAiB,EAAjB,wBAAiB;oBAAS,qBAAM,iBAAiB,EAAE,EAAA;wBAAhC,sBAAO,SAAyB,EAAC;;;oBAGhD,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;oBAClD,eAAe,GACnB,CAAA,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,SAAS,KAAI,mBAAmB,CAAC,SAAS,CAAC;oBAC5D,qBAAM,eAAe,EAAE,EAAA;;oBAAhC,MAAM,GAAG,SAAuB;oBACtC,iBAAiB,GAAG,eAAe,CAAC;oBACpC,sBAAO,MAAM,EAAC;;;oBAER,eAAa,IAAA,uBAAa,GAAE,CAAC;oBACnC,iBAAiB,GAAG;;;;wCACN,qBAAM,IAAA,6BAAa,EAC7B,YAAU,CAAC,gBAAgB,EAAE,EAC7B,YAAU,CAAC,UAAU,EAAE,CACxB,EAAA;;oCAHK,GAAG,GAAG,SAGX;oCACD,sBAAO,GAAG,EAAC;;;yBACZ,CAAC;oBACK,qBAAM,iBAAiB,EAAE,EAAA;wBAAhC,sBAAO,SAAyB,EAAC;;;;;CAEpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"T.d.ts","sourceRoot":"","sources":["../../../src/server-dir/buildtime/T.tsx"],"names":[],"mappings":"AAmBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,iBAAe,CAAC,CAAC,EACf,QAAQ,EACR,EAAE,EACF,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,GAAG,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"T.d.ts","sourceRoot":"","sources":["../../../src/server-dir/buildtime/T.tsx"],"names":[],"mappings":"AAmBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,iBAAe,CAAC,CAAC,EACf,QAAQ,EACR,EAAE,EACF,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,GAAG,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,GAAG,CAAC,CA4Hf;kBApIc,CAAC;;;AAwIhB,eAAe,CAAC,CAAC"}
|
|
@@ -132,7 +132,9 @@ function T(_a) {
|
|
|
132
132
|
return [4 /*yield*/, translationsPromise];
|
|
133
133
|
case 2:
|
|
134
134
|
translations = _d.sent();
|
|
135
|
-
translationEntry =
|
|
135
|
+
translationEntry = id
|
|
136
|
+
? (translations === null || translations === void 0 ? void 0 : translations[id]) || (translations === null || translations === void 0 ? void 0 : translations[hash])
|
|
137
|
+
: translations === null || translations === void 0 ? void 0 : translations[hash];
|
|
136
138
|
renderTranslation = function (target) {
|
|
137
139
|
return (0, internal_1.renderTranslatedChildren)({
|
|
138
140
|
source: taggedChildren,
|
|
@@ -150,6 +152,7 @@ function T(_a) {
|
|
|
150
152
|
return [2 /*return*/, renderDefault()];
|
|
151
153
|
}
|
|
152
154
|
// ----- TRANSLATE ON DEMAND ----- //
|
|
155
|
+
// dev only
|
|
153
156
|
// Since this is the buildtime translation component <T>, this is dev-only
|
|
154
157
|
if (!I18NConfig.isDevelopmentApiEnabled())
|
|
155
158
|
return [2 /*return*/, renderDefault()];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"T.js","sourceRoot":"","sources":["../../../src/server-dir/buildtime/T.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iFAA2D;AAC3D,sEAAgD;AAChD,+BAAiC;AACjC,8CAO2B;AAC3B,+EAAyD;AAEzD,4CAAwD;AAExD,SAAe,QAAQ;wDAAC,EAA2C;YAAzC,QAAQ,cAAA;;;wBACzB,qBAAM,QAAQ,EAAA;wBAArB,sBAAO,SAAc,EAAC;;;;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,SAAe,CAAC;wDAAC,EAQhB;;;YAPC,QAAQ,cAAA,EACR,EAAE,QAAA,EACF,OAAO,aAAA;;;;oBAQD,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBACpB,qBAAM,IAAA,mBAAS,GAAE,EAAA;;oBAA1B,MAAM,GAAG,SAAiB;oBAC1B,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;oBAC9C,KACJ,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,EADjC,mBAAmB,QAAA,EAAE,0BAA0B,QAAA,CACb;oBAInC,cAAc,GAAG,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC;oBAK3C,aAAa,GAAG;wBACpB,OAAO,IAAA,gCAAqB,EAAC;4BAC3B,QAAQ,EAAE,cAAc;4BACxB,aAAa,eAAA;4BACb,cAAc,0BAAA;yBACf,CAAC,CAAC;oBACL,CAAC,CAAC;oBAEF,6CAA6C;oBAE7C,6DAA6D;oBAC7D,kDAAkD;oBAClD,yCAAyC;oBACzC,IAAI,CAAC,mBAAmB,EAAE,CAAC;wBACzB,sBAAO,aAAa,EAAE,EAAC;oBACzB,CAAC;oBAKK,mBAAmB,GAAG,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;oBAI/D,iBAAiB,GAAG,IAAA,iCAAsB,EAAC,cAAc,CAAC,CAAC;oBAC3D,IAAI,GAAG,IAAA,oBAAe,+BAC1B,MAAM,EAAE,iBAAiB,IACtB,CAAC,OAAO,IAAI,EAAE,OAAO,SAAA,EAAE,CAAC,GACxB,CAAC,EAAE,IAAI,EAAE,EAAE,IAAA,EAAE,CAAC,KACjB,UAAU,EAAE,KAAK,IACjB,CAAC;oBAGkB,qBAAM,mBAAmB,EAAA;;oBAAxC,YAAY,GAAG,SAAyB;oBACxC,gBAAgB,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"T.js","sourceRoot":"","sources":["../../../src/server-dir/buildtime/T.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getGT.d.ts","sourceRoot":"","sources":["../../../src/server-dir/buildtime/getGT.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D;;;;;;;;GAQG;AACH,wBAA8B,KAAK,IAAI,OAAO,CAC5C,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB,KAAK,MAAM,CAC/D,
|
|
1
|
+
{"version":3,"file":"getGT.d.ts","sourceRoot":"","sources":["../../../src/server-dir/buildtime/getGT.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D;;;;;;;;GAQG;AACH,wBAA8B,KAAK,IAAI,OAAO,CAC5C,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB,KAAK,MAAM,CAC/D,CAyHA"}
|
|
@@ -104,8 +104,21 @@ function getGT() {
|
|
|
104
104
|
if (!translationRequired)
|
|
105
105
|
return renderContent(source, [defaultLocale]);
|
|
106
106
|
// ----- GET TRANSLATION ----- //
|
|
107
|
-
var
|
|
108
|
-
|
|
107
|
+
var translationEntry = undefined;
|
|
108
|
+
// Use id to index
|
|
109
|
+
if (options === null || options === void 0 ? void 0 : options.id) {
|
|
110
|
+
translationEntry = translations === null || translations === void 0 ? void 0 : translations[options === null || options === void 0 ? void 0 : options.id];
|
|
111
|
+
}
|
|
112
|
+
// Calculate hash
|
|
113
|
+
var hash = '';
|
|
114
|
+
var calcHash = function () {
|
|
115
|
+
return (0, id_1.hashJsxChildren)(__assign(__assign(__assign({ source: source }, ((options === null || options === void 0 ? void 0 : options.context) && { context: options === null || options === void 0 ? void 0 : options.context })), ((options === null || options === void 0 ? void 0 : options.id) && { id: options === null || options === void 0 ? void 0 : options.id })), { dataFormat: 'JSX' }));
|
|
116
|
+
};
|
|
117
|
+
// Use hash to index
|
|
118
|
+
if (!translationEntry) {
|
|
119
|
+
hash = calcHash();
|
|
120
|
+
translationEntry = translations === null || translations === void 0 ? void 0 : translations[hash];
|
|
121
|
+
}
|
|
109
122
|
// ----- RENDER TRANSLATION ----- //
|
|
110
123
|
// If a translation already exists
|
|
111
124
|
if ((translationEntry === null || translationEntry === void 0 ? void 0 : translationEntry.state) === 'success')
|
|
@@ -119,6 +132,9 @@ function getGT() {
|
|
|
119
132
|
console.warn((0, createErrors_1.createStringTranslationError)(string, options === null || options === void 0 ? void 0 : options.id, 't'));
|
|
120
133
|
return renderContent(source, [defaultLocale]);
|
|
121
134
|
}
|
|
135
|
+
// Get hash
|
|
136
|
+
if (!hash)
|
|
137
|
+
hash = calcHash();
|
|
122
138
|
// Translate on demand
|
|
123
139
|
I18NConfig.translateContent({
|
|
124
140
|
source: source,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getGT.js","sourceRoot":"","sources":["../../../src/server-dir/buildtime/getGT.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,
|
|
1
|
+
{"version":3,"file":"getGT.js","sourceRoot":"","sources":["../../../src/server-dir/buildtime/getGT.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ function Currency(_a) {
|
|
|
61
61
|
: renderedValue;
|
|
62
62
|
// Format the number as currency according to the locale
|
|
63
63
|
var formattedValue = typeof renderedValue === 'number'
|
|
64
|
-
? (0, generaltranslation_1.formatCurrency)(
|
|
64
|
+
? (0, generaltranslation_1.formatCurrency)(renderedValue, currency, __assign({ locales: locales }, options))
|
|
65
65
|
: renderedValue;
|
|
66
66
|
return ((0, jsx_runtime_1.jsx)("span", { "data-_gt": generaltranslation, "data-_gt-variable-name": name, "data-_gt-variable-type": 'currency', "data-_gt-variable-options": JSON.stringify(__assign({ style: 'currency', currency: currency }, options)), "data-_gt-unformatted-value": typeof renderedValue === 'number' && !isNaN(renderedValue)
|
|
67
67
|
? renderedValue
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Currency.js","sourceRoot":"","sources":["../../src/variables/Currency.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAoD;AACpD,8EAAwD;AAExD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAS,QAAQ,CAAC,EAgBjB;IAfC,IAAA,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,eAA8C,EAA9C,OAAO,mBAAG,CAAC,IAAA,uBAAa,GAAE,CAAC,gBAAgB,EAAE,CAAC,KAAA,EAC3C,KAAK,cAPQ,+DAQjB,CADS;IAUA,IAAY,kBAAkB,GAAK,KAAK,YAAV,CAAW;IAEjD,sCAAsC;IACtC,IAAI,aAAa,GACf,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,KAAK,WAAW;QAC7D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,KAAK,CAAC;IACZ,aAAa;QACX,OAAO,aAAa,KAAK,QAAQ;YAC/B,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC;YAC3B,CAAC,CAAC,aAAa,CAAC;IAEpB,wDAAwD;IACxD,IAAM,cAAc,GAClB,OAAO,aAAa,KAAK,QAAQ;QAC/B,CAAC,CAAC,IAAA,mCAAc,EAAC,
|
|
1
|
+
{"version":3,"file":"Currency.js","sourceRoot":"","sources":["../../src/variables/Currency.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAoD;AACpD,8EAAwD;AAExD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAS,QAAQ,CAAC,EAgBjB;IAfC,IAAA,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAChB,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,eAA8C,EAA9C,OAAO,mBAAG,CAAC,IAAA,uBAAa,GAAE,CAAC,gBAAgB,EAAE,CAAC,KAAA,EAC3C,KAAK,cAPQ,+DAQjB,CADS;IAUA,IAAY,kBAAkB,GAAK,KAAK,YAAV,CAAW;IAEjD,sCAAsC;IACtC,IAAI,aAAa,GACf,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,KAAK,WAAW;QAC7D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,KAAK,CAAC;IACZ,aAAa;QACX,OAAO,aAAa,KAAK,QAAQ;YAC/B,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC;YAC3B,CAAC,CAAC,aAAa,CAAC;IAEpB,wDAAwD;IACxD,IAAM,cAAc,GAClB,OAAO,aAAa,KAAK,QAAQ;QAC/B,CAAC,CAAC,IAAA,mCAAc,EAAC,aAAa,EAAE,QAAQ,aAAI,OAAO,SAAA,IAAK,OAAO,EAAG;QAClE,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO,CACL,6CACY,kBAAkB,4BACJ,IAAI,4BACJ,UAAU,+BACP,IAAI,CAAC,SAAS,YACvC,KAAK,EAAE,UAAU,EACjB,QAAQ,UAAA,IACL,OAAO,EACV,gCAEA,OAAO,aAAa,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;YACxD,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,SAAS,EAEf,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAC9B,wBAAwB,kBAEvB,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,GAC3D,CACR,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,gBAAgB,GAAG,mBAAmB,CAAC;AAEhD,kBAAe,QAAQ,CAAC"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
14
|
var t = {};
|
|
4
15
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
@@ -58,7 +69,7 @@ function DateTime(_a) {
|
|
|
58
69
|
}
|
|
59
70
|
// Format the date according to the locale and options
|
|
60
71
|
var dateString = dateValue
|
|
61
|
-
? (0, generaltranslation_1.formatDateTime)(
|
|
72
|
+
? (0, generaltranslation_1.formatDateTime)(dateValue, __assign({ locales: locales }, options))
|
|
62
73
|
: '';
|
|
63
74
|
var formattedValue = dateString.replace(/[\u200F\u202B\u202E]/g, '');
|
|
64
75
|
// Render the formatted date within a span element
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../src/variables/DateTime.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../src/variables/DateTime.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAoD;AACpD,8EAAwD;AAExD;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAS,QAAQ,CAAC,EAcjB;IAbC,IAAA,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,eAA8C,EAA9C,OAAO,mBAAG,CAAC,IAAA,uBAAa,GAAE,CAAC,gBAAgB,EAAE,CAAC,KAAA,EAC3C,KAAK,cANQ,mDAOjB,CADS;IASA,IAAY,kBAAkB,GAAK,KAAK,YAAV,CAAW;IACjD,IAAI,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;QACpE,KAAK,GAAG,QAAQ,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CACL,6CACY,kBAAkB,4BACJ,IAAI,4BACJ,MAAM,+BACH,OAAO,EAClC,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,GAC9B,CACH,CAAC;IACJ,CAAC;IAED,6EAA6E;IAC7E,IAAI,SAA2B,CAAC;IAEhC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,mCAAmC;IACzE,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACrC,SAAS,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;SAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QACjC,SAAS,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,sDAAsD;IACtD,IAAM,UAAU,GAAG,SAAS;QAC1B,CAAC,CAAC,IAAA,mCAAc,EAAC,SAAS,aAAI,OAAO,SAAA,IAAK,OAAO,EAAG;QACpD,CAAC,CAAC,EAAE,CAAC;IACP,IAAM,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAEvE,kDAAkD;IAClD,OAAO,CACL,6CACY,kBAAkB,4BACJ,IAAI,4BACJ,MAAM,+BACH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gCAEhD,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAEhD,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAC9B,wBAAwB,kBAEvB,cAAc,GACV,CACR,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,gBAAgB,GAAG,mBAAmB,CAAC;AAEhD,kBAAe,QAAQ,CAAC;AAExB;;;;GAIG;AACH,SAAS,WAAW,CAAC,KAAU;IAC7B,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;AAChC,CAAC"}
|
package/dist/variables/Num.js
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
14
|
var t = {};
|
|
4
15
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
@@ -50,7 +61,7 @@ function Num(_a) {
|
|
|
50
61
|
: renderedValue;
|
|
51
62
|
// Format the number according to the locale
|
|
52
63
|
var formattedValue = typeof renderedValue === 'number'
|
|
53
|
-
? (0, generaltranslation_1.formatNum)(
|
|
64
|
+
? (0, generaltranslation_1.formatNum)(renderedValue, __assign({ locales: locales }, options))
|
|
54
65
|
: renderedValue;
|
|
55
66
|
return ((0, jsx_runtime_1.jsx)("span", { "data-_gt": generaltranslation, "data-_gt-variable-name": name, "data-_gt-variable-type": 'number', "data-_gt-variable-options": JSON.stringify(options), "data-_gt-unformatted-value": typeof renderedValue === 'number' && !isNaN(renderedValue)
|
|
56
67
|
? renderedValue
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Num.js","sourceRoot":"","sources":["../../src/variables/Num.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Num.js","sourceRoot":"","sources":["../../src/variables/Num.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA+C;AAC/C,8EAAwD;AAExD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAS,GAAG,CAAC,EAcZ;IAbC,IAAA,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EACZ,eAA8C,EAA9C,OAAO,mBAAG,CAAC,IAAA,uBAAa,GAAE,CAAC,gBAAgB,EAAE,CAAC,KAAA,EAC3C,KAAK,cANG,mDAOZ,CADS;IASA,IAAY,kBAAkB,GAAK,KAAK,YAAV,CAAW;IAEjD,iCAAiC;IACjC,IAAI,aAAa,GACf,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,KAAK,WAAW;QAC7D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,KAAK,CAAC;IACZ,aAAa;QACX,OAAO,aAAa,KAAK,QAAQ;YAC/B,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC;YAC3B,CAAC,CAAC,aAAa,CAAC;IAEpB,4CAA4C;IAC5C,IAAM,cAAc,GAClB,OAAO,aAAa,KAAK,QAAQ;QAC/B,CAAC,CAAC,IAAA,8BAAS,EAAC,aAAa,aAAI,OAAO,SAAA,IAAK,OAAO,EAAG;QACnD,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO,CACL,6CACY,kBAAkB,4BACJ,IAAI,4BACJ,QAAQ,+BACL,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gCAEhD,OAAO,aAAa,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;YACxD,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,SAAS,EAEf,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAC9B,wBAAwB,kBAEvB,cAAc,GACV,CACR,CAAC;AACJ,CAAC;AAED,GAAG,CAAC,gBAAgB,GAAG,iBAAiB,CAAC;AAEzC,kBAAe,GAAG,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "5.2.
|
|
3
|
+
"version": "5.2.9-alpha.0",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
@@ -9,9 +9,9 @@
|
|
|
9
9
|
"react-dom": ">=16.8.0 <20.0.0"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@generaltranslation/supported-locales": "^2.0.
|
|
13
|
-
"generaltranslation": "^6.2.
|
|
14
|
-
"gt-react": "^9.2.
|
|
12
|
+
"@generaltranslation/supported-locales": "^2.0.7-alpha.0",
|
|
13
|
+
"generaltranslation": "^6.2.2-alpha.0",
|
|
14
|
+
"gt-react": "^9.2.7-alpha.0"
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"patch": "npm version patch",
|
|
@@ -66,6 +66,9 @@
|
|
|
66
66
|
"./_request": {
|
|
67
67
|
"default": "./dist/_request.js"
|
|
68
68
|
},
|
|
69
|
+
"./routing": {
|
|
70
|
+
"default": "./dist/_routing.js"
|
|
71
|
+
},
|
|
69
72
|
"./_dictionary": {
|
|
70
73
|
"default": "./dist/_dictionary.js"
|
|
71
74
|
},
|
|
@@ -93,6 +96,9 @@
|
|
|
93
96
|
"_request": [
|
|
94
97
|
"./dist/_request.d.ts"
|
|
95
98
|
],
|
|
99
|
+
"_routing": [
|
|
100
|
+
"./dist/_routing.d.ts"
|
|
101
|
+
],
|
|
96
102
|
"_dictionary": [
|
|
97
103
|
"./dist/_dictionary.d.ts"
|
|
98
104
|
],
|
|
@@ -122,6 +128,9 @@
|
|
|
122
128
|
"gt-next/_request": [
|
|
123
129
|
"/dist/_request"
|
|
124
130
|
],
|
|
131
|
+
"gt-next/_routing": [
|
|
132
|
+
"./dist/_routing.d.ts"
|
|
133
|
+
],
|
|
125
134
|
"gt-next/_dictionary": [
|
|
126
135
|
"/dist/_dictionary"
|
|
127
136
|
],
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/translations/index.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/translations/index.ts"],"names":[],"mappings":""}
|