From 8848d086789edfe8e260491a8548b9d60b662a18 Mon Sep 17 00:00:00 2001 From: Owen Flood Date: Mon, 10 Jul 2017 14:35:24 -0700 Subject: [PATCH 1/3] dont prompt if serve is already installed --- packages/react-dev-utils/package.json | 1 + packages/react-dev-utils/printHostingInstructions.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index b4539788d26..41ec422a448 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -41,6 +41,7 @@ "detect-port-alt": "1.1.3", "escape-string-regexp": "1.0.5", "filesize": "3.3.0", + "global-modules": "^1.0.0", "gzip-size": "3.0.0", "html-entities": "1.2.1", "inquirer": "3.1.1", diff --git a/packages/react-dev-utils/printHostingInstructions.js b/packages/react-dev-utils/printHostingInstructions.js index f9882d44a7c..a70c53c0d7f 100644 --- a/packages/react-dev-utils/printHostingInstructions.js +++ b/packages/react-dev-utils/printHostingInstructions.js @@ -11,6 +11,8 @@ const chalk = require('chalk'); const url = require('url'); +const modules = require('global-modules'); +const fs = require('fs'); function printHostingInstructions( appPackage, @@ -121,10 +123,12 @@ function printHostingInstructions( ); console.log('You may serve it with a static server:'); console.log(); - if (useYarn) { - console.log(` ${chalk.cyan('yarn')} global add serve`); - } else { - console.log(` ${chalk.cyan('npm')} install -g serve`); + if (!fs.existsSync(`${modules}/serve`)) { + if (useYarn) { + console.log(` ${chalk.cyan('yarn')} global add serve`); + } else { + console.log(` ${chalk.cyan('npm')} install -g serve`); + } } console.log(` ${chalk.cyan('serve')} -s ${buildFolder}`); console.log(); From d2a0d66d2aac461e8d6d3fd2f872729fc16a8fbf Mon Sep 17 00:00:00 2001 From: Owen Flood Date: Mon, 10 Jul 2017 15:10:53 -0700 Subject: [PATCH 2/3] change name for readability --- packages/react-dev-utils/printHostingInstructions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-dev-utils/printHostingInstructions.js b/packages/react-dev-utils/printHostingInstructions.js index a70c53c0d7f..2ef25767aa2 100644 --- a/packages/react-dev-utils/printHostingInstructions.js +++ b/packages/react-dev-utils/printHostingInstructions.js @@ -11,7 +11,7 @@ const chalk = require('chalk'); const url = require('url'); -const modules = require('global-modules'); +const globalModules = require('global-modules'); const fs = require('fs'); function printHostingInstructions( @@ -123,7 +123,7 @@ function printHostingInstructions( ); console.log('You may serve it with a static server:'); console.log(); - if (!fs.existsSync(`${modules}/serve`)) { + if (!fs.existsSync(`${globalModules}/serve`)) { if (useYarn) { console.log(` ${chalk.cyan('yarn')} global add serve`); } else { From ce8dcd38ac4a95f0bf53de46da35e4e0031b70a8 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 10 Jul 2017 23:40:44 +0100 Subject: [PATCH 3/3] Pin the version --- packages/react-dev-utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 41ec422a448..e09e990d0b7 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -41,7 +41,7 @@ "detect-port-alt": "1.1.3", "escape-string-regexp": "1.0.5", "filesize": "3.3.0", - "global-modules": "^1.0.0", + "global-modules": "1.0.0", "gzip-size": "3.0.0", "html-entities": "1.2.1", "inquirer": "3.1.1",