diff --git a/.eslintignore b/.eslintignore index e991834e776..40eb8662f85 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,6 @@ node_modules docs +docs-references **/lib **/dist **/coverage diff --git a/.husky/pre-commit b/.husky/pre-commit index 7ec41d8fa1c..49088de7558 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -yarn lint-staged --relative +npx lint-staged $1 diff --git a/docs/tutorials/snippets/mongoose/plugin.ts b/docs/tutorials/snippets/mongoose/plugin.ts index 46d7ab9d08a..db11c4aaeb5 100644 --- a/docs/tutorials/snippets/mongoose/plugin.ts +++ b/docs/tutorials/snippets/mongoose/plugin.ts @@ -1,3 +1,4 @@ +// eslint import {Inject, Injectable} from "@tsed/di"; import {Model, MongooseModel, MongoosePlugin} from "@tsed/mongoose"; import * as findOrCreate from "mongoose-findorcreate"; @@ -13,12 +14,10 @@ class UserModel { @Injectable() class UserService { constructor(@Inject(UserModel) userModel: MongooseModel) { - userModel - .findOrCreate({ - // ... - }) - .then((findOrCreateResult) => { - // ... - }); + UserModel.findOrCreate({ + // ... + }).then((findOrCreateResult) => { + // ... + }); } } diff --git a/package.json b/package.json index 7a622d321e3..29ae55fbbd7 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,8 @@ "lerna": "4.0.0", "microbundle": "0.13.0", "source-map-support": "0.5.19", - "uuid": "8.3.2" + "uuid": "8.3.2", + "rxjs": "^6.5.2" }, "devDependencies": { "@commitlint/cli": "^16.1.0", diff --git a/packages/core/src/decorators/deprecated.ts b/packages/core/src/decorators/deprecated.ts index 9a55aa23e31..4422004e1f2 100644 --- a/packages/core/src/decorators/deprecated.ts +++ b/packages/core/src/decorators/deprecated.ts @@ -1,5 +1,5 @@ import {Type} from "../domain/Type"; - +import {deprecate} from "util"; /** * The `@Deprecated()` decorators wraps the given method in such a way that it is marked as deprecated. * @@ -35,7 +35,7 @@ export function Deprecated(message: string): Function { return (target: Type, targetKey: string, descriptor: TypedPropertyDescriptor) => { const originalMethod = descriptor.value; - descriptor.value = require("util").deprecate(originalMethod, message); + descriptor.value = deprecate(originalMethod, message); return descriptor; }; diff --git a/packages/graphql/apollo/src/services/ApolloService.ts b/packages/graphql/apollo/src/services/ApolloService.ts index 367f8cc799f..7a8664b201a 100644 --- a/packages/graphql/apollo/src/services/ApolloService.ts +++ b/packages/graphql/apollo/src/services/ApolloService.ts @@ -55,7 +55,7 @@ export class ApolloService { this.logger.info(`Create server with Apollo for: ${id}`); this.logger.debug(`options: ${JSON.stringify({path})}`); - const server = this.createInstance( + const server = await this.createInstance( { ...config, plugins: this.getPlugins(settings) @@ -112,7 +112,7 @@ export class ApolloService { return this.servers.has(id); } - protected createInstance(options: Config, server?: ApolloCustomServerCB): ApolloServer | undefined { + protected async createInstance(options: Config, server?: ApolloCustomServerCB): Promise { // istanbul ignore next if (server) { return server(options); @@ -120,7 +120,7 @@ export class ApolloService { // istanbul ignore next try { - const Server = require(`apollo-server-${this.platformName || "express"}`).ApolloServer; + const {ApolloServer: Server} = await import(`apollo-server-${this.platformName || "express"}`); return new Server(options); } catch (er) { diff --git a/packages/orm/mikro-orm/test/helpers/Server.ts b/packages/orm/mikro-orm/test/helpers/Server.ts index e5e9be5018f..02d4b321b12 100644 --- a/packages/orm/mikro-orm/test/helpers/Server.ts +++ b/packages/orm/mikro-orm/test/helpers/Server.ts @@ -3,10 +3,10 @@ import {PlatformApplication} from "@tsed/common"; import {resolve} from "path"; import "@tsed/platform-express"; -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = resolve(__dirname); diff --git a/packages/orm/mongoose/test/helpers/Server.ts b/packages/orm/mongoose/test/helpers/Server.ts index 4d4fe32617e..9f5f753ba74 100644 --- a/packages/orm/mongoose/test/helpers/Server.ts +++ b/packages/orm/mongoose/test/helpers/Server.ts @@ -2,11 +2,10 @@ import {Configuration, Inject, PlatformApplication} from "@tsed/common"; import "@tsed/mongoose"; import "@tsed/platform-express"; import Path from "path"; - -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = Path.resolve(__dirname); diff --git a/packages/orm/objection/test/helpers/Server.ts b/packages/orm/objection/test/helpers/Server.ts index 65cd767e320..a60e4add43d 100644 --- a/packages/orm/objection/test/helpers/Server.ts +++ b/packages/orm/objection/test/helpers/Server.ts @@ -3,10 +3,10 @@ import Path from "path"; import "@tsed/platform-express"; import "@tsed/objection"; -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = Path.resolve(__dirname); diff --git a/packages/orm/typeorm/test/helpers/Server.ts b/packages/orm/typeorm/test/helpers/Server.ts index 39a231ef2fd..0cb49c52ac1 100644 --- a/packages/orm/typeorm/test/helpers/Server.ts +++ b/packages/orm/typeorm/test/helpers/Server.ts @@ -3,11 +3,10 @@ import Path from "path"; import "@tsed/platform-express"; import "@tsed/typeorm"; import "./connections/ConnectionProvider"; - -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = Path.resolve(__dirname); diff --git a/packages/platform/common/package.json b/packages/platform/common/package.json index 26e871b83bb..5e3c20e31d8 100644 --- a/packages/platform/common/package.json +++ b/packages/platform/common/package.json @@ -80,21 +80,11 @@ "@tsed/platform-views": "6.102.3", "@tsed/schema": "6.102.3", "@types/json-schema": "7.0.7", + "@types/on-finished": "2.3.1", "on-finished": "2.3.0", "tslib": "2.2.0", "uuid": "8.3.2" }, - "devDependencies": { - "rxjs": "^6.5.2" - }, - "peerDependencies": { - "@tsed/components-scan": ">=6.102.1", - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/exceptions": ">=6.102.1", - "@tsed/json-mapper": ">=6.102.1", - "@tsed/logger": ">=6.0.2", - "@tsed/logger-file": ">=6.0.0", - "@tsed/schema": ">=6.102.1" - } -} \ No newline at end of file + "devDependencies": {}, + "peerDependencies": {} +} diff --git a/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts b/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts index a8532fa79e7..bbaf96308e9 100644 --- a/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts +++ b/packages/platform/common/src/config/interfaces/PlatformMulterSettings.ts @@ -1,144 +1,13 @@ -import {Request} from "express"; -import {FileFilterCallback} from "multer"; -import {Readable} from "stream"; +import type {Express} from "express"; +import type multer from "multer"; declare global { namespace TsED { - export interface MulterFile { - /** Name of the form field associated with this file. */ - fieldname: string; - /** Name of the file on the uploader's computer. */ - originalname: string; - /** Value of the `Content-Type` header for this file. */ - mimetype: string; - /** Size of the file in bytes. */ - size: number; - /** - * A readable stream of this file. Only available to the `_handleFile` - * callback for custom `StorageEngine`s. - */ - stream: Readable; - /** `DiskStorage` only: Directory to which this file has been uploaded. */ - destination: string; - /** `DiskStorage` only: Name of this file within `destination`. */ - filename: string; - /** `DiskStorage` only: Full path to the uploaded file. */ - path: string; - /** `MemoryStorage` only: A Buffer containing the entire file. */ - buffer: Buffer; - } - - export interface MulterStorageEngine {} - - export interface MulterOptions { - /** - * A `StorageEngine` responsible for processing files uploaded via Multer. - * Takes precedence over `dest`. - */ - storage?: MulterStorageEngine; - /** - * The destination directory for uploaded files. If `storage` is not set - * and `dest` is, Multer will create a `DiskStorage` instance configured - * to store files at `dest` with random filenames. - * - * Ignored if `storage` is set. - */ - dest?: string; - /** - * An object specifying various limits on incoming data. This object is - * passed to Busboy directly, and the details of properties can be found - * at https://github.com/mscdex/busboy#busboy-methods. - */ - limits?: { - /** Maximum size of each form field name in bytes. (Default: 100) */ - fieldNameSize?: number; - /** Maximum size of each form field value in bytes. (Default: 1048576) */ - fieldSize?: number; - /** Maximum number of non-file form fields. (Default: Infinity) */ - fields?: number; - /** Maximum size of each file in bytes. (Default: Infinity) */ - fileSize?: number; - /** Maximum number of file fields. (Default: Infinity) */ - files?: number; - /** Maximum number of parts (non-file fields + files). (Default: Infinity) */ - parts?: number; - /** Maximum number of headers. (Default: 2000) */ - headerPairs?: number; - }; - /** Preserve the full path of the original filename rather than the basename. (Default: false) */ - preservePath?: boolean; - /** - * Optional function to control which files are uploaded. This is called - * for every file that is processed. - * - * @param req The Express `Request` object. - * @param file Object containing information about the processed file. - * @param callback a function to control which files should be uploaded and which should be skipped. - */ - fileFilter?(req: Request, file: MulterFile, callback: FileFilterCallback): void; - } - - export interface MulterField { - name: string; - maxCount?: number; - } - - export type MulterHandler = (req: any, res: any) => Promise; - - export interface Multer { - /** - * Returns middleware that processes a single file associated with the - * given form field. - * - * The `Request` object will be populated with a `file` object containing - * information about the processed file. - * - * @param fieldName Name of the multipart form field to process. - */ - single(fieldName: string): MulterHandler; - - /** - * Returns middleware that processes multiple files sharing the same field - * name. - * - * The `Request` object will be populated with a `files` array containing - * an information object for each processed file. - * - * @param fieldName Shared name of the multipart form fields to process. - * @param maxCount Optional. Maximum number of files to process. (default: Infinity) - * @throws `MulterError('LIMIT_UNEXPECTED_FILE')` if more than `maxCount` files are associated with `fieldName` - */ - array(fieldName: string, maxCount?: number): MulterHandler; - - /** - * Returns middleware that processes multiple files associated with the - * given form fields. - * - * The `Request` object will be populated with a `files` object which - * maps each field name to an array of the associated file information - * objects. - * - * @param fields Array of `Field` objects describing multipart form fields to process. - * @throws `MulterError('LIMIT_UNEXPECTED_FILE')` if more than `maxCount` files are associated with `fieldName` for any field. - */ - fields(fields: MulterField[]): MulterHandler; - - /** - * Returns middleware that processes all files contained in the multipart - * request. - * - * The `Request` object will be populated with a `files` array containing - * an information object for each processed file. - */ - any(): MulterHandler; - - /** - * Returns middleware that accepts only non-file multipart form fields. - * - * @throws `MulterError('LIMIT_UNEXPECTED_FILE')` if any file is encountered. - */ - none(): MulterHandler; - } + export type MulterFile = Express.Multer.File; + export type MulterStorageEngine = multer.StorageEngine; + export type MulterOptions = multer.Options; + export type MulterField = multer.Field; + export type Multer = multer.Multer; } } diff --git a/packages/platform/common/src/middlewares/PlatformMulterMiddleware.ts b/packages/platform/common/src/middlewares/PlatformMulterMiddleware.ts index dbdea523309..e7b0926626a 100644 --- a/packages/platform/common/src/middlewares/PlatformMulterMiddleware.ts +++ b/packages/platform/common/src/middlewares/PlatformMulterMiddleware.ts @@ -33,7 +33,7 @@ export class PlatformMulterMiddleware implements MiddlewareMethods { delete settings.dest; } - const middleware = this.app.multer(settings).fields(this.getFields({fields})); + const middleware: any = this.app.multer(settings).fields(this.getFields({fields})); return await middleware(ctx.getRequest(), ctx.getResponse()); } catch (er) { diff --git a/packages/platform/common/src/services/PlatformResponse.ts b/packages/platform/common/src/services/PlatformResponse.ts index 3dfb9d38c4c..e98190cfcc3 100644 --- a/packages/platform/common/src/services/PlatformResponse.ts +++ b/packages/platform/common/src/services/PlatformResponse.ts @@ -4,8 +4,7 @@ import {ServerResponse} from "http"; import {IncomingEvent} from "../interfaces/IncomingEvent"; import type {PlatformRequest} from "./PlatformRequest"; import type {PlatformContext} from "../domain/PlatformContext"; - -const onFinished = require("on-finished"); +import onFinished from "on-finished"; declare global { namespace TsED { @@ -68,7 +67,7 @@ export class PlatformResponse = any> { return this.getRes(); } - static onFinished(res: any, cb: Function) { + static onFinished(res: any, cb: (er: Error | null, message: string) => void) { onFinished(res, cb); } @@ -304,7 +303,7 @@ export class PlatformResponse = any> { * Add a listener to handler the end of the request/response. * @param cb */ - onEnd(cb: Function): this { + onEnd(cb: (er: Error | null, message: string) => void): this { PlatformResponse.onFinished(this.getRes(), cb); return this; diff --git a/packages/platform/common/src/services/PlatformRouter.ts b/packages/platform/common/src/services/PlatformRouter.ts index 079b53da66d..e5ed3d63fba 100644 --- a/packages/platform/common/src/services/PlatformRouter.ts +++ b/packages/platform/common/src/services/PlatformRouter.ts @@ -4,7 +4,7 @@ import {PlatformMulter, PlatformMulterSettings, PlatformStaticsOptions} from ".. import {PlatformRouteOptions, PlatformRouteWithoutHandlers} from "../interfaces"; import {createFakeRawDriver} from "./FakeRawDriver"; import {PlatformHandler} from "./PlatformHandler"; - +import type multer from "multer"; /** * @ignore */ @@ -32,8 +32,11 @@ export class PlatformRouter { @Inject() injector: InjectorService; + #multer: typeof multer; + constructor(protected platformHandler: PlatformHandler) { this.rawRouter = this.raw = PlatformRouter.createRawRouter(); + import("multer").then(({default: multer}) => (this.#multer = multer)); } /** @@ -113,7 +116,7 @@ export class PlatformRouter { } multer(options: PlatformMulterSettings): PlatformMulter { - const m = require("multer")(options); + const m = this.#multer(options); const makePromise = (multer: any, name: string) => { // istanbul ignore next diff --git a/packages/platform/common/src/services/PlatformTest.ts b/packages/platform/common/src/services/PlatformTest.ts index 8d9b0249458..8745e7776a4 100644 --- a/packages/platform/common/src/services/PlatformTest.ts +++ b/packages/platform/common/src/services/PlatformTest.ts @@ -1,11 +1,12 @@ import {DITest, DITestOptions, InjectorService} from "@tsed/di"; +import {Type} from "@tsed/core"; import {PlatformBuilder} from "../builder/PlatformBuilder"; import {PlatformContext, PlatformContextOptions} from "../domain/PlatformContext"; import {createInjector} from "../utils/createInjector"; import {PlatformApplication} from "./PlatformApplication"; import {getConfiguration} from "../utils/getConfiguration"; import {PlatformAdapter, PlatformBuilderSettings} from "../interfaces/PlatformAdapter"; -import {Type} from "@tsed/core"; +import accepts from "accepts"; /** * @platform @@ -115,7 +116,7 @@ export class PlatformTest extends DITest { return this.headers[key.toLowerCase()]; }, accepts(mime?: string | string[]) { - return require("accepts")(this).types([].concat(mime as never)); + return accepts(this).types([].concat(mime as never)); }, ...options }; diff --git a/packages/platform/common/src/utils/createContext.ts b/packages/platform/common/src/utils/createContext.ts index 158fb7adb4c..ffe8a80cab5 100644 --- a/packages/platform/common/src/utils/createContext.ts +++ b/packages/platform/common/src/utils/createContext.ts @@ -3,9 +3,9 @@ import {PlatformContext} from "../domain/PlatformContext"; import {PlatformRequest} from "../services/PlatformRequest"; import {PlatformResponse} from "../services/PlatformResponse"; import {IncomingEvent} from "../interfaces/IncomingEvent"; +import {v4} from "uuid"; -const uuidv4 = require("uuid").v4; -const defaultReqIdBuilder = (req: any) => req.get("x-request-id") || uuidv4().replace(/-/gi, ""); +const defaultReqIdBuilder = (req: any) => req.get("x-request-id") || v4().replace(/-/gi, ""); /** * Create the TsED context to wrap request, response, injector, etc... diff --git a/packages/platform/platform-aws/package.json b/packages/platform/platform-aws/package.json index 8409bebdb9a..a9e3c543faf 100644 --- a/packages/platform/platform-aws/package.json +++ b/packages/platform/platform-aws/package.json @@ -65,16 +65,9 @@ "tslib": "2.2.0" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", "aws-serverless-express": "^3.4.0" }, "publishConfig": { "dist-tag": "deprecated" } -} \ No newline at end of file +} diff --git a/packages/platform/platform-cache/package.json b/packages/platform/platform-cache/package.json index 09a9875ba76..8b73bb07d34 100644 --- a/packages/platform/platform-cache/package.json +++ b/packages/platform/platform-cache/package.json @@ -32,11 +32,5 @@ "@types/cache-manager": "^3.4.2", "@types/micromatch": "^4.0.1" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/exceptions": ">=6.102.1", - "@tsed/json-mapper": ">=6.102.1", - "@tsed/schema": ">=6.102.1" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/platform/platform-exceptions/package.json b/packages/platform/platform-exceptions/package.json index b67e2f99bb4..ee702c6aa0f 100644 --- a/packages/platform/platform-exceptions/package.json +++ b/packages/platform/platform-exceptions/package.json @@ -26,10 +26,5 @@ "@tsed/exceptions": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/exceptions": "^6.102.3", - "@tsed/schema": "^6.102.3" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/platform/platform-express/package.json b/packages/platform/platform-express/package.json index 990dcd5695a..4be320d35f7 100644 --- a/packages/platform/platform-express/package.json +++ b/packages/platform/platform-express/package.json @@ -78,14 +78,7 @@ "method-override": "3.0.0" }, "peerDependencies": { - "@tsed/common": ">=6.102.1", - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/json-mapper": ">=6.102.1", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": ">=6.102.1", - "@tsed/schema": ">=6.102.1", "@types/multer": ">=1.4.5", "body-parser": ">=1.19.0" } -} \ No newline at end of file +} diff --git a/packages/platform/platform-koa/package.json b/packages/platform/platform-koa/package.json index a758ac8f85a..09d4b529032 100644 --- a/packages/platform/platform-koa/package.json +++ b/packages/platform/platform-koa/package.json @@ -82,13 +82,6 @@ "tslib": "2.2.0" }, "peerDependencies": { - "@tsed/common": ">=6.102.1", - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/json-mapper": ">=6.102.1", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": ">=6.102.1", - "@tsed/schema": ">=6.102.1", "koa": ">=2.13.0", "koa-bodyparser": ">=4.3.0", "koa-compress": ">=5.0.1", @@ -96,4 +89,4 @@ "koa-qs": ">=3.0.0", "koa-session": ">=6.2.0" } -} \ No newline at end of file +} diff --git a/packages/platform/platform-koa/src/services/PlatformKoaResponse.ts b/packages/platform/platform-koa/src/services/PlatformKoaResponse.ts index e44d3471a7a..c2fb519618a 100644 --- a/packages/platform/platform-koa/src/services/PlatformKoaResponse.ts +++ b/packages/platform/platform-koa/src/services/PlatformKoaResponse.ts @@ -2,8 +2,7 @@ import {IncomingEvent, PlatformContext, PlatformResponse} from "@tsed/common"; import {ServerResponse} from "http"; import Koa from "koa"; import {getStatusMessage} from "@tsed/schema"; - -const encodeUrl = require("encodeurl"); +import encodeUrl from "encodeurl"; declare global { namespace TsED { diff --git a/packages/platform/platform-koa/src/utils/multer.ts b/packages/platform/platform-koa/src/utils/multer.ts index 5eba5927a30..3e8a1f7ab20 100644 --- a/packages/platform/platform-koa/src/utils/multer.ts +++ b/packages/platform/platform-koa/src/utils/multer.ts @@ -1,6 +1,9 @@ import Koa from "koa"; import {promisify} from "util"; +let multer: any; +import("multer").then(({default: m}) => (multer = m)); + /** * @ignore */ @@ -50,7 +53,7 @@ function makePromise(multer: any, name: string) { * @ignore */ export function getMulter(options: any) { - const m = require("multer")(options); + const m = multer(options); makePromise(m, "any"); makePromise(m, "array"); diff --git a/packages/platform/platform-koa/test/app/Server.ts b/packages/platform/platform-koa/test/app/Server.ts index c7326e0c44c..7199b48cfe7 100644 --- a/packages/platform/platform-koa/test/app/Server.ts +++ b/packages/platform/platform-koa/test/app/Server.ts @@ -5,8 +5,8 @@ import Application from "koa"; import bodyParser from "koa-bodyparser"; import compress from "koa-compress"; import session from "koa-session"; - -const methodOverride = require("koa-override"); +// @ts-ignore +import methodOverride from "koa-override"; export const rootDir = __dirname; diff --git a/packages/platform/platform-log-middleware/package.json b/packages/platform/platform-log-middleware/package.json index ec3b58bd509..688a133a82f 100644 --- a/packages/platform/platform-log-middleware/package.json +++ b/packages/platform/platform-log-middleware/package.json @@ -27,10 +27,5 @@ "@tsed/platform-middlewares": "6.102.3", "@tsed/platform-params": "6.102.3" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/platform-middlewares": ">=6.102.1", - "@tsed/platform-params": ">=6.102.1" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/platform/platform-middlewares/package.json b/packages/platform/platform-middlewares/package.json index b728239b149..9fda985cfc8 100644 --- a/packages/platform/platform-middlewares/package.json +++ b/packages/platform/platform-middlewares/package.json @@ -25,9 +25,5 @@ "@tsed/di": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/schema": ">=6.102.1" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/platform/platform-params/package.json b/packages/platform/platform-params/package.json index ab4c3c546a3..b9139a511dc 100644 --- a/packages/platform/platform-params/package.json +++ b/packages/platform/platform-params/package.json @@ -27,11 +27,5 @@ "@tsed/json-mapper": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/exceptions": ">=6.102.1", - "@tsed/json-mapper": ">=6.102.1", - "@tsed/schema": ">=6.102.1" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/platform/platform-response-filter/package.json b/packages/platform/platform-response-filter/package.json index d8c783b43da..9fdddc87c93 100644 --- a/packages/platform/platform-response-filter/package.json +++ b/packages/platform/platform-response-filter/package.json @@ -28,12 +28,5 @@ "@tsed/platform-views": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/exceptions": ">=6.102.1", - "@tsed/json-mapper": ">=6.102.1", - "@tsed/platform-views": ">=6.102.1", - "@tsed/schema": ">=6.102.1" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/platform/platform-serverless-http/package.json b/packages/platform/platform-serverless-http/package.json index 230f5b8b657..dcb12212f06 100644 --- a/packages/platform/platform-serverless-http/package.json +++ b/packages/platform/platform-serverless-http/package.json @@ -67,14 +67,7 @@ "serverless-http": "^2.7.0" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", "aws-lambda": ">=1.0.7", "serverless-http": ">=2.0.0" } -} \ No newline at end of file +} diff --git a/packages/platform/platform-views/package.json b/packages/platform/platform-views/package.json index 6f6b4ecaf37..543b57dcfed 100644 --- a/packages/platform/platform-views/package.json +++ b/packages/platform/platform-views/package.json @@ -28,13 +28,11 @@ "@tsed/engines": "^1.1.5", "@tsed/exceptions": "6.102.3", "@tsed/schema": "6.102.3", + "@types/ejs": "3.1.0", "@types/consolidate": "0.14.0" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1", - "@tsed/engines": ">=1.1.5", - "@tsed/exceptions": ">=6.102.1", - "@tsed/schema": ">=6.102.1" + "peerDependencies": {}, + "optionalDependencies": { + "@tsed/engines": ">=1.1.5" } -} \ No newline at end of file +} diff --git a/packages/platform/platform-views/src/services/PlatformViews.ts b/packages/platform/platform-views/src/services/PlatformViews.ts index 6d214587c3b..94ecf73a2be 100644 --- a/packages/platform/platform-views/src/services/PlatformViews.ts +++ b/packages/platform/platform-views/src/services/PlatformViews.ts @@ -9,10 +9,15 @@ import { PlatformViewsExtensionsTypes } from "../domain/PlatformViewsSettings"; -function patchEJS(ejs: any) { +async function patchEJS(ejs: any) { + if (!ejs) { + const mod = await import("ejs"); + ejs = mod.default; + } + return { compile(str: string, {client, ...options}: any) { - return (ejs || require("ejs")).compile(str, options); + return ejs.compile(str, options); } }; } @@ -79,7 +84,7 @@ export class PlatformViews { async loadFromConsolidate() { const cons = await tryImport("consolidate"); if (cons) { - cons.requires.ejs = patchEJS(cons.requires.ejs); + cons.requires.ejs = await patchEJS(cons.requires.ejs); this.#extensions.forEach((engineType) => { if ((cons as any)[engineType]) { @@ -102,7 +107,7 @@ export class PlatformViews { const tsed = await tryImport("@tsed/engines"); if (tsed) { - tsed.requires.set("ejs", patchEJS(tsed.requires.get("ejs"))); + tsed.requires.set("ejs", await patchEJS(tsed.requires.get("ejs"))); this.#extensions.forEach((engineType) => { if (tsed.engines.has(engineType)) { diff --git a/packages/security/oidc-provider/package.json b/packages/security/oidc-provider/package.json index 4384a148674..70374cf3841 100644 --- a/packages/security/oidc-provider/package.json +++ b/packages/security/oidc-provider/package.json @@ -48,14 +48,6 @@ "oidc-provider": "7.10.1" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/exceptions": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", "oidc-provider": ">=7.3.0" } -} \ No newline at end of file +} diff --git a/packages/security/oidc-provider/src/OidcModule.ts b/packages/security/oidc-provider/src/OidcModule.ts index 36be4eb9f67..15d6223b829 100644 --- a/packages/security/oidc-provider/src/OidcModule.ts +++ b/packages/security/oidc-provider/src/OidcModule.ts @@ -1,5 +1,6 @@ import {Inject, InjectorService, PlatformApplication} from "@tsed/common"; import {Constant, Module} from "@tsed/di"; +import koaMount from "koa-mount"; import {OidcAdapters} from "./services/OidcAdapters"; import {OidcJwks} from "./services/OidcJwks"; import {OidcProvider} from "./services/OidcProvider"; @@ -31,7 +32,7 @@ export class OidcModule { async $onRoutesInit() { if (this.basePath !== "/") { - this.app.use(this.getRewriteMiddleware()); + this.app.use(await this.getRewriteMiddleware()); } } @@ -45,7 +46,7 @@ export class OidcModule { this.app.use(this.basePath, provider.callback()); break; case "koa": - this.app.use(require("koa-mount")(this.basePath, provider.app)); + this.app.use(koaMount(this.basePath, provider.app)); break; } } @@ -61,13 +62,16 @@ export class OidcModule { } } - private getRewriteMiddleware() { + private async getRewriteMiddleware() { switch (this.platformName) { default: case "express": - return require("express-urlrewrite")("/.well-known/*", `${this.basePath}/.well-known/$1`); + const {default: expressUrlRewrite} = await import("express-urlrewrite"); + return expressUrlRewrite("/.well-known/*", `${this.basePath}/.well-known/$1`); case "koa": - return require("koa-rewrite")("/.well-known/(.*)", `${this.basePath}/.well-known/$1`); + // @ts-ignore + const {default: koaUrlRewrite} = await import("koa-rewrite"); + return koaUrlRewrite("/.well-known/(.*)", `${this.basePath}/.well-known/$1`); } } } diff --git a/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts b/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts index 86c2eab4a2b..5ab85f7ef4a 100644 --- a/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts +++ b/packages/security/oidc-provider/test/app/controllers/rest/VersionCtrl.ts @@ -8,7 +8,7 @@ export class VersionCtrl { .ContentType("application/json") .Schema(object().properties({name: string(), version: string()})) async get() { - const {name, version} = require("../../../../package.json"); + const {name, version} = await import("../../../../package.json"); return { name, version diff --git a/packages/security/passport/package.json b/packages/security/passport/package.json index 4b7695202bd..cbeffeb2b87 100644 --- a/packages/security/passport/package.json +++ b/packages/security/passport/package.json @@ -35,16 +35,6 @@ "passport-strategy": "1.0.0" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", - "passport": ">=0.4.1", - "passport-http": ">=0.3.0", - "passport-local": ">=1.0.0", - "passport-strategy": ">=1.0.0" + "passport": ">=0.4.1" } -} \ No newline at end of file +} diff --git a/packages/specs/ajv/package.json b/packages/specs/ajv/package.json index dadf9e56bd6..9e71932a459 100644 --- a/packages/specs/ajv/package.json +++ b/packages/specs/ajv/package.json @@ -28,10 +28,6 @@ "ajv": "8.9.0" }, "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/exceptions": "^6.102.3", - "@tsed/schema": "^6.102.3", - "ajv": "7||8" + "ajv": ">=8.9.0" } -} \ No newline at end of file +} diff --git a/packages/specs/json-mapper/package.json b/packages/specs/json-mapper/package.json index ca6cc703048..9d53c2589d8 100644 --- a/packages/specs/json-mapper/package.json +++ b/packages/specs/json-mapper/package.json @@ -37,9 +37,5 @@ "@tsed/exceptions": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/exceptions": "^6.102.3", - "@tsed/schema": "^6.102.3" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/specs/schema/package.json b/packages/specs/schema/package.json index 7bb5a03fd35..c2684ad9dd1 100644 --- a/packages/specs/schema/package.json +++ b/packages/specs/schema/package.json @@ -29,8 +29,6 @@ "tsed" ], "dependencies": { - "@tsed/core": "6.102.3", - "@tsed/openspec": "6.102.3", "camel-case": "4.1.2", "json-schema": "0.4.0", "micromatch": "4.0.4", @@ -38,14 +36,13 @@ "tslib": "2.2.0" }, "devDependencies": { + "@tsed/core": "6.102.3", + "@tsed/openspec": "6.102.3", "@apidevtools/swagger-parser": "10.0.2", "@types/fs-extra": "9.0.6", "@types/json-schema": "7.0.7", "@types/micromatch": "4.0.1", "fs-extra": "9.0.1" }, - "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/openspec": "^6.102.3" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/specs/swagger/package.json b/packages/specs/swagger/package.json index 65f79b37fb2..54141b44ea3 100644 --- a/packages/specs/swagger/package.json +++ b/packages/specs/swagger/package.json @@ -25,6 +25,7 @@ "tslib": "2.2.0" }, "devDependencies": { + "@types/swagger-ui-dist": "3.30.1", "@tsed/common": "6.102.3", "@tsed/core": "6.102.3", "@tsed/di": "6.102.3", @@ -32,12 +33,5 @@ "@tsed/openspec": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/specs/swagger/src/SwaggerModule.ts b/packages/specs/swagger/src/SwaggerModule.ts index e87e0e9a669..75eb199fb76 100644 --- a/packages/specs/swagger/src/SwaggerModule.ts +++ b/packages/specs/swagger/src/SwaggerModule.ts @@ -21,8 +21,9 @@ import {jsMiddleware} from "./middlewares/jsMiddleware"; import {redirectMiddleware} from "./middlewares/redirectMiddleware"; import {SwaggerService} from "./services/SwaggerService"; import {Env} from "@tsed/core"; +import {absolutePath} from "swagger-ui-dist"; -const swaggerUiPath = require("swagger-ui-dist").absolutePath(); +const swaggerUiPath = absolutePath(); /** * @ignore diff --git a/packages/specs/swagger/test/app/Server.ts b/packages/specs/swagger/test/app/Server.ts index 1b8e6997ad0..e0bb89ad9db 100644 --- a/packages/specs/swagger/test/app/Server.ts +++ b/packages/specs/swagger/test/app/Server.ts @@ -2,11 +2,10 @@ import {Configuration, Inject, PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; import "@tsed/swagger"; import Path from "path"; - -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = Path.resolve(__dirname); diff --git a/packages/third-parties/agenda/test/helpers/Server.ts b/packages/third-parties/agenda/test/helpers/Server.ts index 568842ead0d..30cecd2bdc5 100644 --- a/packages/third-parties/agenda/test/helpers/Server.ts +++ b/packages/third-parties/agenda/test/helpers/Server.ts @@ -3,10 +3,10 @@ import Path from "path"; import "@tsed/platform-express"; import "../../src/AgendaModule"; -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = Path.resolve(__dirname); diff --git a/packages/third-parties/async-hook-context/package.json b/packages/third-parties/async-hook-context/package.json index 02d0d578c7f..22575b46a2e 100644 --- a/packages/third-parties/async-hook-context/package.json +++ b/packages/third-parties/async-hook-context/package.json @@ -39,11 +39,8 @@ }, "devDependencies": { "@tsed/core": "6.102.3", - "@tsed/di": "6.102.3" - }, - "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", + "@tsed/di": "6.102.3", "@tsed/logger": ">=6.0.2" - } -} \ No newline at end of file + }, + "peerDependencies": {} +} diff --git a/packages/third-parties/event-emitter/test/helpers/Server.ts b/packages/third-parties/event-emitter/test/helpers/Server.ts index 87aa7b9b0fe..9f0090e95c5 100644 --- a/packages/third-parties/event-emitter/test/helpers/Server.ts +++ b/packages/third-parties/event-emitter/test/helpers/Server.ts @@ -3,10 +3,10 @@ import Path from "path"; import "@tsed/platform-express"; import "../../src/EventEmitterModule"; -const cookieParser = require("cookie-parser"), - bodyParser = require("body-parser"), - compress = require("compression"), - methodOverride = require("method-override"); +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; +import compress from "compression"; +import methodOverride from "method-override"; const rootDir = Path.resolve(__dirname); diff --git a/packages/third-parties/formio/package.json b/packages/third-parties/formio/package.json index dec04842c37..b83f5250a97 100644 --- a/packages/third-parties/formio/package.json +++ b/packages/third-parties/formio/package.json @@ -32,6 +32,7 @@ "tslib": "2.2.0" }, "devDependencies": { + "@types/async": "3.2.12", "@tsed/common": "6.102.3", "@tsed/core": "6.102.3", "@tsed/di": "6.102.3", @@ -42,13 +43,9 @@ "mongoose": "^5.12.2" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/mongoose": "^6.102.3", "express": "^4.17.1", "formio": "^2.0.0", "mongodb": "*", "mongoose": "^5.12.2" } -} \ No newline at end of file +} diff --git a/packages/third-parties/formio/src/components/AlterTemplateExportSteps.ts b/packages/third-parties/formio/src/components/AlterTemplateExportSteps.ts index bf3cca5de94..f949cf6f960 100644 --- a/packages/third-parties/formio/src/components/AlterTemplateExportSteps.ts +++ b/packages/third-parties/formio/src/components/AlterTemplateExportSteps.ts @@ -7,8 +7,7 @@ import {AlterHook} from "../domain/AlterHook"; import {FormioSubmission} from "../domain/FormioModels"; import {FormioTemplate} from "../domain/FormioTemplate"; import {FormioDatabase} from "../services/FormioDatabase"; - -const async = require("async"); +import async from "async"; @Alter("templateExportSteps") export class AlterTemplateExportSteps implements AlterHook { diff --git a/packages/third-parties/formio/src/components/AlterTemplateImportSteps.ts b/packages/third-parties/formio/src/components/AlterTemplateImportSteps.ts index 35d5f4a67e4..b6ebed74e8a 100644 --- a/packages/third-parties/formio/src/components/AlterTemplateImportSteps.ts +++ b/packages/third-parties/formio/src/components/AlterTemplateImportSteps.ts @@ -5,8 +5,7 @@ import {AlterHook} from "../domain/AlterHook"; import {FormioSubmission} from "../domain/FormioModels"; import {FormioTemplate} from "../domain/FormioTemplate"; import {FormioDatabase} from "../services/FormioDatabase"; - -const async = require("async"); +import async from "async"; @Alter("templateImportSteps") export class AlterTemplateImportSteps implements AlterHook { diff --git a/packages/third-parties/formio/src/services/FormioService.ts b/packages/third-parties/formio/src/services/FormioService.ts index 84e092bea77..6b7d9130e8e 100644 --- a/packages/third-parties/formio/src/services/FormioService.ts +++ b/packages/third-parties/formio/src/services/FormioService.ts @@ -10,10 +10,12 @@ import {FormioSchemas} from "../domain/FormioModels"; import {FormioRouter} from "../domain/FormioRouter"; import {FormioTemplate} from "../domain/FormioTemplate"; import {FormioExportOptions} from "../domain/FormioTemplateUtil"; - -const createRouter = require("formio"); -const swagger = require("formio/src/util/swagger.js"); -const util = require("formio/src/util/util.js"); +// @ts-ignore +import createRouter from "formio"; +// @ts-ignore +import swagger from "formio/src/util/swagger.js"; +// @ts-ignore +import util from "formio/src/util/util.js"; @Injectable() export class FormioService { diff --git a/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts b/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts index 86c2eab4a2b..5ab85f7ef4a 100644 --- a/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts +++ b/packages/third-parties/formio/test/app/controllers/rest/VersionCtrl.ts @@ -8,7 +8,7 @@ export class VersionCtrl { .ContentType("application/json") .Schema(object().properties({name: string(), version: string()})) async get() { - const {name, version} = require("../../../../package.json"); + const {name, version} = await import("../../../../package.json"); return { name, version diff --git a/packages/third-parties/schema-formio/package.json b/packages/third-parties/schema-formio/package.json index cdfd8f5ab78..f919494b409 100644 --- a/packages/third-parties/schema-formio/package.json +++ b/packages/third-parties/schema-formio/package.json @@ -41,11 +41,8 @@ "@tsed/schema": "6.102.3" }, "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", "formiojs": ">=4.0.0", "lodash": ">=4.0.0", "moment": ">=2.0.0" } -} \ No newline at end of file +} diff --git a/packages/third-parties/seq/package.json b/packages/third-parties/seq/package.json index 11d8e8c3432..c937f84090a 100644 --- a/packages/third-parties/seq/package.json +++ b/packages/third-parties/seq/package.json @@ -36,13 +36,8 @@ "@tsed/common": "6.102.3", "@tsed/core": "6.102.3" }, - "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3" + "peerDependencies": {}, + "publishConfig": { + "dist-tag": "deprecated" } -} \ 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 a039d7df0e2..318b5772f11 100644 --- a/packages/third-parties/socketio-testing/package.json +++ b/packages/third-parties/socketio-testing/package.json @@ -27,10 +27,6 @@ "socket.io-client": "^4.1.2" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/socketio": "^6.102.3", "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 fbb9ce2e189..46b5f5623a4 100644 --- a/packages/third-parties/socketio/package.json +++ b/packages/third-parties/socketio/package.json @@ -41,13 +41,6 @@ "socket.io-client": "^4.1.2" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/logger": ">=6.0.2", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", "socket.io": ">=4.0.0" } -} \ No newline at end of file +} diff --git a/packages/third-parties/stripe/package.json b/packages/third-parties/stripe/package.json index ffcc65737e7..cec2cf509dc 100644 --- a/packages/third-parties/stripe/package.json +++ b/packages/third-parties/stripe/package.json @@ -40,14 +40,7 @@ "stripe": "^8.129.0" }, "peerDependencies": { - "@tsed/common": "^6.102.3", - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/json-mapper": "^6.102.3", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3", - "@types/body-parser": "^1.19.0", "body-parser": "^1.19.0", "stripe": "^8.129.0" } -} \ No newline at end of file +} diff --git a/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts b/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts index 86c2eab4a2b..5ab85f7ef4a 100644 --- a/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts +++ b/packages/third-parties/stripe/test/app/controllers/rest/VersionCtrl.ts @@ -8,7 +8,7 @@ export class VersionCtrl { .ContentType("application/json") .Schema(object().properties({name: string(), version: string()})) async get() { - const {name, version} = require("../../../../package.json"); + const {name, version} = await import("../../../../package.json"); return { name, version diff --git a/packages/third-parties/terminus/package.json b/packages/third-parties/terminus/package.json index 43ef2907b27..b0d7e2c0065 100644 --- a/packages/third-parties/terminus/package.json +++ b/packages/third-parties/terminus/package.json @@ -29,10 +29,5 @@ "@tsed/openspec": "6.102.3", "@tsed/schema": "6.102.3" }, - "peerDependencies": { - "@tsed/core": "^6.102.3", - "@tsed/di": "^6.102.3", - "@tsed/openspec": "^6.102.3", - "@tsed/schema": "^6.102.3" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/utils/components-scan/package.json b/packages/utils/components-scan/package.json index 3f1d3277954..9a118e2a3a3 100644 --- a/packages/utils/components-scan/package.json +++ b/packages/utils/components-scan/package.json @@ -24,11 +24,9 @@ "tslib": "2.2.0" }, "devDependencies": { + "@types/normalize-path": "^3.0.0", "@tsed/core": "6.102.3", "@tsed/di": "6.102.3" }, - "peerDependencies": { - "@tsed/core": ">=6.102.1", - "@tsed/di": ">=6.102.1" - } -} \ No newline at end of file + "peerDependencies": {} +} diff --git a/packages/utils/components-scan/src/normalizePath.ts b/packages/utils/components-scan/src/normalizePath.ts index fe5916d0e85..117d03f1a44 100644 --- a/packages/utils/components-scan/src/normalizePath.ts +++ b/packages/utils/components-scan/src/normalizePath.ts @@ -1,7 +1,6 @@ import {isArray, isString} from "@tsed/core"; import {join} from "path"; - -const fixPath = require("normalize-path"); +import fixPath from "normalize-path"; export function normalizePath(item: string, ...paths: string[]): string; export function normalizePath(item: (string | any)[]): (string | any)[]; diff --git a/yarn.lock b/yarn.lock index 532032d580c..2c26525abef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3494,7 +3494,7 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== -"@tsed/engines@^1.1.5": +"@tsed/engines@>=1.1.5": version "1.1.5" resolved "https://registry.yarnpkg.com/@tsed/engines/-/engines-1.1.5.tgz#1d8fcf5859e665b6ccf8f0db6357612e5aafaf19" integrity sha512-7nx0AdoNOSwpLWkhIq771JZPHLHsERXR+y9ivbYiNjN9qDMWxXFhFKUjwP3TT6mpVHJBulHV0esKqubr88u2nQ== @@ -3572,6 +3572,11 @@ dependencies: "@types/node" "*" +"@types/async@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@types/async/-/async-3.2.12.tgz#0ebbfaf3f249ffa0fdc50179b07705f69c90d70c" + integrity sha512-4i4w4tfNDo73BOjk0qHcB2YJ8A2SjITCrU4BTsgdJFTsVr6atPDXa0T9r0QZTrX3axtWwkqpZqF4B3gR0TqBGw== + "@types/aws-lambda@*", "@types/aws-lambda@^8.10.56": version "8.10.85" resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.85.tgz#26cd76897b1972247cbc1a34b6f21d023e987437" @@ -3770,6 +3775,11 @@ resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ== +"@types/ejs@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.0.tgz#ab8109208106b5e764e5a6c92b2ba1c625b73020" + integrity sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA== + "@types/encodeurl@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/encodeurl/-/encodeurl-1.0.0.tgz#b811667d62e53d01adc4bbbfc3b5a1ad99b4738a" @@ -4170,6 +4180,11 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/normalize-path@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/normalize-path/-/normalize-path-3.0.0.tgz#bb5c46cab77b93350b4cf8d7ff1153f47189ae31" + integrity sha512-Nd8y/5t/7CRakPYiyPzr/IAfYusy1FkcZYFEAcoMZkwpJv2n4Wm+olW+e7xBdHEXhOnWdG9ddbar0gqZWS4x5Q== + "@types/oidc-provider@^7.1.1": version "7.1.1" resolved "https://registry.yarnpkg.com/@types/oidc-provider/-/oidc-provider-7.1.1.tgz#13a0ee38ab43c7c7bca93bc5afbb33bbdbe317fd" @@ -4177,6 +4192,13 @@ dependencies: "@types/koa" "*" +"@types/on-finished@2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@types/on-finished/-/on-finished-2.3.1.tgz#4537f9f2b47b3ba0b92c14a4bcc0f755aeda3484" + integrity sha512-mzVYaYcFs5Jd2n/O6uYIRUsFRR1cHyZLRvkLCU0E7+G5WhY0qBDAR5fUCeZbvecYOSh9ikhlesyi2UfI8B9ckQ== + dependencies: + "@types/node" "*" + "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -4333,6 +4355,11 @@ dependencies: "@types/superagent" "*" +"@types/swagger-ui-dist@3.30.1": + version "3.30.1" + resolved "https://registry.yarnpkg.com/@types/swagger-ui-dist/-/swagger-ui-dist-3.30.1.tgz#8ad3370dfce23bf73144bd9c5560afe2b5ccbd18" + integrity sha512-wWojDensMF33dSrhak4iWSPOsWBbvf+rSJ6VWQ7ohQbGdKAiT2IwUexrDZkMvf3+vVAPVnNFDRDtxADFszbh+Q== + "@types/tmp@^0.2.2": version "0.2.2" resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.2.tgz#424537a3b91828cb26aaf697f21ae3cd1b69f7e7"