diff --git a/packages/cli/src/lib/implementation/filter.middleware.unit.test.ts b/packages/cli/src/lib/implementation/filter.middleware.unit.test.ts index f1a1395f6..414b2c79e 100644 --- a/packages/cli/src/lib/implementation/filter.middleware.unit.test.ts +++ b/packages/cli/src/lib/implementation/filter.middleware.unit.test.ts @@ -291,7 +291,7 @@ describe('filterMiddleware', () => { ); it('should trigger verbose logging when skipPlugins or onlyPlugins removes categories', () => { - vi.stubEnv('CP_VERBOSE', 'true'); + logger.setVerbose(true); filterMiddleware({ onlyPlugins: ['p1'], diff --git a/packages/cli/src/lib/implementation/validate-filter-options.utils.ts b/packages/cli/src/lib/implementation/validate-filter-options.utils.ts index 839d44406..6586a0185 100644 --- a/packages/cli/src/lib/implementation/validate-filter-options.utils.ts +++ b/packages/cli/src/lib/implementation/validate-filter-options.utils.ts @@ -2,7 +2,6 @@ import type { PluginConfig } from '@code-pushup/models'; import { capitalize, filterItemRefsBy, - isVerbose, logger, pluralize, } from '@code-pushup/utils'; @@ -51,14 +50,14 @@ export function validateFilterOption( } logger.warn(message); } - if (skippedValidItems.length > 0 && isVerbose()) { + if (skippedValidItems.length > 0 && logger.isVerbose()) { const item = getItemType(option, skippedValidItems.length); const prefix = skippedValidItems.length === 1 ? `a skipped` : `skipped`; logger.warn( `The --${option} argument references ${prefix} ${item}: ${skippedValidItems.join(', ')}.`, ); } - if (isPluginOption(option) && categories.length > 0 && isVerbose()) { + if (isPluginOption(option) && categories.length > 0 && logger.isVerbose()) { const removedCategories = filterItemRefsBy(categories, ({ plugin }) => isOnlyOption(option) ? !itemsToFilterSet.has(plugin) @@ -82,7 +81,7 @@ export function validateSkippedCategories( const skippedCategories = originalCategories.filter( original => !filteredCategories.some(({ slug }) => slug === original.slug), ); - if (skippedCategories.length > 0 && isVerbose()) { + if (skippedCategories.length > 0 && logger.isVerbose()) { skippedCategories.forEach(category => { logger.info( `Category ${category.slug} was removed because all its refs were skipped. Affected refs: ${category.refs diff --git a/packages/cli/src/lib/implementation/validate-filter-options.utils.unit.test.ts b/packages/cli/src/lib/implementation/validate-filter-options.utils.unit.test.ts index 98d3e01ff..cbb5f0eb4 100644 --- a/packages/cli/src/lib/implementation/validate-filter-options.utils.unit.test.ts +++ b/packages/cli/src/lib/implementation/validate-filter-options.utils.unit.test.ts @@ -113,7 +113,7 @@ describe('validateFilterOption', () => { }); it('should log a category ignored as a result of plugin filtering', () => { - vi.stubEnv('CP_VERBOSE', 'true'); + logger.setVerbose(true); validateFilterOption( 'onlyPlugins', @@ -210,7 +210,7 @@ describe('validateFilterOption', () => { }); it('should log skipped items if verbose mode is enabled', () => { - vi.stubEnv('CP_VERBOSE', 'true'); + logger.setVerbose(true); const plugins = [ { slug: 'p1', audits: [{ slug: 'a1-p1' }] }, @@ -451,7 +451,7 @@ describe('validateSkippedCategories', () => { ] as NonNullable; it('should log info when categories are removed', () => { - vi.stubEnv('CP_VERBOSE', 'true'); + logger.setVerbose(true); validateSkippedCategories(categories, [ { diff --git a/packages/plugin-lighthouse/src/lib/runner/utils.unit.test.ts b/packages/plugin-lighthouse/src/lib/runner/utils.unit.test.ts index 42d63f027..4fd0bb555 100644 --- a/packages/plugin-lighthouse/src/lib/runner/utils.unit.test.ts +++ b/packages/plugin-lighthouse/src/lib/runner/utils.unit.test.ts @@ -1,4 +1,4 @@ -import { bold } from 'ansis'; +import ansis from 'ansis'; import debug from 'debug'; import log from 'lighthouse-logger'; import type Details from 'lighthouse/types/lhr/audit-details'; @@ -308,7 +308,7 @@ describe('toAuditOutputs', () => { { verbose: true }, ), ).toThrow( - `Audit ${bold('cumulative-layout-shift')} failed parsing details:`, + `Audit ${ansis.bold('cumulative-layout-shift')} failed parsing details:`, ); }); }); diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 173389de0..0dd6b322c 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -16,7 +16,6 @@ export { coerceBooleanValue, isCI, isEnvVarEnabled, - isVerbose, runnerArgsFromEnv, runnerArgsToEnv, } from './lib/env.js'; diff --git a/packages/utils/src/lib/env.ts b/packages/utils/src/lib/env.ts index f170c7332..c121773b2 100644 --- a/packages/utils/src/lib/env.ts +++ b/packages/utils/src/lib/env.ts @@ -11,10 +11,6 @@ export function isCI() { return isEnvVarEnabled('CI'); } -export function isVerbose() { - return isEnvVarEnabled('CP_VERBOSE'); -} - export function isEnvVarEnabled(name: string): boolean { const value = coerceBooleanValue(process.env[name]); diff --git a/testing/test-utils/src/lib/utils/test-folder-setup.unit.test.ts b/testing/test-utils/src/lib/utils/test-folder-setup.unit.test.ts index a205d23b5..58310bbb1 100644 --- a/testing/test-utils/src/lib/utils/test-folder-setup.unit.test.ts +++ b/testing/test-utils/src/lib/utils/test-folder-setup.unit.test.ts @@ -1,4 +1,4 @@ -import { bold } from 'ansis'; +import ansis from 'ansis'; import { vol } from 'memfs'; import { describe, expect, it, vi } from 'vitest'; import { MEMFS_VOLUME } from '@code-pushup/test-utils'; @@ -144,7 +144,7 @@ describe('teardownTestFolder', () => { '/tmp/unit': null, }); expect(warnSpy).toHaveBeenCalledWith( - `⚠️ You are trying to delete a file instead of a directory - ${bold('/tmp/unit/package.json')}.`, + `⚠️ You are trying to delete a file instead of a directory - ${ansis.bold('/tmp/unit/package.json')}.`, ); }); });