Use react-scripts dependency before publish

facebook · Oct 24, 2016 · ee9ca5e · ee9ca5e
1 parent 944fa46
commit ee9ca5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/react-dev-utils/BuildProgressPlugin.js b/packages/react-dev-utils/BuildProgressPlugin.js
@@ -9,7 +9,14 @@
 
 'use strict';
 
-const ProgressPlugin = require('webpack').ProgressPlugin;
+const path = require('path');
+
+let ProgressPlugin;
+if (__dirname.indexOf(path.join('packages', 'react-dev-utils')) !== -1) {
+  ProgressPlugin = require('../react-scripts/node_modules/webpack').ProgressPlugin;
+} else {
+  ProgressPlugin = require('webpack').ProgressPlugin;
+}
 const ProgressBar = require('progress');
 const chalk = require('chalk');
 
@@ -22,7 +29,7 @@ function BuildProgressPlugin() {
   })
   return new ProgressPlugin(function(percent, msg) {
     if (percent === 1) msg = 'completed';
-    bar.update(percent, { msg: msg });
+    bar.update(percent, { msg });
     if (percent === 1) bar.terminate();
   });
 }

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
@@ -29,7 +29,9 @@
     "opn": "4.0.2",
     "progress": "1.1.8",
     "sockjs-client": "1.0.3",
-    "strip-ansi": "3.0.1",
+    "strip-ansi": "3.0.1"
+  },
+  "peerDependencies": {
     "webpack": "^1.13.2"
   }
 }