Cleanup from cli to core-common migration

code/frameworks/angular/package.json

@@ -38,7 +38,6 @@
   },
   "dependencies": {
     "@storybook/builder-webpack5": "workspace:*",
-    "@storybook/cli": "workspace:*",
     "@storybook/client-logger": "workspace:*",
     "@storybook/core-common": "workspace:*",
     "@storybook/core-events": "workspace:*",

code/frameworks/angular/src/builders/build-storybook/index.spec.ts

@@ -19,7 +19,7 @@ const buildMock = {
 };
 
 vi.doMock('@storybook/core-server', () => buildMock);
-vi.doMock('@storybook/cli', () => ({
+vi.doMock('@storybook/core-common', () => ({
   JsPackageManagerFactory: {
     getPackageManager: () => ({
       runPackageCommand: mockRunScript,

code/frameworks/angular/src/builders/build-storybook/index.ts

@@ -15,7 +15,7 @@ import { sync as readUpSync } from 'read-pkg-up';
 import { BrowserBuilderOptions, StylePreprocessorOptions } from '@angular-devkit/build-angular';
 
 import { CLIOptions } from '@storybook/types';
-import { getEnvConfig, versions } from '@storybook/cli';
+import { getEnvConfig, versions } from '@storybook/core-common';
 import { addToGlobalContext } from '@storybook/telemetry';
 
 import { buildStaticStandalone, withTelemetry } from '@storybook/core-server';

code/frameworks/angular/src/builders/start-storybook/index.spec.ts

@@ -21,7 +21,7 @@ vi.doMock('find-up', () => ({ sync: () => './storybook/tsconfig.ts' }));
 
 const mockRunScript = vi.fn();
 
-vi.mock('@storybook/cli', () => ({
+vi.mock('@storybook/core-common', () => ({
   getEnvConfig: (options: any) => options,
   versions: {
     storybook: 'x.x.x',

code/frameworks/angular/src/builders/start-storybook/index.ts

@@ -14,7 +14,7 @@ import { sync as findUpSync } from 'find-up';
 import { sync as readUpSync } from 'read-pkg-up';
 
 import { CLIOptions } from '@storybook/types';
-import { getEnvConfig, versions } from '@storybook/cli';
+import { getEnvConfig, versions } from '@storybook/core-common';
 import { addToGlobalContext } from '@storybook/telemetry';
 import { buildDevStandalone, withTelemetry } from '@storybook/core-server';
 import {

code/frameworks/angular/src/builders/utils/run-compodoc.spec.ts

@@ -8,7 +8,7 @@ import { runCompodoc } from './run-compodoc';
 
 const mockRunScript = vi.fn();
 
-vi.mock('@storybook/cli', () => ({
+vi.mock('@storybook/core-common', () => ({
   JsPackageManagerFactory: {
     getPackageManager: () => ({
       runPackageCommandSync: mockRunScript,

code/frameworks/angular/src/builders/utils/run-compodoc.ts

@@ -1,7 +1,7 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { Observable } from 'rxjs';
 import * as path from 'path';
-import { JsPackageManagerFactory } from '@storybook/cli';
+import { JsPackageManagerFactory } from '@storybook/core-common';
 
 const hasTsConfigArg = (args: string[]) => args.indexOf('-p') !== -1;
 const hasOutputArg = (args: string[]) =>

code/lib/cli/src/generate.ts

@@ -3,11 +3,12 @@ import chalk from 'chalk';
 import envinfo from 'envinfo';
 import leven from 'leven';
 import { sync as readUpSync } from 'read-pkg-up';
+import invariant from 'tiny-invariant';
 
 import { logger } from '@storybook/node-logger';
 import { addToGlobalContext } from '@storybook/telemetry';
+import { parseList, getEnvConfig, JsPackageManagerFactory, versions } from '@storybook/core-common';
 
-import invariant from 'tiny-invariant';
 import type { CommandOptions } from './generators/types';
 import { initiate } from './initiate';
 import { add } from './add';
@@ -19,9 +20,6 @@ import { link } from './link';
 import { automigrate } from './automigrate';
 import { dev } from './dev';
 import { build } from './build';
-import { parseList, getEnvConfig } from '@storybook/core-common/src/cli';
-import {versions} from '@storybook/core-common';
-import { JsPackageManagerFactory } from '@storybook/core-common';
 import { doctor } from './doctor';
 
 addToGlobalContext('cliVersion', versions.storybook);

code/lib/cli/src/index.ts

@@ -1,6 +1,5 @@
-import { versions } from '@storybook/core-common';
+import { deprecate } from '@storybook/node-logger';
 
-export { versions };
-
-export * from '@storybook/core-common';
-export * from '@storybook/core-common/src/cli';
+deprecate(
+  'Exports from @storybook/cli are removed. Please import from @storybook/core-common instead.'
+);

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

@@ -3,7 +3,7 @@ import { move, remove, writeFile, readFile, createWriteStream } from 'fs-extra';
 import { join } from 'path';
 import tempy from 'tempy';
 import { rendererPackages } from './get-storybook-info';
-import { JsPackageManager } from '../js-package-manager';
+import type { JsPackageManager } from '../js-package-manager';
 
 export function parseList(str: string): string[] {
   return str

scripts/event-log-checker.ts

@@ -4,7 +4,7 @@ import assert from 'assert';
 import fetch from 'node-fetch';
 import { esMain } from './utils/esmain';
 import { allTemplates } from '../code/lib/cli/src/sandbox-templates';
-import versions from '../code/lib/cli/src/versions';
+import versions from '../code/lib/core-common/src/versions';
 import { oneWayHash } from '../code/lib/telemetry/src/one-way-hash';
 
 const PORT = process.env.PORT || 6007;

scripts/release/__tests__/version.test.ts

@@ -11,7 +11,7 @@ import type * as MockedFSToExtra from '../../../code/__mocks__/fs-extra';
 vi.mock('fs-extra', async () => import('../../../code/__mocks__/fs-extra'));
 const fsExtra = fsExtraImp as unknown as typeof MockedFSToExtra;
 
-vi.mock('../../../code/lib/cli/src/versions', () => ({
+vi.mock('../../../code/lib/core-common/src/versions', () => ({
   '@storybook/addon-a11y': '7.1.0-alpha.29',
 }));
 

scripts/tasks/sandbox-parts.ts

@@ -26,20 +26,20 @@ import {
 } from '../utils/yarn';
 import { exec } from '../utils/exec';
 import type { ConfigFile } from '../../code/lib/csf-tools';
-import storybookPackages from '../../code/lib/cli/src/versions';
+import storybookPackages from '../../code/lib/core-common/src/versions';
 import { writeConfig } from '../../code/lib/csf-tools';
 import { filterExistsInCodeDir } from '../utils/filterExistsInCodeDir';
 import { findFirstPath } from '../utils/paths';
 import { detectLanguage } from '../../code/lib/cli/src/detect';
 import { SupportedLanguage } from '../../code/lib/cli/src/project_types';
 import { updatePackageScripts } from '../utils/package-json';
 import { addPreviewAnnotations, readMainConfig } from '../utils/main-js';
-import { JsPackageManagerFactory } from '../../code/lib/cli/src/js-package-manager/JsPackageManagerFactory';
+import { JsPackageManagerFactory } from '../../code/lib/core-common/src/js-package-manager/JsPackageManagerFactory';
 import { workspacePath } from '../utils/workspace';
 import { babelParse } from '../../code/lib/csf-tools/src/babelParse';
 import { CODE_DIRECTORY, REPROS_DIRECTORY } from '../utils/constants';
 import type { TemplateKey } from '../../code/lib/cli/src/sandbox-templates';
-import type { JsPackageManager } from '../../code/lib/cli/src/js-package-manager';
+import type { JsPackageManager } from '../../code/lib/core-common/src/js-package-manager';
 
 const logger = console;
 

scripts/utils/yarn.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import type { TemplateKey } from 'get-template';
 import { exec } from './exec';
 // TODO -- should we generate this file a second time outside of CLI?
-import storybookVersions from '../../code/lib/cli/src/versions';
+import storybookVersions from '../../code/lib/core-common/src/versions';
 import touch from './touch';
 
 export type YarnOptions = {