diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 40a5e0156..6695fb3bc 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -85,4 +85,4 @@ "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2" } -} +} \ No newline at end of file diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index caa1ea558..09a7c2fbe 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -17,7 +17,7 @@ import {ProjectPackageJson} from "./ProjectPackageJson"; // @ts-ignore import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt"; import {mapCommanderOptions} from "../utils/mapCommanderOptions"; -import {CommandMetadata} from "@tsed/cli-core"; +import {CommandMetadata} from "../interfaces/CommandMetadata"; Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt); diff --git a/packages/cli-core/src/utils/resolveConfiguration.ts b/packages/cli-core/src/utils/resolveConfiguration.ts index c710b5e09..385266af4 100644 --- a/packages/cli-core/src/utils/resolveConfiguration.ts +++ b/packages/cli-core/src/utils/resolveConfiguration.ts @@ -1,6 +1,6 @@ import {TokenProvider} from "@tsed/di"; -import {getCommandMetadata} from "@tsed/cli-core"; import {getValue} from "@tsed/core"; +import {getCommandMetadata} from "./getCommandMetadata"; export function resolveConfiguration(settings: any) { const argv = getValue(settings, "argv", process.argv); diff --git a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts index 2a6ac75c1..8f79c6ac4 100644 --- a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts +++ b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts @@ -94,7 +94,10 @@ export class GenerateHttpClientCmd implements CommandProvider { const {SwaggerService} = await importPackage("@tsed/swagger"); const platform: {injector: InjectorService; stop: () => Promise} = await Platform.bootstrap(this.serverModule, { - logger: {level: "off"} + logger: {level: "off"}, + mongoose: [], + redis: [], + ioredis: [] }); const swaggerService = platform.injector.get(SwaggerService)!; const confs = platform.injector.settings.get("swagger", []); diff --git a/packages/cli/src/Cli.ts b/packages/cli/src/Cli.ts index 0d5d26105..1f0316cff 100644 --- a/packages/cli/src/Cli.ts +++ b/packages/cli/src/Cli.ts @@ -68,17 +68,6 @@ export class Cli extends CliCore { return super.bootstrap(opts, Cli); } - // - // static async dispatch(cmd: "init", context: InitCmdContext): Promise; - // static async dispatch(cmd: "generate", context: GenerateCmdContext): Promise; - // static async dispatch(cmd: string, context: any) { - // this.createAliases(); - // - // const cli = await this.create({...Cli.defaults} as any, Cli); - // - // await cli.cliService.dispatch(cmd, context); - // } - static createAliases() { alias.addAliases({ "@tsed/core": require.resolve("@tsed/core"),