@paroicms/server 1.12.3 → 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/static-middlewares.js +2 -2
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/modules/app.controller.js +2 -2
- 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/public-site.controller.js +2 -2
- package/dist/modules/public-site/public-site.middleware.js +3 -3
- package/package.json +3 -1
- /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"}
|
|
@@ -6,7 +6,7 @@ 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
12
|
const http_constants_1 = require("./http-constants");
|
|
@@ -154,7 +154,7 @@ function sendFileErrorHandler(error, siteContext, res, path) {
|
|
|
154
154
|
}
|
|
155
155
|
async function render404Asset(siteContext, res) {
|
|
156
156
|
try {
|
|
157
|
-
await (0,
|
|
157
|
+
await (0, serve_text_or_1.render404Html)(siteContext, res);
|
|
158
158
|
}
|
|
159
159
|
catch (error) {
|
|
160
160
|
siteContext.siteLog.error("failed to render 404", error);
|
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":";;;;;;AAAA,uCAA2C;AAC3C,+DAAuF;AACvF,mFAA0E;AAC1E,qDAA8D;AAC9D,8DAAsC;AACtC,sDAA8B;AAC9B,uCAQmB;AACnB,qEAIsC;AACtC,2EAA2E;AAC3E,qEAAuF;AACvF,qDAA8D;AAC9D,qDAAiD;AACjD,6DAAwD;AAExD,wDAAwF;AACxF,8DAAuE;AACvE,iFAA+E;AAQxE,KAAK,UAAU,KAAK,CAAC,UAAwB,EAAE;IACpD,IAAI,CAAC;QACH,MAAM,qBAAW,CAAC,UAAU,CAAC;QAC7B,IAAA,uCAAwB,GAAE,CAAC;QAE3B,IAAA,+CAAmB,EAAC,EAAE,GAAG,iBAAO,CAAC,cAAc,EAAE,MAAM,EAAE,qBAAW,EAAE,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,IAAA,gDAAwB,EAAC,iBAAO,CAAC;YACjD,CAAC,CAAC,MAAM,IAAA,6BAAiB,EAAC,iBAAO,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC;YACpE,CAAC,CAAC,MAAM,IAAA,qCAAyB,EAAC,iBAAO,CAAC,UAAU,CAAC,CAAC;QAExD,MAAM,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC;QACnC,IAAA,2BAAiB,EAAC,MAAM,IAAA,gDAAuB,GAAE,CAAC,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAA,0BAAa,EAAC,kCAAe,EAAE;YAC9C,aAAa,EAAE,IAAA,oBAAO,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACpC,MAAM,EAAE,qBAAW;SACpB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,iBAAO,GAAE,CAAC;QAG7B,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAClC,sBAAS,EACT,IAAI,iCAAc,CAAC,UAAU,CAAC,EAC9B;YACE,MAAM,EAAE,IAAI,qCAAgB,EAAE;SAC/B,CACF,CAAC;QACF,GAAG,CAAC,GAAG,CAAC,IAAA,qBAAW,GAAE,CAAC,CAAC;QACvB,GAAG,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,GAAG,CAAC,GAAG,CAAC,wCAAmB,CAAC,CAAC;QAC7B,GAAG,CAAC,GAAG,CAAC,iCAAY,CAAC,CAAC;QACtB,GAAG,CAAC,GAAG,CAAC,0CAAqB,CAAC,CAAC;QAE/B,IAAI,iBAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAChC,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,EAAE,iBAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;QAED,IAAA,+BAAoB,EAAC;YACnB,MAAM,EAAE,qBAAW;YACnB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAA,uCAAoB,GAAE,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACvE,CAAC;SACF,CAAC,CAAC;QAEH,qBAAW,CAAC,IAAI,CACd,iDACE,iBAAO,CAAC,UAAU,CAAC,IACrB,gBAAgB,iBAAiB,EAAE;aAChC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;aAC1B,IAAI,CAAC,EAAE,CAAC,EAAE,CACd,CAAC;QACF,IAAI,oBAAU,KAAK,iBAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3C,qBAAW,CAAC,IAAI,CAAC,kBAAkB,oBAAU,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,sBAAY,KAAK,oBAAU,EAAE,CAAC;YAChC,qBAAW,CAAC,IAAI,CAAC,uBAAuB,sBAAY,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qBAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AA/DD,sBA+DC;AAED,SAAS,iBAAiB;IACxB,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAS,CAAC,MAAM,EAAE,CAAC;SAClC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;SACnC,IAAI,EAAE,CAAC;AACZ,CAAC"}
|
|
@@ -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",
|
|
@@ -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,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);
|
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",
|
|
@@ -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
|