@paroicms/server 1.59.2 → 1.60.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/common/serve-text-or.js +2 -2
- package/dist/common/serve-text-or.js.map +1 -1
- package/dist/modules/core/media/media.resolver.d.ts +2 -2
- package/dist/modules/public-site/liquidjs-filters/head-tags-filter.js +1 -1
- package/dist/modules/public-site/liquidjs-filters/head-tags-filter.js.map +1 -1
- package/dist/modules/public-site/public-site.controller.d.ts +1 -1
- package/dist/modules/public-site/public-site.controller.js +5 -5
- package/dist/modules/public-site/public-site.controller.js.map +1 -1
- package/dist/modules/public-site/serve-document/serve-document.js +2 -9
- package/dist/modules/public-site/serve-document/serve-document.js.map +1 -1
- package/dist/public-payload/make-public-payload.d.ts +10 -0
- package/dist/public-payload/{make-basic-payload.js → make-public-payload.js} +11 -3
- package/dist/public-payload/make-public-payload.js.map +1 -0
- package/dist/public-payload/public-payload.types.d.ts +1 -1
- package/dist/public-payload/translations.queries.js +2 -2
- package/dist/public-payload/translations.queries.js.map +1 -1
- package/locales/en.json +0 -8
- package/locales/fr.json +0 -8
- package/package.json +2 -2
- package/dist/public-payload/make-basic-payload.d.ts +0 -6
- package/dist/public-payload/make-basic-payload.js.map +0 -1
|
@@ -6,7 +6,7 @@ const internal_server_lib_1 = require("@paroicms/internal-server-lib");
|
|
|
6
6
|
const http_helpers_1 = require("../express/http-helpers");
|
|
7
7
|
const render_liquidjs_1 = require("../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
8
8
|
const rendering_context_1 = require("../liquidjs-tools/liquidjs-rendering/rendering-context");
|
|
9
|
-
const
|
|
9
|
+
const make_public_payload_1 = require("../public-payload/make-public-payload");
|
|
10
10
|
const text_cache_1 = require("./text-cache");
|
|
11
11
|
const tracker_report_1 = require("./tracker-report");
|
|
12
12
|
function serveTextFromCacheOr(siteContext, tracker, options) {
|
|
@@ -57,7 +57,7 @@ async function render404Html(siteContext, res, options) {
|
|
|
57
57
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });
|
|
58
58
|
const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
|
|
59
59
|
templateNames: ["404"],
|
|
60
|
-
payload: (0,
|
|
60
|
+
payload: (0, make_public_payload_1.makeDetachedPublicPayload)(siteContext, renderingContext, options),
|
|
61
61
|
});
|
|
62
62
|
cacheVal = await siteContext.textCache.setCacheValue({
|
|
63
63
|
cacheKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":";;AAeA,oDAwDC;AAED,sCAgCC;AAzGD,uEAA4E;AAE5E,0DAA2D;AAC3D,0FAA4F;AAC5F,8FAAgG;AAChG
|
|
1
|
+
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":";;AAeA,oDAwDC;AAED,sCAgCC;AAzGD,uEAA4E;AAE5E,0DAA2D;AAC3D,0FAA4F;AAC5F,8FAAgG;AAChG,+EAAkF;AAElF,6CAA4C;AAC5C,qDAA0D;AAO1D,SAAgB,oBAAoB,CAClC,WAAwB,EACxB,OAAgB,EAChB,OAQC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAE5B,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc;YAC3C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACxD;gBACE,QAAQ;gBACR,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,IAAA,+BAAgB,EAAC;gBACf,GAAG;gBACH,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,GAAG;wBACH,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA+B;IAE/B,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IACjF,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;YACrE,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,IAAA,+CAAyB,EAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC;SAC3E,CAAC,CAAC;QAEH,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAClD;YACE,QAAQ;YACR,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;YACpD,KAAK,EAAE,IAAI;SACZ,EACD,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAA,+BAAgB,EAAC;QACf,GAAG;QACH,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC,CAAC;IACH,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACxF,CAAC"}
|
|
@@ -7,8 +7,8 @@ export declare class MediaResolver {
|
|
|
7
7
|
getMediaByUid({ fqdn }: GraphqlContext, mediaUid: string): Promise<Media | Image | undefined>;
|
|
8
8
|
deleteMediaFromGallery({ fqdn }: GraphqlContext, uid: string, handle: string): Promise<string>;
|
|
9
9
|
deleteMedia({ fqdn }: GraphqlContext, handle: string): Promise<string>;
|
|
10
|
-
updateAttachedData({ fqdn }: GraphqlContext, mediaUid: string, values: string): Promise<
|
|
11
|
-
reorderMedias({ fqdn }: GraphqlContext, input: ReorderMediasInput): Promise<(
|
|
10
|
+
updateAttachedData({ fqdn }: GraphqlContext, mediaUid: string, values: string): Promise<Image | Media | undefined>;
|
|
11
|
+
reorderMedias({ fqdn }: GraphqlContext, input: ReorderMediasInput): Promise<(Image | Media)[]>;
|
|
12
12
|
url({ fqdn }: GraphqlContext, media: Media | Image): Promise<string>;
|
|
13
13
|
thumbImage({ fqdn }: GraphqlContext, media: Media | Image): Promise<ThumbImagePropertiesObjectType | undefined>;
|
|
14
14
|
useImage({ fqdn }: GraphqlContext, { imageSize, uid }: UseImageInput): Promise<UsedImage>;
|
|
@@ -13,7 +13,7 @@ const open_graph_filter_1 = require("./open-graph-filter");
|
|
|
13
13
|
function injectHeadTagsLiquidJsFilter(rawDocValues, { ctx, siteContext }) {
|
|
14
14
|
if (!rawDocValues)
|
|
15
15
|
return "";
|
|
16
|
-
const docValues = rawDocValues[liquidjs_drop_1.valuesSymbol];
|
|
16
|
+
const docValues = rawDocValues.kind === "detached" ? rawDocValues : rawDocValues[liquidjs_drop_1.valuesSymbol];
|
|
17
17
|
if (!(0, data_formatters_lib_1.isObj)(docValues))
|
|
18
18
|
return "";
|
|
19
19
|
const renderingContext = (0, liquidjs_utils_1.extractRenderingContext)(ctx);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"head-tags-filter.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-filters/head-tags-filter.ts"],"names":[],"mappings":";;AAcA,oEASC;AAvBD,oEAA4E;AAC5E,mEAAsE;AAEtE,iFAA6E;AAC7E,8CAA8C;AAC9C,yEAAqE;AAErE,2EAAiF;AACjF,uFAAkF;AAGlF,2DAAsD;AACtD,2DAA4D;AAE5D,SAAgB,4BAA4B,CAC1C,YAAiB,EACjB,EAAE,GAAG,EAAE,WAAW,EAA8C;IAEhE,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,YAAY,CAAC,4BAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"head-tags-filter.js","sourceRoot":"","sources":["../../../../src/modules/public-site/liquidjs-filters/head-tags-filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,4 +4,4 @@ import type { SiteContext } from "../../site-context/site-context.types";
|
|
|
4
4
|
export declare class PublicSiteController {
|
|
5
5
|
index(req: Request, res: Response): Promise<void>;
|
|
6
6
|
}
|
|
7
|
-
export declare function
|
|
7
|
+
export declare function serveIndexPage(siteContext: SiteContext, req: Request, res: Response, tracker: Tracker): Promise<void>;
|
|
@@ -13,7 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PublicSiteController = void 0;
|
|
16
|
-
exports.
|
|
16
|
+
exports.serveIndexPage = serveIndexPage;
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
18
|
const internal_server_lib_1 = require("@paroicms/internal-server-lib");
|
|
19
19
|
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
@@ -21,13 +21,13 @@ const text_cache_1 = require("../../common/text-cache");
|
|
|
21
21
|
const tracker_report_1 = require("../../common/tracker-report");
|
|
22
22
|
const render_liquidjs_1 = require("../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
23
23
|
const rendering_context_1 = require("../../liquidjs-tools/liquidjs-rendering/rendering-context");
|
|
24
|
-
const
|
|
24
|
+
const make_public_payload_1 = require("../../public-payload/make-public-payload");
|
|
25
25
|
const site_context_1 = require("../../site-context/site-context");
|
|
26
26
|
let PublicSiteController = class PublicSiteController {
|
|
27
27
|
async index(req, res) {
|
|
28
28
|
const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
|
|
29
29
|
const tracker = (0, internal_server_lib_1.createTracker)();
|
|
30
|
-
await
|
|
30
|
+
await serveIndexPage(siteContext, req, res, tracker);
|
|
31
31
|
siteContext.siteLog.stats((0, tracker_report_1.trackerReportToMessage)(tracker.toReport(), `serve ${req.url}`));
|
|
32
32
|
}
|
|
33
33
|
};
|
|
@@ -43,7 +43,7 @@ __decorate([
|
|
|
43
43
|
exports.PublicSiteController = PublicSiteController = __decorate([
|
|
44
44
|
(0, common_1.Controller)()
|
|
45
45
|
], PublicSiteController);
|
|
46
|
-
async function
|
|
46
|
+
async function serveIndexPage(siteContext, req, res, tracker) {
|
|
47
47
|
const cacheKey = (0, text_cache_1.makeCacheKey)(siteContext.siteLog, { kind: "html", url: req.url });
|
|
48
48
|
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
|
|
49
49
|
if (await serveOr.serveFromCache())
|
|
@@ -51,7 +51,7 @@ async function serveHomePage(siteContext, req, res, tracker) {
|
|
|
51
51
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });
|
|
52
52
|
const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
|
|
53
53
|
templateNames: ["index"],
|
|
54
|
-
payload: (0,
|
|
54
|
+
payload: (0, make_public_payload_1.makeDetachedPublicPayload)(siteContext, renderingContext),
|
|
55
55
|
});
|
|
56
56
|
await serveOr.putInCacheAndServe(html, renderingContext.getDependencyKeys());
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAuBA,
|
|
1
|
+
{"version":3,"file":"public-site.controller.js","sourceRoot":"","sources":["../../../src/modules/public-site/public-site.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAuBA,wCAkBC;AAzCD,2CAA2D;AAC3D,uEAA4E;AAE5E,8DAAkE;AAClE,wDAAuD;AACvD,gEAAqE;AACrE,6FAA+F;AAC/F,iGAAmG;AACnG,kFAAqF;AACrF,kEAAiE;AAI1D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEzB,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAY,EAAS,GAAa;QACnD,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAA,mCAAa,GAAE,CAAC;QAChC,MAAM,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACrD,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,uCAAsB,EAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF,CAAA;AARY,oDAAoB;AAEzB;IADL,IAAA,YAAG,GAAE;IACO,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAKtC;+BAPU,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAQhC;AAEM,KAAK,UAAU,cAAc,CAClC,WAAwB,EACxB,GAAY,EACZ,GAAa,EACb,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,IAAA,oCAAoB,EAAC,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IACnF,IAAI,MAAM,OAAO,CAAC,cAAc,EAAE;QAAE,OAAO;IAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAE1F,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,CAAC,OAAO,CAAC;QACxB,OAAO,EAAE,IAAA,+CAAyB,EAAC,WAAW,EAAE,gBAAgB,CAAC;KAClE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -5,8 +5,7 @@ const internal_anywhere_lib_1 = require("@paroicms/internal-anywhere-lib");
|
|
|
5
5
|
const text_cache_1 = require("../../../common/text-cache");
|
|
6
6
|
const render_liquidjs_1 = require("../../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
7
7
|
const rendering_context_1 = require("../../../liquidjs-tools/liquidjs-rendering/rendering-context");
|
|
8
|
-
const
|
|
9
|
-
const site_payload_1 = require("../../../public-payload/site-payload");
|
|
8
|
+
const make_public_payload_1 = require("../../../public-payload/make-public-payload");
|
|
10
9
|
const make_url_1 = require("../public-route/make-url");
|
|
11
10
|
const public_route_parser_1 = require("../public-route/public-route-parser");
|
|
12
11
|
const raw_document_payload_1 = require("../public-route/raw-document-payload");
|
|
@@ -43,7 +42,7 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
43
42
|
});
|
|
44
43
|
const html = await (0, render_liquidjs_1.renderLiquidTemplate)(siteContext, renderingContext, {
|
|
45
44
|
templateNames: documentType.templateNames,
|
|
46
|
-
payload: makeRegularPublicPayload(siteContext, renderingContext, docValues, docUrl),
|
|
45
|
+
payload: (0, make_public_payload_1.makeRegularPublicPayload)(siteContext, renderingContext, docValues, docUrl),
|
|
47
46
|
});
|
|
48
47
|
return {
|
|
49
48
|
status: 200,
|
|
@@ -51,10 +50,4 @@ async function generateDocumentHtml(siteContext, options, tracker) {
|
|
|
51
50
|
dependencyKeys: renderingContext.getDependencyKeys(),
|
|
52
51
|
};
|
|
53
52
|
}
|
|
54
|
-
function makeRegularPublicPayload(siteContext, renderingContext, docValues, url) {
|
|
55
|
-
return {
|
|
56
|
-
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, docValues.language),
|
|
57
|
-
doc: (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, docValues, { url }),
|
|
58
|
-
};
|
|
59
|
-
}
|
|
60
53
|
//# sourceMappingURL=serve-document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"serve-document.js","sourceRoot":"","sources":["../../../../src/modules/public-site/serve-document/serve-document.ts"],"names":[],"mappings":";;AA8BA,oDAgEC;AA9FD,2EAAwE;AAGxE,2DAAoE;AACpE,gGAAkG;AAClG,oGAAsG;AACtG,qFAAuF;AAEvF,uDAA4D;AAC5D,6EAG6C;AAC7C,+EAA0E;AAiBnE,KAAK,UAAU,oBAAoB,CACxC,WAAwB,EACxB,OAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE/C,IAAI,WAAW,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,IAAA,uDAAiC,EAAC,WAAW,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/F,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,2BAAgB,EACpD,WAAW,EACX,OAAO,EACP;gBACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;aACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,yCAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACrE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAEvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,2BAAgB,EAC/E,WAAW,EACX,OAAO,EACP;QACE,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;KACzB,EACD,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAClC,CAAC;IACF,MAAM,cAAc,GAAG,GAAG,MAAM,GAAG,WAAW,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;IACrE,IAAI,cAAc,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACjF,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,6CAAqB,EAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAEnF,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAsB,EAAC,WAAW,EAAE;QACjE,QAAQ;QACR,OAAO;QACP,aAAa,EAAE,IAAA,mCAAsB,EAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;KACjE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE;QACrE,aAAa,EAAE,YAAY,CAAC,aAAa;QACzC,OAAO,EAAE,IAAA,8CAAwB,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,CAAC;KACpF,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,GAAG;QACX,IAAI;QACJ,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;KACrD,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
|
|
2
|
+
import type { SiteContext } from "../site-context/site-context.types";
|
|
3
|
+
import type * as publicPayload from "./public-payload.types";
|
|
4
|
+
export declare function makeDetachedPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, options?: {
|
|
5
|
+
language?: string;
|
|
6
|
+
}): publicPayload.DetachedPublicPayload;
|
|
7
|
+
export declare function makeRegularPublicPayload(siteContext: SiteContext, renderingContext: RenderingContext, docValues: publicPayload.DocValues, url: string): {
|
|
8
|
+
site: publicPayload.SitePayload;
|
|
9
|
+
doc: import("../liquidjs-tools/liquidjs-drop").DropInst<publicPayload.DocPayload>;
|
|
10
|
+
};
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.makeDetachedPublicPayload = makeDetachedPublicPayload;
|
|
4
|
+
exports.makeRegularPublicPayload = makeRegularPublicPayload;
|
|
5
|
+
const create_doc_drop_1 = require("./create-doc-drop");
|
|
4
6
|
const site_payload_1 = require("./site-payload");
|
|
5
7
|
const translations_queries_1 = require("./translations.queries");
|
|
6
|
-
function
|
|
8
|
+
function makeDetachedPublicPayload(siteContext, renderingContext, options = {}) {
|
|
7
9
|
const language = options.language ?? siteContext.siteSchema.defaultLanguage;
|
|
8
10
|
return {
|
|
9
11
|
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, language),
|
|
@@ -15,4 +17,10 @@ function makePublicBasicPayload(siteContext, renderingContext, options = {}) {
|
|
|
15
17
|
},
|
|
16
18
|
};
|
|
17
19
|
}
|
|
18
|
-
|
|
20
|
+
function makeRegularPublicPayload(siteContext, renderingContext, docValues, url) {
|
|
21
|
+
return {
|
|
22
|
+
site: (0, site_payload_1.makeSitePayload)(siteContext, renderingContext, docValues.language),
|
|
23
|
+
doc: (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, docValues, { url }),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=make-public-payload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"make-public-payload.js","sourceRoot":"","sources":["../../src/public-payload/make-public-payload.ts"],"names":[],"mappings":";;AAOA,8DAeC;AAED,4DAUC;AAhCD,uDAAyD;AAEzD,iDAAiD;AACjD,iEAAsE;AAEtE,SAAgB,yBAAyB,CACvC,WAAwB,EACxB,gBAAkC,EAClC,UAAiC,EAAE;IAEnC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC5E,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QAC9D,GAAG,EAAE;YACH,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,YAAY,EAAE,IAAA,mDAA4B,EAAC,WAAW,CAAC;SACxD;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,wBAAwB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,SAAkC,EAClC,GAAW;IAEX,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,CAAC,QAAQ,CAAC;QACxE,GAAG,EAAE,IAAA,sCAAoB,EAAC,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC;KAC7E,CAAC;AACJ,CAAC"}
|
|
@@ -13,7 +13,7 @@ function makeBasicTranslationsPayload(siteContext) {
|
|
|
13
13
|
return siteContext.siteSchema.languages.map((language) => ({
|
|
14
14
|
language: language,
|
|
15
15
|
languageLabel: siteContext.siteSchema.languageLabels[language],
|
|
16
|
-
|
|
16
|
+
active: false,
|
|
17
17
|
url: (0, make_url_1.getHomeUrl)(siteContext, language),
|
|
18
18
|
}));
|
|
19
19
|
}
|
|
@@ -33,7 +33,7 @@ async function loadTranslationsAsDrops(siteContext, renderingContext, documentId
|
|
|
33
33
|
values: {
|
|
34
34
|
language,
|
|
35
35
|
languageLabel: siteContext.siteSchema.languageLabels[language],
|
|
36
|
-
|
|
36
|
+
active: language === documentId.language,
|
|
37
37
|
url,
|
|
38
38
|
doc: exists
|
|
39
39
|
? async () => (0, create_doc_drop_1.createDocPayloadDrop)(siteContext, renderingContext, await (0, doc_values_queries_1.getDocItem)(siteContext, renderingContext.tracker, itemId))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translations.queries.js","sourceRoot":"","sources":["../../src/public-payload/translations.queries.ts"],"names":[],"mappings":";;AAaA,oEASC;AAED,0DAqDC;AA7ED,oEAA8D;AAC9D,mDAAuD;AAGvD,qDAA8D;AAC9D,mEAAoF;AAEpF,2EAA4F;AAE5F,uDAAyD;AACzD,6DAAkD;AAGlD,SAAgB,4BAA4B,CAC1C,WAA4C;IAE5C,OAAO,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzD,QAAQ,EAAE,QAAQ;QAClB,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC9D,
|
|
1
|
+
{"version":3,"file":"translations.queries.js","sourceRoot":"","sources":["../../src/public-payload/translations.queries.ts"],"names":[],"mappings":"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"}
|
package/locales/en.json
CHANGED
|
@@ -1,12 +1,4 @@
|
|
|
1
1
|
{
|
|
2
|
-
"contactForm": {
|
|
3
|
-
"noSubject": "-no subject-",
|
|
4
|
-
"contactFrom": "(contact from $1)",
|
|
5
|
-
"nameIs": "<b>Name:</b> $1",
|
|
6
|
-
"emailIs": "<b>E-mail:</b> $1",
|
|
7
|
-
"sendUsAnEmailTo": "send us an e-mail to: $1",
|
|
8
|
-
"sorryMessage": "sorry, the website is incorrectly configured"
|
|
9
|
-
},
|
|
10
2
|
"accountPasswordReset": {
|
|
11
3
|
"subject": "Password reset",
|
|
12
4
|
"message": "<h3>Password reset</h3><p>Please reset the password of your new account by clicking on the following link: <a href=\"$1\">reset my password</a></p>"
|
package/locales/fr.json
CHANGED
|
@@ -1,12 +1,4 @@
|
|
|
1
1
|
{
|
|
2
|
-
"contactForm": {
|
|
3
|
-
"noSubject": "-sans sujet-",
|
|
4
|
-
"contactFrom": "(contact via $1)",
|
|
5
|
-
"nameIs": "<b>Nom :</b> $1",
|
|
6
|
-
"emailIs": "<b>E-mail :</b> $1",
|
|
7
|
-
"sendUsAnEmailTo": "envoyez-nous un e-mail directement à : $1",
|
|
8
|
-
"sorryMessage": "désolé, le site est mal configuré"
|
|
9
|
-
},
|
|
10
2
|
"accountPasswordReset": {
|
|
11
3
|
"subject": "Réinitialisation du mot de passe",
|
|
12
4
|
"message": "<h3>Réinitialisation du mot de passe</h3><p>Veuillez réinitialiser le mot de passe de votre nouvel compte en cliquant sur lien suivant : <a href=\"$1\">réinitialiser mon mot de passe</a></p>."
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.60.1",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"@nestjs/throttler": "~6.1.0",
|
|
46
46
|
"@paroi/data-formatters-lib": "~0.4.0",
|
|
47
47
|
"@paroicms/internal-anywhere-lib": "1.18.9",
|
|
48
|
-
"@paroicms/bo": "1.
|
|
48
|
+
"@paroicms/bo": "1.46.0",
|
|
49
49
|
"@paroicms/public-anywhere-lib": "0.8.3",
|
|
50
50
|
"@paroicms/public-server-lib": "0.16.4",
|
|
51
51
|
"@paroicms/server-database-media-storage": "1.9.9",
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
|
|
2
|
-
import type { SiteContext } from "../site-context/site-context.types";
|
|
3
|
-
import type * as publicPayload from "./public-payload.types";
|
|
4
|
-
export declare function makePublicBasicPayload(siteContext: SiteContext, renderingContext: RenderingContext, options?: {
|
|
5
|
-
language?: string;
|
|
6
|
-
}): publicPayload.DetachedPublicPayload;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"make-basic-payload.js","sourceRoot":"","sources":["../../src/public-payload/make-basic-payload.ts"],"names":[],"mappings":";;AAMA,wDAeC;AAlBD,iDAAiD;AACjD,iEAAsE;AAEtE,SAAgB,sBAAsB,CACpC,WAAwB,EACxB,gBAAkC,EAClC,UAAiC,EAAE;IAEnC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC5E,OAAO;QACL,IAAI,EAAE,IAAA,8BAAe,EAAC,WAAW,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QAC9D,GAAG,EAAE;YACH,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC9D,YAAY,EAAE,IAAA,mDAA4B,EAAC,WAAW,CAAC;SACxD;KACF,CAAC;AACJ,CAAC"}
|