remove --use-npm flag from CLI

storybookjs · Jan 3, 2024 · d6d5c7a · d6d5c7a
1 parent bf06e6e
commit d6d5c7a
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 53 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -21,6 +21,8 @@
       - [Require Angular 15 and up](#require-angular-15-and-up)
     - [Svelte](#svelte)
       - [Require Svelte 4 and up](#require-svelte-4-and-up)
+  - [Deprecations which are now removed](#deprecations-which-are-now-removed)
+    - [--use-npm flag in storybook CLI](#--use-npm-flag-in-storybook-cli)
 - [From version 7.5.0 to 7.6.0](#from-version-750-to-760)
     - [CommonJS with Vite is deprecated](#commonjs-with-vite-is-deprecated)
     - [Using implicit actions during rendering is deprecated](#using-implicit-actions-during-rendering-is-deprecated)
@@ -507,6 +509,12 @@ Starting in 8.0, Storybook requires Angular 15 and up.
 
 Starting in 8.0, Storybook requires Svelte 4 and up.
 
+### Deprecations which are now removed
+
+#### --use-npm flag in storybook CLI
+
+The `--use-npm` is now removed. Use `--package-manager=npm` instead. [More info here](#cli-option---use-npm-deprecated).
+
 ## From version 7.5.0 to 7.6.0
 
 #### CommonJS with Vite is deprecated

diff --git a/code/lib/cli/src/add.ts b/code/lib/cli/src/add.ts
@@ -4,11 +4,7 @@ import { isAbsolute, join } from 'path';
 import SemVer from 'semver';
 import dedent from 'ts-dedent';
 
-import {
-  JsPackageManagerFactory,
-  useNpmWarning,
-  type PackageManagerName,
-} from './js-package-manager';
+import { JsPackageManagerFactory, type PackageManagerName } from './js-package-manager';
 import { getStorybookVersion, isCorePackage } from './utils';
 
 const logger = console;
@@ -71,13 +67,10 @@ const checkInstalled = (addonName: string, main: any) => {
  */
 export async function add(
   addon: string,
-  options: { useNpm: boolean; packageManager: PackageManagerName; skipPostinstall: boolean }
+  options: { packageManager: PackageManagerName; skipPostinstall: boolean }
 ) {
-  let { packageManager: pkgMgr } = options;
-  if (options.useNpm) {
-    useNpmWarning();
-    pkgMgr = 'npm';
-  }
+  const { packageManager: pkgMgr } = options;
+
   const packageManager = JsPackageManagerFactory.getPackageManager({ force: pkgMgr });
   const packageJson = await packageManager.retrievePackageJson();
   const { mainConfig, configDir } = getStorybookInfo(packageJson);

diff --git a/code/lib/cli/src/automigrate/index.ts b/code/lib/cli/src/automigrate/index.ts
@@ -9,7 +9,7 @@ import dedent from 'ts-dedent';
 import { join } from 'path';
 import { getStorybookInfo, loadMainConfig } from '@storybook/core-common';
 import invariant from 'tiny-invariant';
-import { JsPackageManagerFactory, useNpmWarning } from '../js-package-manager';
+import { JsPackageManagerFactory } from '../js-package-manager';
 import type { PackageManagerName } from '../js-package-manager';
 
 import type { Fix, FixId, FixOptions, FixSummary } from './fixes';
@@ -55,7 +55,6 @@ export const automigrate = async ({
   fixes: inputFixes,
   dryRun,
   yes,
-  useNpm,
   packageManager: pkgMgr,
   list,
   configDir: userSpecifiedConfigDir,
@@ -86,7 +85,6 @@ export const automigrate = async ({
 
   const { fixResults, fixSummary, preCheckFailure } = await runFixes({
     fixes,
-    useNpm,
     pkgMgr,
     userSpecifiedConfigDir,
     rendererPackage,
@@ -129,7 +127,6 @@ export async function runFixes({
   fixes,
   dryRun,
   yes,
-  useNpm,
   pkgMgr,
   userSpecifiedConfigDir,
   rendererPackage,
@@ -138,7 +135,6 @@ export async function runFixes({
   fixes: Fix[];
   yes?: boolean;
   dryRun?: boolean;
-  useNpm?: boolean;
   pkgMgr?: PackageManagerName;
   userSpecifiedConfigDir?: string;
   rendererPackage?: string;
@@ -148,12 +144,6 @@ export async function runFixes({
   fixResults: Record<FixId, FixStatus>;
   fixSummary: FixSummary;
 }> {
-  if (useNpm) {
-    useNpmWarning();
-    // eslint-disable-next-line no-param-reassign
-    pkgMgr = 'npm';
-  }
-
   const packageManager = JsPackageManagerFactory.getPackageManager({ force: pkgMgr });
 
   const fixResults = {} as Record<FixId, FixStatus>;

diff --git a/code/lib/cli/src/automigrate/types.ts b/code/lib/cli/src/automigrate/types.ts
@@ -41,7 +41,6 @@ export interface FixOptions {
   fixes?: Fix[];
   yes?: boolean;
   dryRun?: boolean;
-  useNpm?: boolean;
   packageManager?: PackageManagerName;
   configDir?: string;
   renderer?: string;

diff --git a/code/lib/cli/src/generate.ts b/code/lib/cli/src/generate.ts
@@ -48,7 +48,6 @@ command('init')
   .option('-f --force', 'Force add Storybook')
   .option('-s --skip-install', 'Skip installing deps')
   .option('--package-manager <npm|pnpm|yarn1|yarn2>', 'Force package manager for installing deps')
-  .option('-N --use-npm', 'Use npm to install deps (deprecated)')
   .option('--use-pnp', 'Enable pnp mode for Yarn 2+')
   .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')
   .option('-t --type <type>', 'Add Storybook for a specific project type')
@@ -65,7 +64,6 @@ command('add <addon>')
     '--package-manager <npm|pnpm|yarn1|yarn2>',
     'Force package manager for installing dependencies'
   )
-  .option('-N --use-npm', 'Use NPM to install dependencies (deprecated)')
   .option('-s --skip-postinstall', 'Skip package specific postinstall config modifications')
   .action((addonName: string, options: any) => add(addonName, options));
 
@@ -79,7 +77,6 @@ command('upgrade')
     '--package-manager <npm|pnpm|yarn1|yarn2>',
     'Force package manager for installing dependencies'
   )
-  .option('-N --use-npm', 'Use NPM to install dependencies (deprecated)')
   .option('-y --yes', 'Skip prompting the user')
   .option('-n --dry-run', 'Only check for upgrades, do not install')
   .option('-t --tag <tag>', 'Upgrade to a certain npm dist-tag (e.g. next, prerelease)')
@@ -167,7 +164,6 @@ command('automigrate [fixId]')
   .option('-y --yes', 'Skip prompting the user')
   .option('-n --dry-run', 'Only check for fixes, do not actually run them')
   .option('--package-manager <npm|pnpm|yarn1|yarn2>', 'Force package manager')
-  .option('-N --use-npm', 'Use npm as package manager (deprecated)')
   .option('-l --list', 'List available migrations')
   .option('-c, --config-dir <dir-name>', 'Directory of Storybook configurations to migrate')
   .option('-s --skip-install', 'Skip installing deps')

diff --git a/code/lib/cli/src/generators/types.ts b/code/lib/cli/src/generators/types.ts
@@ -41,7 +41,6 @@ export type Generator<T = void> = (
 
 export type CommandOptions = {
   packageManager: PackageManagerName;
-  useNpm?: boolean;
   usePnp?: boolean;
   type?: ProjectType;
   force?: any;

diff --git a/code/lib/cli/src/initiate.ts b/code/lib/cli/src/initiate.ts
@@ -29,7 +29,7 @@ import svelteKitGenerator from './generators/SVELTEKIT';
 import solidGenerator from './generators/SOLID';
 import serverGenerator from './generators/SERVER';
 import type { JsPackageManager } from './js-package-manager';
-import { JsPackageManagerFactory, useNpmWarning } from './js-package-manager';
+import { JsPackageManagerFactory } from './js-package-manager';
 import type { NpmOptions } from './NpmOptions';
 import type { CommandOptions, GeneratorOptions } from './generators/types';
 import { HandledError } from './HandledError';
@@ -235,12 +235,7 @@ async function doInitiate(
     }
   | { shouldRunDev: false }
 > {
-  let { packageManager: pkgMgr } = options;
-  if (options.useNpm) {
-    useNpmWarning();
-
-    pkgMgr = 'npm';
-  }
+  const { packageManager: pkgMgr } = options;
 
   const packageManager = JsPackageManagerFactory.getPackageManager({
     force: pkgMgr,

diff --git a/code/lib/cli/src/js-package-manager/deprecations.ts b/code/lib/cli/src/js-package-manager/deprecations.ts
diff --git a/code/lib/cli/src/js-package-manager/index.ts b/code/lib/cli/src/js-package-manager/index.ts
@@ -1,5 +1,3 @@
-export * from './deprecations';
-
 export * from './JsPackageManagerFactory';
 
 export * from './JsPackageManager';

diff --git a/code/lib/cli/src/upgrade.ts b/code/lib/cli/src/upgrade.ts
@@ -5,7 +5,7 @@ import { logger } from '@storybook/node-logger';
 import { withTelemetry } from '@storybook/core-server';
 
 import type { PackageJsonWithMaybeDeps, PackageManagerName } from './js-package-manager';
-import { getPackageDetails, JsPackageManagerFactory, useNpmWarning } from './js-package-manager';
+import { getPackageDetails, JsPackageManagerFactory } from './js-package-manager';
 import { coerceSemver, commandLog } from './helpers';
 import { automigrate } from './automigrate';
 import { isCorePackage } from './utils';
@@ -135,7 +135,6 @@ export interface UpgradeOptions {
   tag: string;
   prerelease: boolean;
   skipCheck: boolean;
-  useNpm: boolean;
   packageManager: PackageManagerName;
   dryRun: boolean;
   yes: boolean;
@@ -147,18 +146,12 @@ export const doUpgrade = async ({
   tag,
   prerelease,
   skipCheck,
-  useNpm,
   packageManager: pkgMgr,
   dryRun,
   configDir,
   yes,
   ...options
 }: UpgradeOptions) => {
-  if (useNpm) {
-    useNpmWarning();
-    // eslint-disable-next-line no-param-reassign
-    pkgMgr = 'npm';
-  }
   const packageManager = JsPackageManagerFactory.getPackageManager({ force: pkgMgr });
 
   const beforeVersion = await getStorybookCoreVersion();