Merge pull request #3453 from Keraito/detect-yarn-lock

Change yarn detection
storybookjs · Apr 27, 2018 · dab6b17 · dab6b17
1 parent 8984572
commit dab6b17
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/cli/lib/has_yarn.js b/lib/cli/lib/has_yarn.js
@@ -1,6 +1,13 @@
 import { sync as spawnSync } from 'cross-spawn';
+import path from 'path';
+import fs from 'fs';
 
 export default function hasYarn() {
-  const result = spawnSync('yarn', ['--version'], { silent: true });
-  return result.status === 0;
+  const yarnAvailable = spawnSync('yarn', ['--version'], { silent: true });
+  const npmAvailable = spawnSync('npm', ['--version'], { silent: true });
+  const yarnLockPath = path.resolve('yarn.lock');
+  if ((fs.existsSync(yarnLockPath) || npmAvailable.status !== 0) && yarnAvailable.status === 0) {
+    return true;
+  }
+  return false;
 }