More cleanup

code/lib/cli/src/add.ts

@@ -1,4 +1,11 @@
-import { getStorybookInfo, serverRequire, getStorybookVersion, isCorePackage, JsPackageManagerFactory, type PackageManagerName } from '@storybook/core-common';
+import {
+  getStorybookInfo,
+  serverRequire,
+  getStorybookVersion,
+  isCorePackage,
+  JsPackageManagerFactory,
+  type PackageManagerName,
+} from '@storybook/core-common';
 import { readConfig, writeConfig } from '@storybook/csf-tools';
 import { isAbsolute, join } from 'path';
 import SemVer from 'semver';

code/lib/cli/src/automigrate/helpers/eslintPlugin.ts

@@ -1,12 +1,12 @@
 import fse, { readFile, readJson, writeJson } from 'fs-extra';
-
 import { dedent } from 'ts-dedent';
 import detectIndent from 'detect-indent';
-import { readConfig, writeConfig } from '@storybook/csf-tools';
 import prompts from 'prompts';
 import chalk from 'chalk';
+
+import { readConfig, writeConfig } from '@storybook/csf-tools';
 import type { JsPackageManager } from '@storybook/core-common';
-import { paddedLog } from '../../helpers';
+import { paddedLog } from '@storybook/core-common';
 
 export const SUPPORTED_ESLINT_EXTENSIONS = ['js', 'cjs', 'json'];
 const UNSUPPORTED_ESLINT_EXTENSIONS = ['yaml', 'yml'];

code/lib/cli/src/automigrate/helpers/getMigrationSummary.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, vi, it } from 'vitest';
 import { getMigrationSummary } from './getMigrationSummary';
 import { FixStatus } from '../types';
-import type { InstallationMetadata } from '../../js-package-manager/types';
+import type { InstallationMetadata } from '@storybook/core-common';
 
 vi.mock('boxen', () => ({
   default: vi.fn((str, { title = '' }) => `${title}\n\n${str.replace(/\x1b\[[0-9;]*[mG]/g, '')}`),

code/lib/cli/src/automigrate/helpers/getMigrationSummary.ts

@@ -1,9 +1,9 @@
 import chalk from 'chalk';
 import boxen from 'boxen';
 import dedent from 'ts-dedent';
+import type { InstallationMetadata } from '@storybook/core-common';
 import type { FixSummary } from '../types';
 import { FixStatus } from '../types';
-import type { InstallationMetadata } from '../../js-package-manager/types';
 import { getDuplicatedDepsWarnings } from '../../doctor/getDuplicatedDepsWarnings';
 
 export const messageDivider = '\n\n';

code/lib/cli/src/automigrate/helpers/mainConfigFile.ts

@@ -11,7 +11,8 @@ import { readConfig, writeConfig as writeConfigFile } from '@storybook/csf-tools
 import chalk from 'chalk';
 import dedent from 'ts-dedent';
 import path from 'path';
-import type { getStorybookVersion, JsPackageManager } from '@storybook/core-common';
+import type { JsPackageManager } from '@storybook/core-common';
+import { getStorybookVersion } from '@storybook/core-common';
 
 const logger = console;
 

code/lib/cli/src/automigrate/index.ts

@@ -7,8 +7,12 @@ import dedent from 'ts-dedent';
 import { join } from 'path';
 import invariant from 'tiny-invariant';
 
-import { getStorybookInfo, loadMainConfig, getStorybookVersion, JsPackageManagerFactory } from '@storybook/core-common';
-import {  } from '@storybook/core-common';
+import {
+  getStorybookInfo,
+  loadMainConfig,
+  getStorybookVersion,
+  JsPackageManagerFactory,
+} from '@storybook/core-common';
 import type { PackageManagerName } from '@storybook/core-common';
 
 import type { Fix, FixId, FixOptions, FixSummary } from './fixes';

code/lib/cli/src/detect.ts

@@ -13,9 +13,9 @@ import {
   unsupportedTemplate,
   CoreBuilder,
 } from './project_types';
-import { commandLog, isNxProject } from './helpers';
+import { isNxProject } from './helpers';
 import type { JsPackageManager, PackageJsonWithMaybeDeps } from '@storybook/core-common';
-import { HandledError } from './HandledError';
+import { commandLog, HandledError } from '@storybook/core-common';
 
 const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'];
 const webpackConfigFiles = ['webpack.config.js'];

code/lib/cli/src/doctor/getDuplicatedDepsWarnings.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { frameworkPackages, rendererPackages } from '@storybook/core-common';
+import type { InstallationMetadata } from '@storybook/core-common';
 import { hasMultipleVersions } from './hasMultipleVersions';
-import type { InstallationMetadata } from '../js-package-manager/types';
 
 export const messageDivider = '\n\n';
 

code/lib/cli/src/doctor/getMismatchingVersionsWarning.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import semver from 'semver';
-import { frameworkPackages,   versions as storybookCorePackages } from '@storybook/core-common';
+import { frameworkPackages, versions as storybookCorePackages } from '@storybook/core-common';
 import type { InstallationMetadata } from '@storybook/core-common';
 
 function getPrimaryVersion(name: string | undefined, installationMetadata?: InstallationMetadata) {

code/lib/cli/src/generators/ANGULAR/index.ts

@@ -1,10 +1,11 @@
 import { join } from 'path';
+import { paddedLog } from '@storybook/core-common';
 import { baseGenerator } from '../baseGenerator';
 import type { Generator } from '../types';
 import { CoreBuilder } from '../../project_types';
 import { AngularJSON, compoDocPreviewPrefix, promptForCompoDocs } from './helpers';
 import { getCliDir } from '../../dirs';
-import { paddedLog, copyTemplate } from '../../helpers';
+import { copyTemplate } from '../../helpers';
 
 const generator: Generator<{ projectName: string }> = async (
   packageManager,

code/lib/cli/src/generators/baseGenerator.ts

@@ -4,7 +4,7 @@ import { dedent } from 'ts-dedent';
 import ora from 'ora';
 import invariant from 'tiny-invariant';
 import type { JsPackageManager } from '@storybook/core-common';
-import { getPackageDetails, versions as packageVersions  } from '@storybook/core-common';
+import { getPackageDetails, versions as packageVersions } from '@storybook/core-common';
 import type { NpmOptions } from '../NpmOptions';
 import type { SupportedRenderers, SupportedFrameworks, Builder } from '../project_types';
 import { SupportedLanguage, externalFrameworks } from '../project_types';

code/lib/cli/src/generators/types.ts

@@ -1,6 +1,6 @@
 import type { NpmOptions } from '../NpmOptions';
 import type { SupportedLanguage, Builder, ProjectType } from '../project_types';
-import type { JsPackageManager, PackageManagerName } from '../js-package-manager/JsPackageManager';
+import type { JsPackageManager, PackageManagerName } from '@storybook/core-common';
 import type { FrameworkPreviewParts } from './configure';
 
 export type GeneratorOptions = {

code/lib/cli/src/helpers.ts

@@ -15,7 +15,7 @@ import type {
 } from '@storybook/core-common';
 import type { SupportedFrameworks, SupportedRenderers } from './project_types';
 import { SupportedLanguage } from './project_types';
-import {versions as storybookMonorepoPackages} from '@storybook/core-common';
+import { versions as storybookMonorepoPackages } from '@storybook/core-common';
 
 const logger = console;
 
@@ -46,68 +46,6 @@ export const writeFileAsJson = (jsonPath: string, content: unknown) => {
   return true;
 };
 
-export const commandLog = (message: string) => {
-  process.stdout.write(chalk.cyan(' • ') + message);
-
-  // Need `void` to be able to use this function in a then of a Promise<void>
-  return (errorMessage?: string | void, errorInfo?: string) => {
-    if (errorMessage) {
-      process.stdout.write(`. ${chalk.red('✖')}\n`);
-      logger.error(`\n     ${chalk.red(errorMessage)}`);
-
-      if (!errorInfo) {
-        return;
-      }
-
-      const newErrorInfo = errorInfo
-        .split('\n')
-        .map((line) => `     ${chalk.dim(line)}`)
-        .join('\n');
-      logger.error(`${newErrorInfo}\n`);
-      return;
-    }
-
-    process.stdout.write(`. ${chalk.green('✓')}\n`);
-  };
-};
-
-export function paddedLog(message: string) {
-  const newMessage = message
-    .split('\n')
-    .map((line) => `    ${line}`)
-    .join('\n');
-
-  logger.log(newMessage);
-}
-
-export function getChars(char: string, amount: number) {
-  let line = '';
-  for (let lc = 0; lc < amount; lc += 1) {
-    line += char;
-  }
-
-  return line;
-}
-
-export function codeLog(codeLines: string[], leftPadAmount?: number) {
-  let maxLength = 0;
-  const newLines = codeLines.map((line) => {
-    maxLength = line.length > maxLength ? line.length : maxLength;
-    return line;
-  });
-
-  const finalResult = newLines
-    .map((line) => {
-      const rightPadAmount = maxLength - line.length;
-      let newLine = line + getChars(' ', rightPadAmount);
-      newLine = getChars(' ', leftPadAmount || 2) + chalk.inverse(` ${newLine} `);
-      return newLine;
-    })
-    .join('\n');
-
-  logger.log(finalResult);
-}
-
 /**
  * Detect if any babel dependencies need to be added to the project
  * This is currently used by react-native generator

code/lib/cli/src/initiate.ts

@@ -4,14 +4,22 @@ import prompts from 'prompts';
 import { telemetry } from '@storybook/telemetry';
 import { withTelemetry } from '@storybook/core-server';
 import { NxProjectDetectedError } from '@storybook/core-events/server-errors';
+import {
+  versions,
+  HandledError,
+  JsPackageManagerFactory,
+  commandLog,
+  codeLog,
+  paddedLog,
+} from '@storybook/core-common';
+import type { JsPackageManager } from '@storybook/core-common';
 
 import dedent from 'ts-dedent';
 import boxen from 'boxen';
 import { lt, prerelease } from 'semver';
 import type { Builder } from './project_types';
 import { installableProjectTypes, ProjectType } from './project_types';
 import { detect, isStorybookInstantiated, detectLanguage, detectPnp } from './detect';
-import { commandLog, codeLog, paddedLog } from './helpers';
 import angularGenerator from './generators/ANGULAR';
 import emberGenerator from './generators/EMBER';
 import reactGenerator from './generators/REACT';
@@ -28,13 +36,9 @@ import qwikGenerator from './generators/QWIK';
 import svelteKitGenerator from './generators/SVELTEKIT';
 import solidGenerator from './generators/SOLID';
 import serverGenerator from './generators/SERVER';
-import type { JsPackageManager } from '@storybook/core-common';
-import { JsPackageManagerFactory } from '@storybook/core-common';
 import type { NpmOptions } from './NpmOptions';
 import type { CommandOptions, GeneratorOptions } from './generators/types';
-import { HandledError } from './HandledError';
 import { currentDirectoryIsEmpty, scaffoldNewProject } from './scaffold-new-project';
-import { versions } from '@storybook/core-common';
 
 const logger = console;
 

code/lib/cli/src/upgrade.test.ts

@@ -6,11 +6,11 @@ import {
 } from '@storybook/core-events/server-errors';
 import { doUpgrade, getStorybookVersion } from './upgrade';
 
-import * as sbcc from '@storybook/core-common';
+import type * as sbcc from '@storybook/core-common';
 
 vi.mock('@storybook/telemetry');
 vi.mock('@storybook/core-common', async (importOriginal) => {
-  const originalModule = ((await importOriginal()) as typeof sbcc);
+  const originalModule = (await importOriginal()) as typeof sbcc;
   return {
     ...originalModule,
     versions: Object.keys(originalModule.versions).reduce(

code/lib/cli/src/upgrade.ts

@@ -12,10 +12,14 @@ import chalk from 'chalk';
 import dedent from 'ts-dedent';
 import boxen from 'boxen';
 import type { PackageManagerName } from '@storybook/core-common';
-import { JsPackageManagerFactory } from '@storybook/core-common';
-import { coerceSemver, commandLog } from './helpers';
+import {
+  JsPackageManagerFactory,
+  isCorePackage,
+  versions,
+  commandLog,
+} from '@storybook/core-common';
+import { coerceSemver } from './helpers';
 import { automigrate } from './automigrate';
-import { isCorePackage, versions } from '@storybook/core-common';
 
 type Package = {
   package: string;

code/lib/core-common/src/index.ts

@@ -14,6 +14,7 @@ export * from './utils/get-storybook-configuration';
 export * from './utils/get-storybook-info';
 export * from './utils/get-storybook-refs';
 export * from './utils/glob-to-regexp';
+export * from './utils/HandledError';
 export * from './utils/handlebars';
 export * from './utils/interpolate';
 export * from './utils/interpret-files';
@@ -22,6 +23,7 @@ export * from './utils/load-custom-presets';
 export * from './utils/load-main-config';
 export * from './utils/load-manager-or-addons-file';
 export * from './utils/load-preview-or-config-file';
+export * from './utils/log';
 export * from './utils/log-config';
 export * from './utils/normalize-stories';
 export * from './utils/paths';

code/lib/core-common/src/js-package-manager/JsPackageManager.ts

@@ -8,11 +8,11 @@ import fs from 'fs';
 import dedent from 'ts-dedent';
 import { readFile, writeFile, readFileSync } from 'fs-extra';
 import invariant from 'tiny-invariant';
-import { commandLog } from '../../../cli/src/helpers';
+import { commandLog } from '../utils/log';
 import type { PackageJson, PackageJsonWithDepsAndDevDeps } from './PackageJson';
 import storybookPackagesVersions from '../versions';
 import type { InstallationMetadata } from './types';
-import { HandledError } from '../../../cli/src/HandledError';
+import { HandledError } from '../utils/HandledError';
 
 const logger = console;
 

code/lib/core-common/src/js-package-manager/index.ts

@@ -1,4 +1,4 @@
 export * from './JsPackageManagerFactory';
 export * from './JsPackageManager';
 export * from './PackageJson';
-export * from './types';
+export * from './types';

code/lib/core-common/src/utils/log.ts

@@ -0,0 +1,65 @@
+import chalk from 'chalk';
+
+const logger = console;
+
+export const commandLog = (message: string) => {
+  process.stdout.write(chalk.cyan(' • ') + message);
+
+  // Need `void` to be able to use this function in a then of a Promise<void>
+  return (errorMessage?: string | void, errorInfo?: string) => {
+    if (errorMessage) {
+      process.stdout.write(`. ${chalk.red('✖')}\n`);
+      logger.error(`\n     ${chalk.red(errorMessage)}`);
+
+      if (!errorInfo) {
+        return;
+      }
+
+      const newErrorInfo = errorInfo
+        .split('\n')
+        .map((line) => `     ${chalk.dim(line)}`)
+        .join('\n');
+      logger.error(`${newErrorInfo}\n`);
+      return;
+    }
+
+    process.stdout.write(`. ${chalk.green('✓')}\n`);
+  };
+};
+
+export function paddedLog(message: string) {
+  const newMessage = message
+    .split('\n')
+    .map((line) => `    ${line}`)
+    .join('\n');
+
+  logger.log(newMessage);
+}
+
+export function getChars(char: string, amount: number) {
+  let line = '';
+  for (let lc = 0; lc < amount; lc += 1) {
+    line += char;
+  }
+
+  return line;
+}
+
+export function codeLog(codeLines: string[], leftPadAmount?: number) {
+  let maxLength = 0;
+  const newLines = codeLines.map((line) => {
+    maxLength = line.length > maxLength ? line.length : maxLength;
+    return line;
+  });
+
+  const finalResult = newLines
+    .map((line) => {
+      const rightPadAmount = maxLength - line.length;
+      let newLine = line + getChars(' ', rightPadAmount);
+      newLine = getChars(' ', leftPadAmount || 2) + chalk.inverse(` ${newLine} `);
+      return newLine;
+    })
+    .join('\n');
+
+  logger.log(finalResult);
+}