Merge branch 'master' into addon-knobs-performance

addons/actions/package.json

@@ -25,7 +25,7 @@
     "deep-equal": "^1.0.1",
     "json-stringify-safe": "^5.0.1",
     "prop-types": "^15.5.8",
-    "react-inspector": "^2.0.0",
+    "react-inspector": "^2.1.1",
     "uuid": "^3.1.0"
   },
   "devDependencies": {

addons/knobs/README.md

@@ -229,6 +229,17 @@ const defaultValue = new Date('Jan 20 2017');
 const value = date(label, defaultValue);
 ```
 
+### withKnobs vs withKnobsOptions
+
+If you feel like this addon is not performing well enough there is an option to use `withKnobsOptions` instead of `withKnobs`.
+Usage:
+```
+story.addDecorator(withKnobsOptions({
+   debounce: { wait: number, leading: boolean}, // Same as lodash debounce.
+   timestamps: true // Doesn't emit events while user is typing.
+}));
+```
+
 ## Typescript
 
 If you are using typescript, make sure you have the type definitions installed for the following libs:

app/react/package.json

@@ -67,7 +67,7 @@
     "url-loader": "^0.5.8",
     "util-deprecate": "^1.0.2",
     "uuid": "^3.0.1",
-    "webpack": "^2.5.1",
+    "webpack": "^2.5.1 || ^3.0.0",
     "webpack-dev-middleware": "^1.10.2",
     "webpack-hot-middleware": "^2.18.0"
   },