From 31322364491a0e3fc02e3509828caeb6a13a3551 Mon Sep 17 00:00:00 2001 From: MuhammadM1998 Date: Mon, 24 Jun 2024 12:43:04 +0300 Subject: [PATCH] fix: add 'prompt' argument to loadConfig --- packages/cli/src/commands/add.ts | 3 +-- packages/cli/src/commands/diff.ts | 8 ++------ packages/cli/src/commands/frameworks/vue/config.ts | 4 ++-- packages/cli/src/commands/init.ts | 6 +++++- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/cli/src/commands/add.ts b/packages/cli/src/commands/add.ts index df19029c..c9573c43 100644 --- a/packages/cli/src/commands/add.ts +++ b/packages/cli/src/commands/add.ts @@ -51,10 +51,9 @@ export const add = new Command() const { loadConfig, add } = frameworksCommands[framework] // Read config - const config = await loadConfig(cwd, options) + const config = await loadConfig(cwd, options, false) if (!config) { consola.warn(`Configuration is missing. Please run ${colors.green('init')} to create a components.json file.`) - process.exit(1) } diff --git a/packages/cli/src/commands/diff.ts b/packages/cli/src/commands/diff.ts index e6542936..74d84719 100644 --- a/packages/cli/src/commands/diff.ts +++ b/packages/cli/src/commands/diff.ts @@ -46,13 +46,9 @@ export const diff = new Command() const { loadConfig, diff } = frameworksCommands[framework] // Load Config - const config = await loadConfig(cwd, options) + const config = await loadConfig(cwd, options, false) if (!config) { - consola.warn( - `Configuration is missing. Please run ${colors.green( - 'init', - )} to create a components.json file.`, - ) + consola.warn(`Configuration is missing. Please run ${colors.green('init')} to create a components.json file.`) process.exit(1) } diff --git a/packages/cli/src/commands/frameworks/vue/config.ts b/packages/cli/src/commands/frameworks/vue/config.ts index 684138f5..0e484e9d 100644 --- a/packages/cli/src/commands/frameworks/vue/config.ts +++ b/packages/cli/src/commands/frameworks/vue/config.ts @@ -16,9 +16,9 @@ import { resolveConfigPaths, } from '../../../utils/get-config' -export default async function (cwd: string, options: { yes: boolean, cwd: string }) { +export default async function (cwd: string, options: { yes: boolean, cwd: string }, prompt: boolean) { const existingConfig = await getConfig(cwd) - return await promptForConfig(cwd, existingConfig, options.yes) + return prompt ? await promptForConfig(cwd, existingConfig, options.yes) : existingConfig } async function promptForConfig( diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 809306f1..53f5a232 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -40,7 +40,11 @@ export const init = new Command() const { loadConfig, init } = frameworksCommands[framework] // Read config - const config = await loadConfig(cwd, options) + const config = await loadConfig(cwd, options, true) + if (!config) { + consola.error(`Error loading config. Please run the ${colors.green('init')} command again.`) + process.exit(1) + } // Init await init(cwd, config)