From 5b5c62e36bfa0e2ee21e10dad0ddaf8196edc78e Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@users.noreply.github.com>
Date: Tue, 21 Jun 2022 15:02:26 +0800
Subject: [PATCH] Merge pull request #18522 from
 storybookjs/actually-use-npm7-migration

CLI: Hook up the npm7 migration
---
 lib/cli/src/automigrate/fixes/index.ts     | 11 ++++++++++-
 lib/cli/src/js-package-manager/NPMProxy.ts | 11 +++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/cli/src/automigrate/fixes/index.ts b/lib/cli/src/automigrate/fixes/index.ts
index 8af1741b392..99b7adad37d 100644
--- a/lib/cli/src/automigrate/fixes/index.ts
+++ b/lib/cli/src/automigrate/fixes/index.ts
@@ -4,7 +4,16 @@ import { angular12 } from './angular12';
 import { mainjsFramework } from './mainjsFramework';
 import { eslintPlugin } from './eslint-plugin';
 import { builderVite } from './builder-vite';
+import { npm7 } from './npm7';
 import { Fix } from '../types';
 
 export * from '../types';
-export const fixes: Fix[] = [cra5, webpack5, angular12, mainjsFramework, eslintPlugin, builderVite];
+export const fixes: Fix[] = [
+  cra5,
+  webpack5,
+  angular12,
+  mainjsFramework,
+  eslintPlugin,
+  builderVite,
+  npm7,
+];
diff --git a/lib/cli/src/js-package-manager/NPMProxy.ts b/lib/cli/src/js-package-manager/NPMProxy.ts
index a75d7d2b69f..8f74cf57e44 100644
--- a/lib/cli/src/js-package-manager/NPMProxy.ts
+++ b/lib/cli/src/js-package-manager/NPMProxy.ts
@@ -23,10 +23,13 @@ export class NPMProxy extends JsPackageManager {
   }
 
   hasLegacyPeerDeps() {
-    return (
-      this.executeCommand('npm', ['config', 'get', 'legacy-peer-deps', '--location=project']) ===
-      'true'
-    );
+    const result = this.executeCommand('npm', [
+      'config',
+      'get',
+      'legacy-peer-deps',
+      '--location=project',
+    ]);
+    return result.trim() === 'true';
   }
 
   setLegacyPeerDeps() {