From a1ba0a09cdd8b36dc10e70a47bddde8c1ba63f99 Mon Sep 17 00:00:00 2001 From: rudxDe Date: Sat, 19 Mar 2022 23:58:41 +0100 Subject: [PATCH] feat(lerna-dockerize): add init command to main cli #269 --- packages/init/package.json | 6 +++--- packages/init/src/bin.ts | 18 +++++++++++------- packages/init/src/index.ts | 4 ++-- packages/lerna-dockerize/package.json | 1 + packages/lerna-dockerize/src/index.ts | 2 ++ 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/packages/init/package.json b/packages/init/package.json index 8e483cb9..1448ebbd 100644 --- a/packages/init/package.json +++ b/packages/init/package.json @@ -26,19 +26,19 @@ "lerna-dockerize-init": "./bin" }, "dependencies": { + "@lerna-dockerize/cli": "^0.8.4", + "@lerna-dockerize/logger": "^0.8.4", "chalk": "^5.0.0", "inquirer": "^8.2.0", "logform": "^2.2.0", "ora": "^6.0.1", - "winston": "^3.3.3", - "yargs": "^17.0.1" + "winston": "^3.3.3" }, "devDependencies": { "@types/inquirer": "^8.2.0", "@types/jasmine": "^4.0.0", "@types/node": "^17.0.17", "@types/npm-package-arg": "^6.1.0", - "@types/yargs": "^17.0.0", "@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/eslint-plugin-tslint": "^5.11.0", "@typescript-eslint/parser": "^4.22.0", diff --git a/packages/init/src/bin.ts b/packages/init/src/bin.ts index 2f79f199..565014de 100644 --- a/packages/init/src/bin.ts +++ b/packages/init/src/bin.ts @@ -1,8 +1,12 @@ -import yargs from 'yargs'; -import { command } from '.'; +import { initCommand } from '.'; +import { getLogger } from '@lerna-dockerize/logger'; +import { cli } from '@lerna-dockerize/cli'; -yargs - .wrap(process.stdout.columns) - .command(command) - .demandCommand() - .argv; + +cli([ + initCommand, +]) + .catch(err => { + getLogger().error(err); + process.exit(1); + }); diff --git a/packages/init/src/index.ts b/packages/init/src/index.ts index 5cc83c6e..5b294cec 100644 --- a/packages/init/src/index.ts +++ b/packages/init/src/index.ts @@ -1,8 +1,8 @@ -import type { CommandModule } from 'yargs'; +import type { CommandModule } from '@lerna-dockerize/cli'; import { IInitArgs } from './args'; -export const command: CommandModule<{}, IInitArgs> = { +export const initCommand: CommandModule<{}, IInitArgs> = { command: 'init', describe: 'Initialize lerna-dockerize in your project', builder: { diff --git a/packages/lerna-dockerize/package.json b/packages/lerna-dockerize/package.json index ab9dffce..5670683e 100644 --- a/packages/lerna-dockerize/package.json +++ b/packages/lerna-dockerize/package.json @@ -27,6 +27,7 @@ }, "dependencies": { "@lerna-dockerize/generate": "0.8.4", + "@lerna-dockerize/init": "0.8.4", "@lerna-dockerize/logger": "0.8.4", "@lerna-dockerize/cli": "0.8.4" }, diff --git a/packages/lerna-dockerize/src/index.ts b/packages/lerna-dockerize/src/index.ts index 657112b3..4a01726c 100644 --- a/packages/lerna-dockerize/src/index.ts +++ b/packages/lerna-dockerize/src/index.ts @@ -1,10 +1,12 @@ import { generateCommand } from '@lerna-dockerize/generate'; +import { initCommand } from '@lerna-dockerize/init'; import { getLogger } from '@lerna-dockerize/logger'; import { cli } from '@lerna-dockerize/cli'; cli([ generateCommand, + initCommand, ]) .catch(err => { getLogger().error(err);