From 11eff106feb69f2ebbdc98df726c8cdde5b2cc78 Mon Sep 17 00:00:00 2001 From: beatyt <1040103+beatyt@users.noreply.github.com> Date: Wed, 27 Dec 2023 22:47:30 -0500 Subject: [PATCH 1/2] feat(engines): add eta engine --- docs/docs/templating.md | 1 + package.json | 2 +- packages/core/package.json | 2 +- packages/di/package.json | 2 +- packages/engines/package.json | 7 +- packages/engines/readme.md | 1 + packages/engines/src/components/Engine.ts | 1 + .../engines/src/components/EtaEngine.spec.ts | 80 +++++ packages/engines/src/components/EtaEngine.ts | 45 +++ packages/engines/src/index.ts | 1 + packages/engines/test/fixtures/eta/user.eta | 1 + packages/engines/test/getEngineFixture.ts | 5 +- packages/graphql/apollo/package.json | 2 +- packages/graphql/graphql-ws/package.json | 2 +- packages/graphql/typegraphql/package.json | 2 +- packages/orm/adapters-redis/package.json | 2 +- packages/orm/adapters/package.json | 2 +- packages/orm/ioredis/package.json | 2 +- packages/orm/mikro-orm/package.json | 2 +- packages/orm/mongoose/package.json | 2 +- packages/orm/objection/package.json | 2 +- packages/orm/prisma/package.json | 2 +- packages/orm/testing-mongoose/package.json | 2 +- packages/orm/typeorm/package.json | 2 +- packages/perf/package.json | 2 +- packages/platform/common/package.json | 2 +- packages/platform/platform-cache/package.json | 2 +- .../platform/platform-exceptions/package.json | 2 +- .../platform/platform-express/package.json | 2 +- packages/platform/platform-koa/package.json | 2 +- .../platform-log-middleware/package.json | 2 +- .../platform-middlewares/package.json | 2 +- .../platform/platform-params/package.json | 2 +- .../platform-response-filter/package.json | 2 +- .../platform/platform-router/package.json | 2 +- .../platform-serverless-http/package.json | 2 +- .../platform-serverless-testing/package.json | 2 +- .../platform/platform-serverless/package.json | 2 +- .../platform/platform-test-sdk/package.json | 2 +- packages/platform/platform-views/package.json | 2 +- packages/security/jwks/package.json | 2 +- .../package.json | 2 +- packages/security/oidc-provider/package.json | 2 +- packages/security/passport/package.json | 2 +- packages/specs/ajv/package.json | 2 +- packages/specs/exceptions/package.json | 2 +- packages/specs/json-mapper/package.json | 2 +- packages/specs/openspec/package.json | 2 +- packages/specs/schema/package.json | 2 +- packages/specs/swagger/package.json | 2 +- packages/third-parties/agenda/package.json | 2 +- packages/third-parties/bullmq/package.json | 2 +- .../components-scan/package.json | 2 +- .../third-parties/event-emitter/package.json | 2 +- .../third-parties/formio-types/package.json | 2 +- packages/third-parties/formio/package.json | 2 +- .../third-parties/schema-formio/package.json | 2 +- .../socketio-testing/package.json | 2 +- packages/third-parties/socketio/package.json | 2 +- packages/third-parties/stripe/package.json | 2 +- packages/third-parties/temporal/package.json | 2 +- packages/third-parties/terminus/package.json | 2 +- packages/third-parties/vike/package.json | 2 +- .../vite-ssr-plugin/package.json | 2 +- packages/utils/normalize-path/package.json | 2 +- tools/github-sponsors/package.json | 2 +- tools/integration/package.json | 2 +- tools/jest/package.json | 2 +- tools/mocha/package.json | 2 +- tools/typescript/package.json | 2 +- tools/webpack/package.json | 2 +- yarn.lock | 301 +++++++++--------- 72 files changed, 352 insertions(+), 215 deletions(-) create mode 100644 packages/engines/src/components/EtaEngine.spec.ts create mode 100644 packages/engines/src/components/EtaEngine.ts create mode 100644 packages/engines/test/fixtures/eta/user.eta diff --git a/docs/docs/templating.md b/docs/docs/templating.md index b448675e351..36451acda16 100644 --- a/docs/docs/templating.md +++ b/docs/docs/templating.md @@ -84,6 +84,7 @@ If `dustjs-helpers` is installed, `dustjs-linkedin` will not be used by consolid | [dust](https://github.com/linkedin/dustjs) | [`npm install dustjs-helpers`](https://www.npmjs.com/package/dustjs-helpers) (2) or
[`npm install dustjs-linkedin`](https://www.npmjs.com/package/dustjs-linkedin) (3) | [(website)](http://linkedin.github.io/dustjs/) | | [ect](https://github.com/baryshev/ect) | [`npm install ect`](https://www.npmjs.com/package/ect) | [(website)](http://ectjs.com/) | | [ejs](https://github.com/mde/ejs) | [`npm install ejs`](https://www.npmjs.com/package/ejs) | [(website)](http://ejs.co/) | +| [eta](https://eta.js.org/) | [`npm install eta`](https://www.npmjs.com/package/eta) | [(website)](http://ejs.co/) | | [hamlet](https://github.com/gregwebs/hamlet.js) | [`npm install hamlet`](https://www.npmjs.com/package/hamlet) | - | | [hamljs](https://github.com/visionmedia/haml.js) | [`npm install hamljs`](https://www.npmjs.com/package/hamljs) | - | | [haml-coffee](https://github.com/netzpirat/haml-coffee) | [`npm install haml-coffee`](https://www.npmjs.com/package/haml-coffee) | - | diff --git a/package.json b/package.json index 6d790f9202f..ed5631e0b03 100644 --- a/package.json +++ b/package.json @@ -220,4 +220,4 @@ ] }, "packageManager": "yarn@4.1.0" -} \ No newline at end of file +} diff --git a/packages/core/package.json b/packages/core/package.json index 8dd3a6979ec..8b0e0edc9c3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -32,4 +32,4 @@ "jest": "^29.2.0" }, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/packages/di/package.json b/packages/di/package.json index 8440cb58151..6de29964d9a 100644 --- a/packages/di/package.json +++ b/packages/di/package.json @@ -49,4 +49,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/engines/package.json b/packages/engines/package.json index dbd898e8cc9..ecd6d28151b 100644 --- a/packages/engines/package.json +++ b/packages/engines/package.json @@ -41,7 +41,7 @@ "ect": "^0.5.9", "ejs": "^3.1.6", "eslint": "^8.12.0", - "filedirname": "^2.7.0", + "eta": "3.2.0", "haml": "^0.4.3", "haml-coffee": "^1.14.1", "hamlet": "^0.3.3", @@ -86,6 +86,5 @@ "decorators", "engines", "view" - ], - "peerDependencies": {} -} \ No newline at end of file + ] +} diff --git a/packages/engines/readme.md b/packages/engines/readme.md index 07f8d0f91d5..9695f1b7f73 100644 --- a/packages/engines/readme.md +++ b/packages/engines/readme.md @@ -55,6 +55,7 @@ If `dustjs-helpers` is installed, `dustjs-linkedin` will not be used by consolid | [dust](https://github.com/linkedin/dustjs) | [`npm install dustjs-helpers`](https://www.npmjs.com/package/dustjs-helpers) (2) or
[`npm install dustjs-linkedin`](https://www.npmjs.com/package/dustjs-linkedin) (3) | [(website)](http://linkedin.github.io/dustjs/) | | [ect](https://github.com/baryshev/ect) | [`npm install ect`](https://www.npmjs.com/package/ect) | [(website)](http://ectjs.com/) | | [ejs](https://github.com/mde/ejs) | [`npm install ejs`](https://www.npmjs.com/package/ejs) | [(website)](http://ejs.co/) | +| [eta](https://eta.js.org/) | [`npm install eta`](https://www.npmjs.com/package/eta) | [(website)](http://ejs.co/) | | [hamlet](https://github.com/gregwebs/hamlet.js) | [`npm install hamlet`](https://www.npmjs.com/package/hamlet) | - | | [hamljs](https://github.com/visionmedia/haml.js) | [`npm install hamljs`](https://www.npmjs.com/package/hamljs) | - | | [haml-coffee](https://github.com/netzpirat/haml-coffee) | [`npm install haml-coffee`](https://www.npmjs.com/package/haml-coffee) | - | diff --git a/packages/engines/src/components/Engine.ts b/packages/engines/src/components/Engine.ts index 95b222da580..871fdcf2987 100644 --- a/packages/engines/src/components/Engine.ts +++ b/packages/engines/src/components/Engine.ts @@ -1,3 +1,4 @@ +import {Type} from "@tsed/core"; import {cache, getCachedEngine, importEngine, read, readPartials} from "../utils/cache"; export interface ViewEngineOptions { diff --git a/packages/engines/src/components/EtaEngine.spec.ts b/packages/engines/src/components/EtaEngine.spec.ts new file mode 100644 index 00000000000..5c0c0ce20b7 --- /dev/null +++ b/packages/engines/src/components/EtaEngine.spec.ts @@ -0,0 +1,80 @@ +import {expect} from "chai"; +import {dirname} from "node:path"; +import {getEngineFixture} from "../../test/getEngineFixture"; +import {EtaEngine} from "./EtaEngine"; + +describe("EtaEngine", () => { + it("should render the given content", async () => { + const {render, locals, $compile, template} = await getEngineFixture({ + token: EtaEngine + }); + + await render(); + + expect(await render()).to.eq("

Tobi

\n"); + expect($compile()).to.have.been.callCount(2); + expect($compile()).to.have.been.calledWithExactly(template, {...locals, cache: false}); + }); + + it("should render the given content (by string - no cache)", async () => { + const {render, locals, $compile, template} = await getEngineFixture({token: EtaEngine}); + await render(); + + expect(await render()).to.eq("

Tobi

\n"); + expect($compile()).to.have.been.callCount(2); + expect($compile()).to.have.been.calledWithExactly(template, {...locals, cache: false}); + }); + it("should render the given content (by string - with cache)", async () => { + const {render, locals, $compile, template} = await getEngineFixture({token: EtaEngine, cache: true}); + await render(); + + expect(await render()).to.eq("

Tobi

\n"); + expect($compile()).to.have.been.callCount(2); + expect($compile()).to.have.been.calledWithExactly(template, {...locals, cache: true}); + }); + it("should render the given content (by file - no cache)", async () => { + const {renderFile, locals, $compileFile, path, template} = await getEngineFixture({ + token: EtaEngine, + useTemplateName: true + }); + + await renderFile({ + views: dirname(path) + }); + + const content = await renderFile({ + views: dirname(path) + }); + + expect(content).to.eq("

Tobi

\n"); + expect($compileFile()).to.have.been.callCount(2); + expect($compileFile()).to.have.been.calledWithExactly("user", { + ...locals, + partials: undefined, + filename: "user", + cache: false, + views: dirname(path) + }); + }); + it("should render the given content (by file - with cache - with entire file path)", async () => { + const {renderFile, locals, $compileFile, path, template} = await getEngineFixture({ + token: EtaEngine, + cache: true + }); + + await renderFile({ + root: dirname(path) + }); + const content = await renderFile(); + + expect(content).to.eq("

Tobi

\n"); + expect($compileFile()).to.have.been.callCount(1); + expect($compileFile()).to.have.been.calledWithExactly(path, { + cache: true, + user: {name: "Tobi"}, + root: dirname(path), + filename: path, + partials: undefined + }); + }); +}); diff --git a/packages/engines/src/components/EtaEngine.ts b/packages/engines/src/components/EtaEngine.ts new file mode 100644 index 00000000000..bee30c58073 --- /dev/null +++ b/packages/engines/src/components/EtaEngine.ts @@ -0,0 +1,45 @@ +import {ViewEngine} from "../decorators/viewEngine"; +import {Engine, EngineOptions} from "./Engine"; + +@ViewEngine("eta", { + requires: "eta" +}) +export class EtaEngine extends Engine { + protected cache = new Map(); + + protected getEngine(options: EngineOptions) { + const root = options.root; + const key = String(root || "default"); + + if (!this.cache.get(key)) { + const {Eta} = this.engine; + + this.cache.set( + key, + new Eta({ + ...options, + views: root + }) + ); + } + + return this.cache.get(key); + } + + protected $compile(template: string, options: any) { + const eta = this.getEngine(options); + + return () => eta.renderStringAsync(template, options); + } + + protected $compileFile(file: string, options: EngineOptions): Promise<(options: EngineOptions) => Promise> { + const root = options.views || options.root; + const templateName = file.replace(root, ""); + const eta = this.getEngine({ + ...options, + root + }); + + return Promise.resolve(() => eta.renderAsync(templateName, options)); + } +} diff --git a/packages/engines/src/index.ts b/packages/engines/src/index.ts index c4aef53dae7..9ff1bf37d6a 100644 --- a/packages/engines/src/index.ts +++ b/packages/engines/src/index.ts @@ -8,6 +8,7 @@ export * from "./components/DotEngine"; export * from "./components/DustEngine"; export * from "./components/EctEngine"; export * from "./components/EjsEngine"; +export * from "./components/EtaEngine"; export * from "./components/Engine"; export * from "./components/HamlCoffeeEngine"; export * from "./components/HamlEngine"; diff --git a/packages/engines/test/fixtures/eta/user.eta b/packages/engines/test/fixtures/eta/user.eta new file mode 100644 index 00000000000..cbaa8be539d --- /dev/null +++ b/packages/engines/test/fixtures/eta/user.eta @@ -0,0 +1 @@ +

<%= it.user.name %>

diff --git a/packages/engines/test/getEngineFixture.ts b/packages/engines/test/getEngineFixture.ts index 6a8dc29715f..480ad003963 100644 --- a/packages/engines/test/getEngineFixture.ts +++ b/packages/engines/test/getEngineFixture.ts @@ -12,9 +12,10 @@ interface EngineFixtureOptions { token: string | typeof Engine; cache?: boolean; templateName?: string; + useTemplateName?: boolean; } -export async function getEngineFixture({token, cache = false, templateName = "user"}: EngineFixtureOptions) { +export async function getEngineFixture({token, cache = false, useTemplateName = false, templateName = "user"}: EngineFixtureOptions) { const engine = engines.get(token)!; await engine.$onInit(); @@ -54,7 +55,7 @@ export async function getEngineFixture({token, cache = false, templateName = "us }); }, renderFile(options: any = {}) { - return engine.renderFile(path, { + return engine.renderFile(useTemplateName ? templateName : path, { cache, ...locals, ...options diff --git a/packages/graphql/apollo/package.json b/packages/graphql/apollo/package.json index 680cfc7ab5c..d25d6968f4d 100644 --- a/packages/graphql/apollo/package.json +++ b/packages/graphql/apollo/package.json @@ -49,4 +49,4 @@ "apollo-server-core": ">=3.0.0", "graphql": ">15.0.0" } -} \ No newline at end of file +} diff --git a/packages/graphql/graphql-ws/package.json b/packages/graphql/graphql-ws/package.json index 8e07f95248d..b9020a7d7f7 100644 --- a/packages/graphql/graphql-ws/package.json +++ b/packages/graphql/graphql-ws/package.json @@ -38,4 +38,4 @@ "@tsed/logger": ">=6.2.2", "graphql-ws": ">=5.14.2" } -} \ No newline at end of file +} diff --git a/packages/graphql/typegraphql/package.json b/packages/graphql/typegraphql/package.json index 82f47ccc118..5e3d20bd4ac 100644 --- a/packages/graphql/typegraphql/package.json +++ b/packages/graphql/typegraphql/package.json @@ -43,4 +43,4 @@ "graphql": ">=15.0.0", "type-graphql": ">=1.0.0" } -} \ No newline at end of file +} diff --git a/packages/orm/adapters-redis/package.json b/packages/orm/adapters-redis/package.json index ffd1ad63714..1e294158bfb 100644 --- a/packages/orm/adapters-redis/package.json +++ b/packages/orm/adapters-redis/package.json @@ -39,4 +39,4 @@ "ioredis-mock": ">=8.2.2", "uuid": "8.3.2" } -} \ No newline at end of file +} diff --git a/packages/orm/adapters/package.json b/packages/orm/adapters/package.json index 003bd349b12..df9d4e34ad0 100644 --- a/packages/orm/adapters/package.json +++ b/packages/orm/adapters/package.json @@ -69,4 +69,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/orm/ioredis/package.json b/packages/orm/ioredis/package.json index 2c9df903afe..8252527be1b 100644 --- a/packages/orm/ioredis/package.json +++ b/packages/orm/ioredis/package.json @@ -38,4 +38,4 @@ "ioredis": ">=5.2.3", "ioredis-mock": ">=8.2.2" } -} \ No newline at end of file +} diff --git a/packages/orm/mikro-orm/package.json b/packages/orm/mikro-orm/package.json index dd6b6e0dc69..d9462b7475c 100644 --- a/packages/orm/mikro-orm/package.json +++ b/packages/orm/mikro-orm/package.json @@ -44,4 +44,4 @@ "@tsed/di": "7.61.2", "@tsed/logger": ">=6.2.2" } -} \ No newline at end of file +} diff --git a/packages/orm/mongoose/package.json b/packages/orm/mongoose/package.json index 3db468bf88a..7f938bfc615 100644 --- a/packages/orm/mongoose/package.json +++ b/packages/orm/mongoose/package.json @@ -51,4 +51,4 @@ "@tsed/schema": "7.61.2", "mongoose": ">=6.0.0" } -} \ No newline at end of file +} diff --git a/packages/orm/objection/package.json b/packages/orm/objection/package.json index 4304ac6e02a..d5d582ae09b 100644 --- a/packages/orm/objection/package.json +++ b/packages/orm/objection/package.json @@ -67,4 +67,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/orm/prisma/package.json b/packages/orm/prisma/package.json index 3f66de76f37..442525d590f 100644 --- a/packages/orm/prisma/package.json +++ b/packages/orm/prisma/package.json @@ -63,4 +63,4 @@ "tsed", "prisma" ] -} \ No newline at end of file +} diff --git a/packages/orm/testing-mongoose/package.json b/packages/orm/testing-mongoose/package.json index e8eb51a320b..d8a69873996 100644 --- a/packages/orm/testing-mongoose/package.json +++ b/packages/orm/testing-mongoose/package.json @@ -36,4 +36,4 @@ "@tsed/mongoose": "7.61.2", "mongoose": ">=6.0.0" } -} \ No newline at end of file +} diff --git a/packages/orm/typeorm/package.json b/packages/orm/typeorm/package.json index c80b3478a18..5c11e712748 100644 --- a/packages/orm/typeorm/package.json +++ b/packages/orm/typeorm/package.json @@ -42,4 +42,4 @@ "publishConfig": { "distTag": "deprecated" } -} \ No newline at end of file +} diff --git a/packages/perf/package.json b/packages/perf/package.json index a01885733cc..32b4d30ef70 100644 --- a/packages/perf/package.json +++ b/packages/perf/package.json @@ -28,4 +28,4 @@ "jest": "^29.2.0" }, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/packages/platform/common/package.json b/packages/platform/common/package.json index 24f9d61e195..7f1fb2d7ac1 100644 --- a/packages/platform/common/package.json +++ b/packages/platform/common/package.json @@ -104,4 +104,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-cache/package.json b/packages/platform/platform-cache/package.json index 2a5bb9cddf1..853aae0f1f2 100644 --- a/packages/platform/platform-cache/package.json +++ b/packages/platform/platform-cache/package.json @@ -54,4 +54,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-exceptions/package.json b/packages/platform/platform-exceptions/package.json index 4f43d53e2cb..7a78fa03fad 100644 --- a/packages/platform/platform-exceptions/package.json +++ b/packages/platform/platform-exceptions/package.json @@ -51,4 +51,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-express/package.json b/packages/platform/platform-express/package.json index b30f1ace7b7..70381405ad1 100644 --- a/packages/platform/platform-express/package.json +++ b/packages/platform/platform-express/package.json @@ -123,4 +123,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-koa/package.json b/packages/platform/platform-koa/package.json index cce99e89980..40d426893cc 100644 --- a/packages/platform/platform-koa/package.json +++ b/packages/platform/platform-koa/package.json @@ -129,4 +129,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-log-middleware/package.json b/packages/platform/platform-log-middleware/package.json index 4ba6e43a527..5a386c338bb 100644 --- a/packages/platform/platform-log-middleware/package.json +++ b/packages/platform/platform-log-middleware/package.json @@ -46,4 +46,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-middlewares/package.json b/packages/platform/platform-middlewares/package.json index f2f84611a18..ecaed8e8b4c 100644 --- a/packages/platform/platform-middlewares/package.json +++ b/packages/platform/platform-middlewares/package.json @@ -46,4 +46,4 @@ "optional": true } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-params/package.json b/packages/platform/platform-params/package.json index ab2f10f0bc3..e226388b1ab 100644 --- a/packages/platform/platform-params/package.json +++ b/packages/platform/platform-params/package.json @@ -56,4 +56,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-response-filter/package.json b/packages/platform/platform-response-filter/package.json index 4fc9b069a94..e2bc9a13c8e 100644 --- a/packages/platform/platform-response-filter/package.json +++ b/packages/platform/platform-response-filter/package.json @@ -56,4 +56,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-router/package.json b/packages/platform/platform-router/package.json index 5fe99c539df..4830551cd04 100644 --- a/packages/platform/platform-router/package.json +++ b/packages/platform/platform-router/package.json @@ -61,4 +61,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-serverless-http/package.json b/packages/platform/platform-serverless-http/package.json index 860ab944f0d..725f23bc297 100644 --- a/packages/platform/platform-serverless-http/package.json +++ b/packages/platform/platform-serverless-http/package.json @@ -104,4 +104,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-serverless-testing/package.json b/packages/platform/platform-serverless-testing/package.json index 395d00ffe4d..50cf6eba60f 100644 --- a/packages/platform/platform-serverless-testing/package.json +++ b/packages/platform/platform-serverless-testing/package.json @@ -76,4 +76,4 @@ "@tsed/openspec": "7.61.2", "@tsed/schema": "7.61.2" } -} \ No newline at end of file +} diff --git a/packages/platform/platform-serverless/package.json b/packages/platform/platform-serverless/package.json index b1dcf056f2f..e9e1f344af2 100644 --- a/packages/platform/platform-serverless/package.json +++ b/packages/platform/platform-serverless/package.json @@ -56,4 +56,4 @@ "optional": true } } -} \ No newline at end of file +} diff --git a/packages/platform/platform-test-sdk/package.json b/packages/platform/platform-test-sdk/package.json index 6800c1d39a4..dfca521a9ac 100644 --- a/packages/platform/platform-test-sdk/package.json +++ b/packages/platform/platform-test-sdk/package.json @@ -48,4 +48,4 @@ "jest": "^29.2.0" }, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/packages/platform/platform-views/package.json b/packages/platform/platform-views/package.json index 455a54c91a1..b28f0554b78 100644 --- a/packages/platform/platform-views/package.json +++ b/packages/platform/platform-views/package.json @@ -56,4 +56,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/security/jwks/package.json b/packages/security/jwks/package.json index 000054f50cb..8921f079228 100644 --- a/packages/security/jwks/package.json +++ b/packages/security/jwks/package.json @@ -30,4 +30,4 @@ "jest": "^29.2.0" }, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json index 9aed328d7f1..cff049d7e66 100644 --- a/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json +++ b/packages/security/oidc-provider-plugin-wildcard-redirect-uri/package.json @@ -55,4 +55,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/security/oidc-provider/package.json b/packages/security/oidc-provider/package.json index 892e9471846..72d96db338b 100644 --- a/packages/security/oidc-provider/package.json +++ b/packages/security/oidc-provider/package.json @@ -85,4 +85,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/security/passport/package.json b/packages/security/passport/package.json index c680db1aa65..6183198591c 100644 --- a/packages/security/passport/package.json +++ b/packages/security/passport/package.json @@ -50,4 +50,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/specs/ajv/package.json b/packages/specs/ajv/package.json index dbbc470243e..5dc8d570a8b 100644 --- a/packages/specs/ajv/package.json +++ b/packages/specs/ajv/package.json @@ -56,4 +56,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/specs/exceptions/package.json b/packages/specs/exceptions/package.json index 075653f45db..75375ff3aa6 100644 --- a/packages/specs/exceptions/package.json +++ b/packages/specs/exceptions/package.json @@ -33,4 +33,4 @@ "peerDependencies": { "@tsed/core": "7.61.2" } -} \ No newline at end of file +} diff --git a/packages/specs/json-mapper/package.json b/packages/specs/json-mapper/package.json index 9448e82be28..529367f17ac 100644 --- a/packages/specs/json-mapper/package.json +++ b/packages/specs/json-mapper/package.json @@ -57,4 +57,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/specs/openspec/package.json b/packages/specs/openspec/package.json index 22dfe493f06..2b6aeab35c2 100644 --- a/packages/specs/openspec/package.json +++ b/packages/specs/openspec/package.json @@ -35,4 +35,4 @@ }, "dependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/packages/specs/schema/package.json b/packages/specs/schema/package.json index a91f0a2820f..55411605cad 100644 --- a/packages/specs/schema/package.json +++ b/packages/specs/schema/package.json @@ -67,4 +67,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/specs/swagger/package.json b/packages/specs/swagger/package.json index bb95a117bdb..ff096e88699 100644 --- a/packages/specs/swagger/package.json +++ b/packages/specs/swagger/package.json @@ -50,4 +50,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/agenda/package.json b/packages/third-parties/agenda/package.json index 392e461b0cf..bd4e3c08b85 100644 --- a/packages/third-parties/agenda/package.json +++ b/packages/third-parties/agenda/package.json @@ -39,4 +39,4 @@ "peerDependencies": { "agenda": ">=4" } -} \ No newline at end of file +} diff --git a/packages/third-parties/bullmq/package.json b/packages/third-parties/bullmq/package.json index aa4aeb6f0dd..e98e3083e80 100644 --- a/packages/third-parties/bullmq/package.json +++ b/packages/third-parties/bullmq/package.json @@ -40,4 +40,4 @@ "peerDependencies": { "bullmq": "^4.12.3 || ^5.1.1" } -} \ No newline at end of file +} diff --git a/packages/third-parties/components-scan/package.json b/packages/third-parties/components-scan/package.json index eae4db8bb5d..72d27992244 100644 --- a/packages/third-parties/components-scan/package.json +++ b/packages/third-parties/components-scan/package.json @@ -39,4 +39,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/event-emitter/package.json b/packages/third-parties/event-emitter/package.json index aa09a79bf30..933f29e307c 100644 --- a/packages/third-parties/event-emitter/package.json +++ b/packages/third-parties/event-emitter/package.json @@ -42,4 +42,4 @@ "peerDependencies": { "eventemitter2": "^6.4.4" } -} \ No newline at end of file +} diff --git a/packages/third-parties/formio-types/package.json b/packages/third-parties/formio-types/package.json index 72d7019b33d..eba2872d066 100644 --- a/packages/third-parties/formio-types/package.json +++ b/packages/third-parties/formio-types/package.json @@ -38,4 +38,4 @@ "eslint": "^8.12.0", "jest": "^29.2.0" } -} \ No newline at end of file +} diff --git a/packages/third-parties/formio/package.json b/packages/third-parties/formio/package.json index efe69c1fcc6..9437423a3e9 100644 --- a/packages/third-parties/formio/package.json +++ b/packages/third-parties/formio/package.json @@ -60,4 +60,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/schema-formio/package.json b/packages/third-parties/schema-formio/package.json index 471247f03fa..313a2805e53 100644 --- a/packages/third-parties/schema-formio/package.json +++ b/packages/third-parties/schema-formio/package.json @@ -76,4 +76,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/socketio-testing/package.json b/packages/third-parties/socketio-testing/package.json index d30ffe6616b..b9604a57911 100644 --- a/packages/third-parties/socketio-testing/package.json +++ b/packages/third-parties/socketio-testing/package.json @@ -35,4 +35,4 @@ "@tsed/di": "7.61.2", "socket.io-client": "^4.0.1" } -} \ No newline at end of file +} diff --git a/packages/third-parties/socketio/package.json b/packages/third-parties/socketio/package.json index 31bd83cce2a..8a418b76a28 100644 --- a/packages/third-parties/socketio/package.json +++ b/packages/third-parties/socketio/package.json @@ -68,4 +68,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/stripe/package.json b/packages/third-parties/stripe/package.json index d2f68255d56..3746dd143d9 100644 --- a/packages/third-parties/stripe/package.json +++ b/packages/third-parties/stripe/package.json @@ -69,4 +69,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/temporal/package.json b/packages/third-parties/temporal/package.json index 3763332a683..360e1d30796 100644 --- a/packages/third-parties/temporal/package.json +++ b/packages/third-parties/temporal/package.json @@ -42,4 +42,4 @@ "@temporalio/client": "^1.8.4", "@temporalio/worker": "^1.8.4" } -} \ No newline at end of file +} diff --git a/packages/third-parties/terminus/package.json b/packages/third-parties/terminus/package.json index 29a24d6312c..55ed966c0c4 100644 --- a/packages/third-parties/terminus/package.json +++ b/packages/third-parties/terminus/package.json @@ -55,4 +55,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/third-parties/vike/package.json b/packages/third-parties/vike/package.json index 293dc7487e5..9e6af204945 100644 --- a/packages/third-parties/vike/package.json +++ b/packages/third-parties/vike/package.json @@ -51,4 +51,4 @@ "optional": true } } -} \ No newline at end of file +} diff --git a/packages/third-parties/vite-ssr-plugin/package.json b/packages/third-parties/vite-ssr-plugin/package.json index 9171f9648ea..8c570b7f577 100644 --- a/packages/third-parties/vite-ssr-plugin/package.json +++ b/packages/third-parties/vite-ssr-plugin/package.json @@ -32,4 +32,4 @@ "barrelsby": "^2.8.1", "jest": "^29.2.0" } -} \ No newline at end of file +} diff --git a/packages/utils/normalize-path/package.json b/packages/utils/normalize-path/package.json index 024b6e07d67..14616df570c 100644 --- a/packages/utils/normalize-path/package.json +++ b/packages/utils/normalize-path/package.json @@ -30,4 +30,4 @@ "jest": "^29.2.0" }, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/tools/github-sponsors/package.json b/tools/github-sponsors/package.json index 8897576d3e6..cb23662e218 100644 --- a/tools/github-sponsors/package.json +++ b/tools/github-sponsors/package.json @@ -14,4 +14,4 @@ }, "dependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/tools/integration/package.json b/tools/integration/package.json index 76b86879a96..d2ebb7d4ae8 100644 --- a/tools/integration/package.json +++ b/tools/integration/package.json @@ -22,4 +22,4 @@ }, "dependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/tools/jest/package.json b/tools/jest/package.json index e2cb81f136a..0aed92b52aa 100644 --- a/tools/jest/package.json +++ b/tools/jest/package.json @@ -6,4 +6,4 @@ "dependencies": {}, "devDependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/tools/mocha/package.json b/tools/mocha/package.json index 0fb47315d5d..3f9ef9fb047 100644 --- a/tools/mocha/package.json +++ b/tools/mocha/package.json @@ -6,4 +6,4 @@ "dependencies": {}, "devDependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 752fce9ca0b..905541f182f 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -15,4 +15,4 @@ "dependencies": {}, "devDependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/tools/webpack/package.json b/tools/webpack/package.json index 7c8e67f1fc9..9fd45b4011e 100644 --- a/tools/webpack/package.json +++ b/tools/webpack/package.json @@ -6,4 +6,4 @@ "dependencies": {}, "devDependencies": {}, "peerDependencies": {} -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 76f8921bac3..b269b0b870b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6247,10 +6247,10 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/adapters": 7.61.1 - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/adapters": 7.61.2 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 ioredis: ">=5.2.3" ioredis-mock: ">=8.2.2" uuid: 8.3.2 @@ -6281,12 +6281,12 @@ __metadata: tslib: "npm:2.6.1" uuid: "npm:8.3.2" peerDependencies: - "@tsed/ajv": 7.61.1 - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/ajv": 7.61.2 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/ajv": optional: false @@ -6338,10 +6338,10 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/exceptions": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/exceptions": 7.61.2 + "@tsed/schema": 7.61.2 ajv: ">=8.9.0" ajv-errors: ">=3.0.0" peerDependenciesMeta: @@ -6378,9 +6378,9 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 "@tsed/logger": ">=6.2.2" apollo-datasource: ">=3.0.0" apollo-datasource-rest: ">=3.0.0" @@ -6462,7 +6462,7 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 + "@tsed/core": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -6495,9 +6495,9 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.2" peerDependencies: - "@tsed/core": 7.61.1 + "@tsed/core": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/schema": 7.61.1 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -6531,7 +6531,7 @@ __metadata: ect: "npm:^0.5.9" ejs: "npm:^3.1.6" eslint: "npm:^8.12.0" - filedirname: "npm:^2.7.0" + eta: "npm:3.2.0" haml: "npm:^0.4.3" haml-coffee: "npm:^1.14.1" hamlet: "npm:^0.3.3" @@ -6605,7 +6605,7 @@ __metadata: statuses: "npm:>=2.0.1" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 + "@tsed/core": 7.61.2 languageName: unknown linkType: soft @@ -6644,7 +6644,7 @@ __metadata: mongoose: "npm:^6.1.7" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 + "@tsed/common": 7.61.2 express: ^4.17.1 formio: ">=2.0.0" lodash: ^4.17.21 @@ -6679,9 +6679,9 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 "@tsed/logger": ">=6.2.2" graphql-ws: ">=5.14.2" languageName: unknown @@ -6719,8 +6719,8 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 ioredis: ">=5.2.3" ioredis-mock: ">=8.2.2" languageName: unknown @@ -6744,8 +6744,8 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -6813,9 +6813,9 @@ __metadata: tslib: "npm:2.6.1" peerDependencies: "@mikro-orm/core": ">=4.5.9" - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 "@tsed/logger": ">=6.2.2" languageName: unknown linkType: soft @@ -6844,12 +6844,12 @@ __metadata: mongoose: "npm:6.11.3" tslib: "npm:2.6.1" peerDependencies: - "@tsed/ajv": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 + "@tsed/ajv": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/schema": 7.61.1 + "@tsed/schema": 7.61.2 mongoose: ">=6.0.0" languageName: unknown linkType: soft @@ -6919,11 +6919,11 @@ __metadata: sqlite3: "npm:^5.0.2" tslib: "npm:2.6.1" peerDependencies: - "@tsed/ajv": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/ajv": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 knex: ">=0.94.0" objection: ">=2.0.0" peerDependenciesMeta: @@ -6958,10 +6958,10 @@ __metadata: jest: "npm:^29.2.0" wildcard: "npm:2.0.0" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/oidc-provider": 7.61.1 + "@tsed/oidc-provider": 7.61.2 oidc-provider: ">=8.0.0" peerDependenciesMeta: "@tsed/core": @@ -7000,12 +7000,12 @@ __metadata: tslib: "npm:2.6.1" uuid: "npm:8.3.2" peerDependencies: - "@tsed/ajv": 7.61.1 - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/ajv": 7.61.2 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 oidc-provider: ">=8.0.0" peerDependenciesMeta: "@tsed/ajv": @@ -7056,7 +7056,7 @@ __metadata: passport-strategy: "npm:1.0.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 + "@tsed/common": 7.61.2 passport: ">=0.4.1" peerDependenciesMeta: "@tsed/common": @@ -7094,10 +7094,10 @@ __metadata: micromatch: "npm:4.0.5" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7124,10 +7124,10 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/exceptions": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/exceptions": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7170,14 +7170,14 @@ __metadata: multer: "npm:^1.4.5-lts.1" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/openspec": 7.61.1 - "@tsed/platform-views": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/openspec": 7.61.2 + "@tsed/platform-views": 7.61.2 + "@tsed/schema": 7.61.2 "@types/multer": ^1.4.5 body-parser: ^1.19.0 cross-env: 7.0.3 @@ -7237,13 +7237,13 @@ __metadata: multer: "npm:^1.4.5-lts.1" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/openspec": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/openspec": 7.61.2 + "@tsed/schema": 7.61.2 koa: ">=2.13.0" koa-bodyparser: ">=4.3.0" koa-compress: ">=5.0.1" @@ -7284,9 +7284,9 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/di": 7.61.1 - "@tsed/platform-middlewares": 7.61.1 - "@tsed/platform-params": 7.61.1 + "@tsed/di": 7.61.2 + "@tsed/platform-middlewares": 7.61.2 + "@tsed/platform-params": 7.61.2 peerDependenciesMeta: "@tsed/di": optional: false @@ -7310,9 +7310,9 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: true @@ -7338,11 +7338,11 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/exceptions": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/exceptions": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7372,11 +7372,11 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/exceptions": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/exceptions": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7407,12 +7407,12 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/exceptions": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/platform-params": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/exceptions": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/platform-params": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7445,13 +7445,13 @@ __metadata: serverless-http: "npm:^2.7.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/openspec": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/openspec": 7.61.2 + "@tsed/schema": 7.61.2 aws-lambda: ">=1.0.7" serverless-http: ">=2.0.0" peerDependenciesMeta: @@ -7487,13 +7487,13 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/openspec": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/openspec": 7.61.2 + "@tsed/schema": 7.61.2 languageName: unknown linkType: soft @@ -7521,7 +7521,7 @@ __metadata: tslib: "npm:2.6.1" uuid: "npm:^8.3.2" peerDependencies: - "@tsed/di": 7.61.1 + "@tsed/di": 7.61.2 "@tsed/logger": ">=6.2.2" peerDependenciesMeta: "@tsed/di": @@ -7576,11 +7576,11 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/engines": 7.61.1 - "@tsed/exceptions": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/engines": 7.61.2 + "@tsed/exceptions": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7618,10 +7618,10 @@ __metadata: tslib: "npm:2.6.1" peerDependencies: "@prisma/client": ">=4.0.0" - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 bin: tsed-prisma: lib/cjs/generator.js languageName: unknown @@ -7714,9 +7714,9 @@ __metadata: jest: "npm:^29.2.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/openspec": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/openspec": 7.61.2 + "@tsed/schema": 7.61.2 formiojs: ">=4.0.0" lodash: ">=4.0.0" moment: ">=2.0.0" @@ -7759,8 +7759,8 @@ __metadata: statuses: "npm:>=2.0.1" tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/openspec": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/openspec": 7.61.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -7782,9 +7782,9 @@ __metadata: socket.io-client: "npm:^4.1.2" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 socket.io-client: ^4.0.1 languageName: unknown linkType: soft @@ -7810,11 +7810,11 @@ __metadata: socket.io-client: "npm:^4.7.1" tslib: "npm:2.6.1" peerDependencies: - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 "@tsed/logger": ">=6.2.2" - "@tsed/platform-middlewares": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/platform-middlewares": 7.61.2 + "@tsed/schema": 7.61.2 socket.io: ">=4.0.0" peerDependenciesMeta: "@tsed/di": @@ -7845,10 +7845,10 @@ __metadata: stripe: "npm:^8.129.0" tslib: "npm:2.6.1" peerDependencies: - "@tsed/exceptions": 7.61.1 - "@tsed/platform-middlewares": 7.61.1 - "@tsed/platform-params": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/exceptions": 7.61.2 + "@tsed/platform-middlewares": 7.61.2 + "@tsed/platform-params": 7.61.2 + "@tsed/schema": 7.61.2 "@types/body-parser": ^1.19.0 body-parser: ^1.19.0 stripe: ^9.16.0 @@ -7888,7 +7888,7 @@ __metadata: swagger-ui-dist: "npm:^4.5.2" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 + "@tsed/common": 7.61.2 peerDependenciesMeta: "@tsed/common": optional: false @@ -7932,10 +7932,10 @@ __metadata: tslib: "npm:2.6.1" peerDependencies: "@godaddy/terminus": ^4.7.1 - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/schema": 7.61.2 peerDependenciesMeta: "@godaddy/terminus": optional: false @@ -7963,9 +7963,9 @@ __metadata: semver: "npm:^7.3.5" tslib: "npm:2.6.1" peerDependencies: - "@tsed/common": 7.61.1 - "@tsed/core": 7.61.1 - "@tsed/mongoose": 7.61.1 + "@tsed/common": 7.61.2 + "@tsed/core": 7.61.2 + "@tsed/mongoose": 7.61.2 mongoose: ">=6.0.0" languageName: unknown linkType: soft @@ -8029,10 +8029,10 @@ __metadata: tslib: "npm:2.6.1" typeorm: "npm:^0.2.45" peerDependencies: - "@tsed/core": 7.61.1 - "@tsed/di": 7.61.1 - "@tsed/json-mapper": 7.61.1 - "@tsed/schema": 7.61.1 + "@tsed/core": 7.61.2 + "@tsed/di": 7.61.2 + "@tsed/json-mapper": 7.61.2 + "@tsed/schema": 7.61.2 typeorm: ^0.2.26 languageName: unknown linkType: soft @@ -8059,7 +8059,7 @@ __metadata: vike: "npm:0.4.160" vite: "npm:5.0.12" peerDependencies: - "@tsed/common": 7.61.1 + "@tsed/common": 7.61.2 vike: ">=0.4.160" vite: ">=4" peerDependenciesMeta: @@ -14963,6 +14963,13 @@ __metadata: languageName: node linkType: hard +"eta@npm:3.2.0": + version: 3.2.0 + resolution: "eta@npm:3.2.0" + checksum: 10/f4aa8ff6b9a4adf3d5db83255793be0136bdbcf2341154ad64c019bacc04d69e10218e54764af572eb8ba016996b8cbac9dc7a6fc2e9eb5005a0323bab883692 + languageName: node + linkType: hard + "eta@npm:^2.0.1": version: 2.0.1 resolution: "eta@npm:2.0.1" From e2fd44d4bd7253535e9c1e3dc4bd5aa62a4915c0 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 22 Feb 2024 08:56:59 +0100 Subject: [PATCH 2/2] feat(platform-views): give root option to the engine to fix Eta views dir support --- .../src/domain/PlatformViewsSettings.ts | 1 + .../src/services/PlatformViews.spec.ts | 6 ++++-- .../platform-views/src/services/PlatformViews.ts | 12 +++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/platform/platform-views/src/domain/PlatformViewsSettings.ts b/packages/platform/platform-views/src/domain/PlatformViewsSettings.ts index e938850ac98..2d3ef18b38e 100644 --- a/packages/platform/platform-views/src/domain/PlatformViewsSettings.ts +++ b/packages/platform/platform-views/src/domain/PlatformViewsSettings.ts @@ -7,6 +7,7 @@ export const PLATFORM_VIEWS_EXTENSIONS = { dot: "dot", dust: "dust", ect: "ect", + eta: "eta", ejs: "ejs", haml: "haml", "haml-coffee": "haml-coffee", diff --git a/packages/platform/platform-views/src/services/PlatformViews.spec.ts b/packages/platform/platform-views/src/services/PlatformViews.spec.ts index bea3bc33876..782aa189284 100644 --- a/packages/platform/platform-views/src/services/PlatformViews.spec.ts +++ b/packages/platform/platform-views/src/services/PlatformViews.spec.ts @@ -46,7 +46,8 @@ describe("PlatformViews", () => { cache: false, alter: "alter", global: "global", - requires: "requires" + requires: "requires", + root: expect.any(String) }); }); it("should render a template without extension", async () => { @@ -63,7 +64,8 @@ describe("PlatformViews", () => { global: "global", test: "test", alter: "alter", - requires: "requires" + requires: "requires", + root: expect.any(String) }); }); it("should render a template without extension", async () => { diff --git a/packages/platform/platform-views/src/services/PlatformViews.ts b/packages/platform/platform-views/src/services/PlatformViews.ts index 4fdc89a7c44..3c72b1df022 100644 --- a/packages/platform/platform-views/src/services/PlatformViews.ts +++ b/packages/platform/platform-views/src/services/PlatformViews.ts @@ -129,7 +129,17 @@ export class PlatformViews { throw new Error(`Engine not found to render the following "${viewPath}"`); } - const finalOpts = Object.assign({cache: this.cache || this.env === Env.PROD}, engine.options, options, {$ctx}); + const finalOpts = Object.assign( + { + cache: this.cache || this.env === Env.PROD + }, + engine.options, + options, + { + $ctx, + root: this.root + } + ); return engine.render(path, finalOpts); }