@paroicms/server 1.12.2 → 1.13.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/common/{serve-html-or.js → serve-text-or.js} +1 -1
- package/dist/common/{serve-html-or.js.map → serve-text-or.js.map} +1 -1
- package/dist/express/http-constants.d.ts +1 -0
- package/dist/express/http-constants.js +5 -0
- package/dist/express/http-constants.js.map +1 -0
- package/dist/express/static-middlewares.js +8 -3
- package/dist/express/static-middlewares.js.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/modules/app.controller.js +2 -2
- package/dist/modules/core/media/media-upload.controller.js +1 -1
- package/dist/modules/core/media/media-upload.controller.js.map +1 -1
- package/dist/modules/core/media/media.d.ts +1 -1
- package/dist/modules/core/media/media.js +2 -2
- package/dist/modules/core/media/media.js.map +1 -1
- package/dist/modules/core/media/media.resolver.js +2 -2
- package/dist/modules/core/media/media.resolver.js.map +1 -1
- package/dist/modules/core/unprotected/unprotected.resolver.js +1 -1
- package/dist/modules/core/unprotected/unprotected.resolver.js.map +1 -1
- package/dist/modules/public-api/public-api-controller.js +3 -3
- package/dist/modules/public-site/app-exception-filter.js +2 -2
- package/dist/modules/public-site/media-serve/media-serve.controller.js +3 -2
- package/dist/modules/public-site/media-serve/media-serve.controller.js.map +1 -1
- package/dist/modules/public-site/public-site.controller.js +2 -2
- package/dist/modules/public-site/public-site.middleware.js +3 -3
- package/dist/public-payload/make-image-available.js +1 -1
- package/dist/public-payload/make-image-available.js.map +1 -1
- package/package.json +4 -2
- /package/dist/common/{serve-html-or.d.ts → serve-text-or.d.ts} +0 -0
|
@@ -73,4 +73,4 @@ async function render404Html(siteContext, res, options) {
|
|
|
73
73
|
siteContext.siteLog.stats((0, tracker_report_1.trackerReportToMessage)(tracker.toReport(), `serve ${404}`));
|
|
74
74
|
}
|
|
75
75
|
exports.render404Html = render404Html;
|
|
76
|
-
//# sourceMappingURL=serve-
|
|
76
|
+
//# sourceMappingURL=serve-text-or.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-
|
|
1
|
+
{"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":";;;AAAA,qDAAmE;AAEnE,0DAA2D;AAC3D,0FAA4F;AAC5F,8FAAgG;AAChG,6EAA8E;AAE9E,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;AAxDD,oDAwDC;AAEM,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,GAAa,EACb,OAA2B;IAE3B,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,yBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5D,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,2CAAsB,EAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC;SACxE,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;AAhCD,sCAgCC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const HTTP_MAX_AGE: number;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-constants.js","sourceRoot":"","sources":["../../src/express/http-constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC"}
|
|
@@ -6,9 +6,10 @@ const server_lib_1 = require("@paroicms/server-lib");
|
|
|
6
6
|
const site_app_1 = require("@paroicms/site-app");
|
|
7
7
|
const node_path_1 = require("node:path");
|
|
8
8
|
const data_format_1 = require("../common/data-format");
|
|
9
|
-
const
|
|
9
|
+
const serve_text_or_1 = require("../common/serve-text-or");
|
|
10
10
|
const context_1 = require("../context");
|
|
11
11
|
const site_context_1 = require("../site-context/site-context");
|
|
12
|
+
const http_constants_1 = require("./http-constants");
|
|
12
13
|
const http_helpers_1 = require("./http-helpers");
|
|
13
14
|
async function themeAssetsMiddleware(req, res, next) {
|
|
14
15
|
let path = req.path;
|
|
@@ -40,7 +41,11 @@ async function themeAssetsMiddleware(req, res, next) {
|
|
|
40
41
|
}
|
|
41
42
|
path = path.substring(pathPrefix.length);
|
|
42
43
|
try {
|
|
43
|
-
res.sendFile(path, {
|
|
44
|
+
res.sendFile(path, {
|
|
45
|
+
root: baseDir,
|
|
46
|
+
immutable: context_1.appConf.immutableAssets,
|
|
47
|
+
maxAge: context_1.appConf.immutableAssets ? http_constants_1.HTTP_MAX_AGE : 0,
|
|
48
|
+
}, (error) => {
|
|
44
49
|
if (!error)
|
|
45
50
|
return;
|
|
46
51
|
sendFileErrorHandler(error, siteContext, res, path);
|
|
@@ -149,7 +154,7 @@ function sendFileErrorHandler(error, siteContext, res, path) {
|
|
|
149
154
|
}
|
|
150
155
|
async function render404Asset(siteContext, res) {
|
|
151
156
|
try {
|
|
152
|
-
await (0,
|
|
157
|
+
await (0, serve_text_or_1.render404Html)(siteContext, res);
|
|
153
158
|
}
|
|
154
159
|
catch (error) {
|
|
155
160
|
siteContext.siteLog.error("failed to render 404", error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-middlewares.js","sourceRoot":"","sources":["../../src/express/static-middlewares.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AACpD,qDAAkD;AAClD,iDAA+D;AAE/D,yCAAiC;AACjC,uDAA4E;AAC5E,2DAAwD;AACxD,wCAAgD;AAChD,+DAA8D;AAE9D,iDAAkE;AAE3D,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IACvF,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACpB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,IAAI,WAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,UAAkB,CAAC;IACvB,IAAI,OAAe,CAAC;IACpB,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACzC,UAAU,GAAG,GAAG,IAAA,+BAAiB,GAAE,GAAG,CAAC;QACvC,OAAO,GAAG,kBAAc,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,GAAG,IAAA,8BAAgB,EAAC,WAAW,CAAC,GAAG,CAAC;QACjD,OAAO,GAAG,IAAA,gBAAI,EAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,KAAK,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACtC,OAAO;IACT,CAAC;IACD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAEzC,IAAI,CAAC;QACH,GAAG,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"static-middlewares.js","sourceRoot":"","sources":["../../src/express/static-middlewares.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -8,6 +8,7 @@ const core_1 = require("@nestjs/core");
|
|
|
8
8
|
const platform_express_1 = require("@nestjs/platform-express");
|
|
9
9
|
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
10
10
|
const server_lib_1 = require("@paroicms/server-lib");
|
|
11
|
+
const compression_1 = __importDefault(require("compression"));
|
|
11
12
|
const express_1 = __importDefault(require("express"));
|
|
12
13
|
const context_1 = require("./context");
|
|
13
14
|
const static_middlewares_1 = require("./express/static-middlewares");
|
|
@@ -37,6 +38,7 @@ async function start(options = {}) {
|
|
|
37
38
|
const app = await core_1.NestFactory.create(app_module_1.AppModule, new platform_express_1.ExpressAdapter(expressApp), {
|
|
38
39
|
logger: new nest_custom_logger_1.NestCustomLogger(),
|
|
39
40
|
});
|
|
41
|
+
app.use((0, compression_1.default)());
|
|
40
42
|
app.enableCors({ credentials: true, origin: "*" });
|
|
41
43
|
app.use(static_middlewares_1.boPluginsMiddleware);
|
|
42
44
|
app.use(static_middlewares_1.boMiddleware);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ const common_1 = require("@nestjs/common");
|
|
|
17
17
|
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
18
18
|
const node_stream_1 = require("node:stream");
|
|
19
19
|
const media_handles_helpers_1 = require("../common/media-handles.helpers");
|
|
20
|
-
const
|
|
20
|
+
const serve_text_or_1 = require("../common/serve-text-or");
|
|
21
21
|
const context_1 = require("../context");
|
|
22
22
|
const http_helpers_1 = require("../express/http-helpers");
|
|
23
23
|
const site_context_1 = require("../site-context/site-context");
|
|
@@ -36,7 +36,7 @@ Disallow: /`);
|
|
|
36
36
|
const handle = (0, media_handles_helpers_1.getHandleOfSiteFavicon)();
|
|
37
37
|
const media = await siteContext.mediaStorage.getMedia({ handle });
|
|
38
38
|
if (media?.kind !== "image")
|
|
39
|
-
return await (0,
|
|
39
|
+
return await (0, serve_text_or_1.render404Html)(siteContext, res);
|
|
40
40
|
if (req.headers["if-none-match"] === media.resourceVersion) {
|
|
41
41
|
return (0, http_helpers_1.serve304NotModified)(res, {
|
|
42
42
|
cacheControl: "no-cache",
|
|
@@ -103,7 +103,7 @@ let UploadMediaController = class UploadMediaController {
|
|
|
103
103
|
if (payload.handle === (0, media_handles_helpers_1.getHandleOfSiteFavicon)()) {
|
|
104
104
|
await (0, media_1.createBoFaviconFrom)(siteContext, binaryFile);
|
|
105
105
|
}
|
|
106
|
-
const thumbImage = (0, media_1.registerImageVariant)(siteContext, {
|
|
106
|
+
const thumbImage = await (0, media_1.registerImageVariant)(siteContext, {
|
|
107
107
|
imageRef: {
|
|
108
108
|
height: originalImage.height,
|
|
109
109
|
imageUid: media.uid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media-upload.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"media-upload.controller.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media-upload.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,5 +15,5 @@ export declare function registerImageVariant(siteContext: Pick<SiteContext, "ima
|
|
|
15
15
|
versionedUrl: boolean;
|
|
16
16
|
absoluteUrl: boolean;
|
|
17
17
|
dependsOnUsedKey: string;
|
|
18
|
-
}): RegisteredImageVariant
|
|
18
|
+
}): Promise<RegisteredImageVariant>;
|
|
19
19
|
export declare function createBoFaviconFrom(siteContext: SiteContext, binaryFile: Buffer): Promise<void>;
|
|
@@ -4,8 +4,8 @@ exports.createBoFaviconFrom = exports.registerImageVariant = void 0;
|
|
|
4
4
|
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
5
5
|
const media_handles_helpers_1 = require("../../../common/media-handles.helpers");
|
|
6
6
|
const url_helpers_1 = require("../../../helpers/url.helpers");
|
|
7
|
-
function registerImageVariant(siteContext, { imageRef, variantName, slug, autoCrop = false, versionedUrl, absoluteUrl, dependsOnUsedKey, }) {
|
|
8
|
-
const { width, height, completeVariantName, mediaType, resourceVersion } = siteContext.imageCache.makeImageAvailable({
|
|
7
|
+
async function registerImageVariant(siteContext, { imageRef, variantName, slug, autoCrop = false, versionedUrl, absoluteUrl, dependsOnUsedKey, }) {
|
|
8
|
+
const { width, height, completeVariantName, mediaType, resourceVersion } = await siteContext.imageCache.makeImageAvailable({
|
|
9
9
|
imageRef,
|
|
10
10
|
variantName,
|
|
11
11
|
autoCrop,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.ts"],"names":[],"mappings":";;;AAAA,mFAI6C;AAC7C,iFAAiF;AACjF,8DAAqE;
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.ts"],"names":[],"mappings":";;;AAAA,mFAI6C;AAC7C,iFAAiF;AACjF,8DAAqE;AAU9D,KAAK,UAAU,oBAAoB,CACxC,WAAwD,EACxD,EACE,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,YAAY,EACZ,WAAW,EACX,gBAAgB,GASjB;IAED,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,eAAe,EAAE,GACtE,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ;QACR,WAAW;QACX,QAAQ;QACR,gBAAgB;QAChB,IAAI;KACL,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS;YACT,mBAAmB;YACnB,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;YAC3D,IAAI;YACJ,WAAW;SACZ,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA1CD,oDA0CC;AAEM,KAAK,UAAU,mBAAmB,CAAC,WAAwB,EAAE,UAAkB;IACpF,MAAM,MAAM,GAAG,MAAM,IAAA,kDAAsB,EAAC,UAAU,CAAC,CAAC;IACxD,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,IAAA,gDAAwB,GAAE;QAClC,YAAY,EAAE,YAAY;QAC1B,KAAK,EAAE,MAAM;YACX,CAAC,CAAC;gBACE,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B;YACH,CAAC,CAAC,SAAS;QACb,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU;KACvC,CAAC,CAAC;AACL,CAAC;AAlBD,kDAkBC"}
|
|
@@ -85,7 +85,7 @@ let MediaResolver = class MediaResolver {
|
|
|
85
85
|
if (media.kind !== "image")
|
|
86
86
|
return;
|
|
87
87
|
const siteContext = await (0, site_context_1.getSiteContext)(fqdn);
|
|
88
|
-
const resized = (0, media_1.registerImageVariant)(siteContext, {
|
|
88
|
+
const resized = await (0, media_1.registerImageVariant)(siteContext, {
|
|
89
89
|
autoCrop: false,
|
|
90
90
|
imageRef: {
|
|
91
91
|
imageUid: media.uid,
|
|
@@ -119,7 +119,7 @@ let MediaResolver = class MediaResolver {
|
|
|
119
119
|
throw new common_1.NotFoundException(`missing image '${uid}'`);
|
|
120
120
|
if (media.kind !== "image")
|
|
121
121
|
throw new common_1.BadRequestException(`media '${uid}' is not an image`);
|
|
122
|
-
return (0, media_1.registerImageVariant)(siteContext, {
|
|
122
|
+
return await (0, media_1.registerImageVariant)(siteContext, {
|
|
123
123
|
variantName,
|
|
124
124
|
autoCrop: true,
|
|
125
125
|
imageRef: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.resolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"media.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/media/media.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,7 +85,7 @@ async function makeFaviconThumbReady(siteContext, { handle, variantName }) {
|
|
|
85
85
|
const media = await siteContext.mediaStorage.getMedia({ handle });
|
|
86
86
|
if (!media || media.kind !== "image")
|
|
87
87
|
return;
|
|
88
|
-
const registered = (0, media_1.registerImageVariant)(siteContext, {
|
|
88
|
+
const registered = await (0, media_1.registerImageVariant)(siteContext, {
|
|
89
89
|
autoCrop: false,
|
|
90
90
|
imageRef: {
|
|
91
91
|
imageUid: media.uid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/unprotected/unprotected.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAyE;AACzE,mFAA0F;AAC1F,iFAG+C;AAC/C,8CAA0E;AAC1E,qEAAoE;AAGpE,0CAAsD;AACtD,6DAI8B;AAGvB,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAExB,AAAN,KAAK,CAAC,iBAAiB,CACV,EAAE,IAAI,EAAkB;QAEnC,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO;YACL,cAAc,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1D,IAAI;gBACJ,KAAK,EAAE,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC;aAC/C,CAAC,CAAC;YACH,aAAa,EAAE,WAAW,CAAC,OAAO;YAClC,eAAe,EACb,CAAC,iBAAO,CAAC,UAAU,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,yBAAe;SACnF,CAAC;IACJ,CAAC;IAGD,UAAU;QACR,OAAO,sBAAY,CAAC;IACtB,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACL,EAAE,IAAI,EAAkB;QAEnC,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAM,qBAAqB,CAAC,WAAW,EAAE;YAC9C,MAAM,EAAE,IAAA,8CAAsB,GAAE;YAChC,WAAW,EAAE,SAAS;SACvB,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACP,EAAE,IAAI,EAAkB;QAEnC,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAM,qBAAqB,CAAC,WAAW,EAAE;YAC9C,MAAM,EAAE,IAAA,gDAAwB,GAAE;YAClC,WAAW,EAAE,SAAS;SACvB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3CY,kDAAmB;AAExB;IADL,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,gDAA2B,CAAC;IAEtC,WAAA,IAAA,iBAAO,GAAE,CAAA;;;;4DAYX;AAGD;IADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,yCAAoB,CAAC;;;oCACpB,yCAAoB;qDAEjC;AAGK;IADL,IAAA,sBAAY,EAAC,GAAG,EAAE,CAAC,2CAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAE5D,WAAA,IAAA,iBAAO,GAAE,CAAA;;;;uDAOX;AAGK;IADL,IAAA,sBAAY,EAAC,GAAG,EAAE,CAAC,2CAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAE5D,WAAA,IAAA,iBAAO,GAAE,CAAA;;;;yDAOX;8BA1CU,mBAAmB;IAD/B,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,gDAA2B,CAAC;GAC/B,mBAAmB,CA2C/B;AAED,KAAK,UAAU,qBAAqB,CAClC,WAAwB,EACxB,EAAE,MAAM,EAAE,WAAW,EAAgD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO;IAE7C,MAAM,UAAU,GAAG,IAAA,4BAAoB,EAAC,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"unprotected.resolver.js","sourceRoot":"","sources":["../../../../src/modules/core/unprotected/unprotected.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const common_1 = require("@nestjs/common");
|
|
|
20
20
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
21
21
|
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
22
22
|
const server_lib_1 = require("@paroicms/server-lib");
|
|
23
|
-
const
|
|
23
|
+
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
24
24
|
const text_cache_1 = require("../../common/text-cache");
|
|
25
25
|
const tracker_report_1 = require("../../common/tracker-report");
|
|
26
26
|
const utils_helper_1 = require("../../helpers/utils-helper");
|
|
@@ -45,7 +45,7 @@ let PublicApiController = class PublicApiController {
|
|
|
45
45
|
const flaggedWithLeafId = (0, anywhere_lib_1.isDef)(flaggedWithId) ? (0, utils_helper_1.toLeafId)(flaggedWithId) : undefined;
|
|
46
46
|
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "api", url: req.url });
|
|
47
47
|
const tracker = (0, server_lib_1.createTracker)();
|
|
48
|
-
const serveOr = (0,
|
|
48
|
+
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, {
|
|
49
49
|
cacheKey,
|
|
50
50
|
req,
|
|
51
51
|
res,
|
|
@@ -72,7 +72,7 @@ let PublicApiController = class PublicApiController {
|
|
|
72
72
|
const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
|
|
73
73
|
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "api", url: req.url });
|
|
74
74
|
const tracker = (0, server_lib_1.createTracker)();
|
|
75
|
-
const serveOr = (0,
|
|
75
|
+
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, {
|
|
76
76
|
cacheKey,
|
|
77
77
|
req,
|
|
78
78
|
res,
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.AllExceptionsFilter = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
|
-
const
|
|
11
|
+
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
12
12
|
const context_1 = require("../../context");
|
|
13
13
|
const http_helpers_1 = require("../../express/http-helpers");
|
|
14
14
|
const site_context_1 = require("../../site-context/site-context");
|
|
@@ -23,7 +23,7 @@ let AllExceptionsFilter = class AllExceptionsFilter {
|
|
|
23
23
|
if (exception instanceof common_1.NotFoundException) {
|
|
24
24
|
try {
|
|
25
25
|
if (siteContext) {
|
|
26
|
-
await (0,
|
|
26
|
+
await (0, serve_text_or_1.render404Html)(siteContext, res);
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
29
|
(0, http_helpers_1.serve404SimpleHtml)(res);
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.MediaServeController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
|
|
18
|
+
const http_constants_1 = require("../../../express/http-constants");
|
|
18
19
|
const http_helpers_1 = require("../../../express/http-helpers");
|
|
19
20
|
const url_helpers_1 = require("../../../helpers/url.helpers");
|
|
20
21
|
const site_context_1 = require("../../../site-context/site-context");
|
|
@@ -46,11 +47,11 @@ let MediaServeController = class MediaServeController {
|
|
|
46
47
|
}
|
|
47
48
|
async serveVersionedImage(mediaUid, resourceVersion, nameAndExt, res, req) {
|
|
48
49
|
const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
|
|
49
|
-
const cacheControl =
|
|
50
|
+
const cacheControl = `public, max-age=${http_constants_1.HTTP_MAX_AGE}, immutable`;
|
|
50
51
|
const parsed = (0, _media_serve_helpers_1.parseNameAndExt)(nameAndExt);
|
|
51
52
|
if (!parsed)
|
|
52
53
|
throw new common_1.NotFoundException();
|
|
53
|
-
const {
|
|
54
|
+
const { variantName } = parsed;
|
|
54
55
|
const fts = await getVariantImageToServe(siteContext, {
|
|
55
56
|
mediaUid,
|
|
56
57
|
variantName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,mFAK6C;AAE7C,gEAAsF;AACtF,8DAAyF;AACzF,qEAAoE;AAEpE,iEAAyD;AAIlD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEzB,AAAN,KAAK,CAAC,SAAS,CACM,QAAgB,EACd,UAAkB,EAChC,GAAa,EACb,GAAY;QAEnB,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,UAAU,CAAC;QAEhC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE;YAC5C,QAAQ;YACR,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;SAC1C,CAAC,CAAC;QAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvB,OAAO,IAAA,kCAAmB,EAAC,GAAG,EAAE;gBAC9B,YAAY;gBACZ,IAAI,EAAE,GAAG,CAAC,eAAe;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAkB,EAC1C,WAAW,EACX,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,EACxE,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;QACF,IAAI,QAAQ,KAAK,UAAU;YAAE,OAAO,IAAA,+BAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE/D,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAC1C,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1B,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;IAGK,AAAN,KAAK,CAAC,mBAAmB,CACJ,QAAgB,EACT,eAAuB,EAC5B,UAAkB,EAChC,GAAa,EACb,GAAY;QAEnB,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAc,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"media-serve.controller.js","sourceRoot":"","sources":["../../../../src/modules/public-site/media-serve/media-serve.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.serveHomePage = exports.PublicSiteController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const server_lib_1 = require("@paroicms/server-lib");
|
|
18
|
-
const
|
|
18
|
+
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
19
19
|
const text_cache_1 = require("../../common/text-cache");
|
|
20
20
|
const tracker_report_1 = require("../../common/tracker-report");
|
|
21
21
|
const render_liquidjs_1 = require("../../liquidjs-tools/liquidjs-rendering/render-liquidjs");
|
|
@@ -44,7 +44,7 @@ exports.PublicSiteController = PublicSiteController = __decorate([
|
|
|
44
44
|
], PublicSiteController);
|
|
45
45
|
async function serveHomePage(siteContext, req, res, tracker) {
|
|
46
46
|
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: req.url });
|
|
47
|
-
const serveOr = (0,
|
|
47
|
+
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
|
|
48
48
|
if (await serveOr.serveFromCache())
|
|
49
49
|
return;
|
|
50
50
|
const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });
|
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.PublicSiteMiddleware = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
11
|
const server_lib_1 = require("@paroicms/server-lib");
|
|
12
|
-
const
|
|
12
|
+
const serve_text_or_1 = require("../../common/serve-text-or");
|
|
13
13
|
const text_cache_1 = require("../../common/text-cache");
|
|
14
14
|
const tracker_report_1 = require("../../common/tracker-report");
|
|
15
15
|
const http_helpers_1 = require("../../express/http-helpers");
|
|
@@ -39,7 +39,7 @@ exports.PublicSiteMiddleware = PublicSiteMiddleware = __decorate([
|
|
|
39
39
|
], PublicSiteMiddleware);
|
|
40
40
|
async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
|
|
41
41
|
const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: req.url });
|
|
42
|
-
const serveOr = (0,
|
|
42
|
+
const serveOr = (0, serve_text_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
|
|
43
43
|
if (await serveOr.serveFromCache())
|
|
44
44
|
return;
|
|
45
45
|
const redirectCacheKey = (0, text_cache_1.makeCacheKey)({ kind: "redirect", urlKey: parsedRoute.urlCacheKey });
|
|
@@ -57,7 +57,7 @@ async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
|
|
|
57
57
|
return (0, http_helpers_1.serve301Redirect)(res, generated.url);
|
|
58
58
|
}
|
|
59
59
|
if (generated.status === 404) {
|
|
60
|
-
await (0,
|
|
60
|
+
await (0, serve_text_or_1.render404Html)(siteContext, res, { lang: parsedRoute.lang });
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
63
|
await serveOr.putInCacheAndServe(generated.html, generated.dependencyKeys);
|
|
@@ -12,7 +12,7 @@ async function makeImageAvailable(siteContext, renderingContext, { imageSel, siz
|
|
|
12
12
|
}
|
|
13
13
|
if (media.kind !== "image")
|
|
14
14
|
throw new Error(`media '${media.uid}' should be an image`);
|
|
15
|
-
const { width, height, completeVariantName, resourceVersion, mediaType, slug } = siteContext.imageCache.makeImageAvailable({
|
|
15
|
+
const { width, height, completeVariantName, resourceVersion, mediaType, slug } = await siteContext.imageCache.makeImageAvailable({
|
|
16
16
|
imageRef: {
|
|
17
17
|
imageUid: media.uid,
|
|
18
18
|
width: media.width,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AAAA,mFAA0F;AAC1F,wDAA+D;AAsCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GAC5E,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AAAA,mFAA0F;AAC1F,wDAA+D;AAsCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GAC5E,MAAM,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAC9C,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,mBAAmB,EAAE,mBAAmB;YACxC,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA3CD,gDA2CC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.13.0",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@paroicms/bo": "1.11.0",
|
|
52
52
|
"@paroicms/plugin-lib": "0.3.0",
|
|
53
53
|
"@paroicms/server-database-media-storage": "1.3.0",
|
|
54
|
-
"@paroicms/server-image-cache-engine": "1.2.
|
|
54
|
+
"@paroicms/server-image-cache-engine": "1.2.1",
|
|
55
55
|
"@paroicms/server-lib": "1.2.0",
|
|
56
56
|
"@paroicms/server-text-cache-system": "1.2.0",
|
|
57
57
|
"@paroicms/site-app": "1.4.0",
|
|
@@ -60,6 +60,7 @@
|
|
|
60
60
|
"bcrypt": "~5.1.0",
|
|
61
61
|
"class-transformer": "~0.5.1",
|
|
62
62
|
"class-validator": "~0.14.0",
|
|
63
|
+
"compression": "~1.7.4",
|
|
63
64
|
"dayjs": "~1.11.11",
|
|
64
65
|
"graphql": "~16.8.1",
|
|
65
66
|
"graphql-query-complexity": "~0.12.0",
|
|
@@ -78,6 +79,7 @@
|
|
|
78
79
|
"@nestjs/schematics": "~10.1.1",
|
|
79
80
|
"@types/archiver": "~6.0.2",
|
|
80
81
|
"@types/bcrypt": "~5.0.2",
|
|
82
|
+
"@types/compression": "~1.7.5",
|
|
81
83
|
"@types/express": "~4.17.21",
|
|
82
84
|
"@types/html-minifier-terser": "~7.0.2",
|
|
83
85
|
"@types/multer": "~1.4.11",
|
|
File without changes
|