From de09699ecccd2687d3ec4d697b32fc7c9cb26da5 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Thu, 30 Aug 2018 00:23:02 +0300 Subject: [PATCH] fix: log warning about --force only once --- packages/pnpm/src/main.ts | 7 +++++++ packages/supi/src/api/extendInstallOptions.ts | 6 ------ packages/supi/src/api/extendPruneOptions.ts | 6 ------ packages/supi/src/api/extendRebuildOptions.ts | 6 ------ packages/supi/src/api/extendStoreStatusOptions.ts | 6 ------ packages/supi/src/api/extendUninstallOptions.ts | 6 ------ 6 files changed, 7 insertions(+), 30 deletions(-) diff --git a/packages/pnpm/src/main.ts b/packages/pnpm/src/main.ts index ca850d9cf2..5b227ed416 100644 --- a/packages/pnpm/src/main.ts +++ b/packages/pnpm/src/main.ts @@ -151,6 +151,13 @@ export default async function run (argv: string[]) { // NOTE: we defer the next stage, otherwise reporter might not catch all the logs await new Promise((resolve, reject) => { setTimeout(() => { + if (opts.force === true) { + logger.warn({ + message: 'using --force I sure hope you know what you are doing', + prefix: opts.prefix, + }) + } + // `pnpm install ""` is going to be just `pnpm install` const cliArgs = cliConf.argv.remain.slice(1).filter(Boolean) try { diff --git a/packages/supi/src/api/extendInstallOptions.ts b/packages/supi/src/api/extendInstallOptions.ts index 71bd5827e6..bf0b4b0f95 100644 --- a/packages/supi/src/api/extendInstallOptions.ts +++ b/packages/supi/src/api/extendInstallOptions.ts @@ -181,12 +181,6 @@ export default async ( const defaultOpts = await defaults(opts) const extendedOpts = {...defaultOpts, ...opts, store: defaultOpts.store} if (!extendedOpts.reinstallForFlatten) { - if (extendedOpts.force) { - logger.warn({ - message: 'using --force I sure hope you know what you are doing', - prefix: extendedOpts.prefix, - }) - } if (extendedOpts.shamefullyFlatten) { logger.warn({ message: 'using --shamefully-flatten is discouraged, you should declare all of your dependencies in package.json', diff --git a/packages/supi/src/api/extendPruneOptions.ts b/packages/supi/src/api/extendPruneOptions.ts index 9f6a415e9a..df492f8b46 100644 --- a/packages/supi/src/api/extendPruneOptions.ts +++ b/packages/supi/src/api/extendPruneOptions.ts @@ -68,12 +68,6 @@ export default async ( } const defaultOpts = await defaults(opts) const extendedOpts = {...defaultOpts, ...opts, store: defaultOpts.store} - if (extendedOpts.force) { - logger.warn({ - message: 'using --force I sure hope you know what you are doing', - prefix: extendedOpts.prefix, - }) - } extendedOpts.registry = normalizeRegistryUrl(extendedOpts.registry) return extendedOpts } diff --git a/packages/supi/src/api/extendRebuildOptions.ts b/packages/supi/src/api/extendRebuildOptions.ts index 3dd460f904..bb916ae9fc 100644 --- a/packages/supi/src/api/extendRebuildOptions.ts +++ b/packages/supi/src/api/extendRebuildOptions.ts @@ -94,12 +94,6 @@ export default async ( } const defaultOpts = await defaults(opts) const extendedOpts = {...defaultOpts, ...opts, store: defaultOpts.store} - if (extendedOpts.force) { - logger.warn({ - message: 'using --force I sure hope you know what you are doing', - prefix: extendedOpts.prefix, - }) - } extendedOpts.registry = normalizeRegistryUrl(extendedOpts.registry) return extendedOpts } diff --git a/packages/supi/src/api/extendStoreStatusOptions.ts b/packages/supi/src/api/extendStoreStatusOptions.ts index 671844b8ae..7d83c31c62 100644 --- a/packages/supi/src/api/extendStoreStatusOptions.ts +++ b/packages/supi/src/api/extendStoreStatusOptions.ts @@ -60,12 +60,6 @@ export default async ( } const defaultOpts = await defaults(opts) const extendedOpts = {...defaultOpts, ...opts, store: defaultOpts.store} - if (extendedOpts.force) { - logger.warn({ - message: 'using --force I sure hope you know what you are doing', - prefix: extendedOpts.prefix, - }) - } extendedOpts.registry = normalizeRegistryUrl(extendedOpts.registry) return extendedOpts } diff --git a/packages/supi/src/api/extendUninstallOptions.ts b/packages/supi/src/api/extendUninstallOptions.ts index 17362193b3..cf881209e0 100644 --- a/packages/supi/src/api/extendUninstallOptions.ts +++ b/packages/supi/src/api/extendUninstallOptions.ts @@ -82,12 +82,6 @@ export default async ( } const defaultOpts = await defaults(opts) const extendedOpts = {...defaultOpts, ...opts, store: defaultOpts.store} - if (extendedOpts.force) { - logger.warn({ - message: 'using --force I sure hope you know what you are doing', - prefix: extendedOpts.prefix, - }) - } extendedOpts.registry = normalizeRegistryUrl(extendedOpts.registry) return extendedOpts }