Merge pull request umijs#644 from umijs/fix/local-state-detect-in-yarn

fix(umi): local debug state for umi -v is wrong if it's installed via yarn
wangxue16292016 · Jun 20, 2018 · 2907928 · 2907928
2 parents f2d18b9 + c1e4dce
commit 2907928
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/packages/umi/.local b/packages/umi/.local
@@ -0,0 +1 @@
+Used in bin/umi.js to determine if it is in the local debug state.
diff --git a/packages/umi/bin/umi.js b/packages/umi/bin/umi.js
@@ -2,6 +2,8 @@
 
 const spawn = require('cross-spawn');
 const chalk = require('chalk');
+const { join } = require('path');
+const { existsSync } = require('fs');
 
 const script = process.argv[2];
 const args = process.argv.slice(3);
@@ -43,8 +45,7 @@ switch (aliasedScript) {
   case '-v':
   case '--version':
     console.log(pkg.version);
-    // TODO: support yarn
-    if (!(pkg._from && pkg._resolved)) {
+    if (existsSync(join(__dirname, '../.local'))) {
       console.log(chalk.cyan('@local'));
     }
     break;

diff --git a/packages/umi/template/page.css b/packages/umi/template/page.css
diff --git a/packages/umi/template/page.js b/packages/umi/template/page.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Used in bin/umi.js to determine if it is in the local debug state.