Merge pull request #18522 from storybookjs/actually-use-npm7-migration

CLI: Hook up the npm7 migration
storybookjs · Jun 21, 2022 · 1edd3a6 · 1edd3a6
2 parents a3348bf + e17e0f0
commit 1edd3a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/cli/src/automigrate/fixes/index.ts b/lib/cli/src/automigrate/fixes/index.ts
@@ -5,6 +5,7 @@ import { vue3 } from './vue3';
 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';
@@ -16,4 +17,5 @@ export const fixes: Fix[] = [
   mainjsFramework,
   eslintPlugin,
   builderVite,
+  npm7,
 ];
diff --git 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() {