Merge branch 'next' into tech/overhaul-ui

# Conflicts: # addons/a11y/package.json # addons/actions/package.json # addons/backgrounds/package.json # addons/cssresources/package.json # addons/events/package.json # addons/google-analytics/package.json # addons/info/package.json # addons/jest/package.json # addons/knobs/package.json # addons/links/package.json # addons/notes/package.json # addons/storyshots/storyshots-core/package.json # addons/viewport/package.json # app/react/package.json # docs/package.json # docs/src/pages/configurations/theming/index.md # examples/cra-kitchen-sink/package.json # examples/official-storybook/package.json # examples/preact-kitchen-sink/package.json # lib/addons/package.json # lib/channel-websocket/package.json # lib/components/package.json # lib/core/package.json # lib/ui/package.json # yarn.lock
pgoforth · Dec 19, 2018 · f1d76a8 · f1d76a8
2 parents 0ddb2db + 03c4c0f
commit f1d76a8
Show file tree

Hide file tree

Showing 80 changed files with 1,083 additions and 3,485 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,32 @@
+## 4.2.0-alpha.5 (December 19, 2018)
+
+### Bug Fixes
+
+* React: Remove unnecessary dependencies, fix aliasing ([#5047](https://github.com/storybooks/storybook/pull/5047))
+
+### Dependency Upgrades
+
+* Bump @types/node from 10.12.14 to 10.12.17 ([#5045](https://github.com/storybooks/storybook/pull/5045))
+* Bump ember-source from 3.5.1 to 3.6.1 ([#5044](https://github.com/storybooks/storybook/pull/5044))
+
+## 4.2.0-alpha.4 (December 18, 2018)
+
+### Bug Fixes
+
+* React: fix alias for react(-dom) to resolve to the user's version ([#5042](https://github.com/storybooks/storybook/pull/5042))
+
+### Dependency Upgrades
+
+* Bump husky from 1.2.0 to 1.3.0 ([#5038](https://github.com/storybooks/storybook/pull/5038))
+* Bump fork-ts-checker-webpack-plugin from 0.4.15 to 0.5.2 ([#5037](https://github.com/storybooks/storybook/pull/5037))
+
+## 4.2.0-alpha.3 (December 18, 2018)
+
+### Bug Fixes
+
+* React: add alias to react & react-dom ([#5016](https://github.com/storybooks/storybook/pull/5016))
+* Addon-knobs: fix color picker display ([#5010](https://github.com/storybooks/storybook/pull/5010))
+
 ## 4.2.0-alpha.2 (December 16, 2018)
 
 ### Features

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -26,10 +26,10 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/client-logger": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/client-logger": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "axe-core": "^3.1.2",
     "core-js": "^2.5.7",
     "react": "^16.7.0-alpha.2",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -22,9 +22,9 @@
   "dependencies": {
     "@emotion/core": "^10.0.2",
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "emotion-theming": "^10.0.2",
     "fast-deep-equal": "^2.0.1",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -26,10 +26,10 @@
   "dependencies": {
     "@emotion/core": "^10.0.2",
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
-    "@storybook/client-logger": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
+    "@storybook/client-logger": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "eventemitter3": "^3.1.0",
     "global": "^4.3.2",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",

diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.2",

diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "react-ga": "^2.5.3"

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "A Storybook addon to show additional information for your stories.",
   "keywords": [
     "addon",
@@ -22,9 +22,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/client-logger": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/client-logger": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "marksy": "^6.1.0",

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",

diff --git a/addons/knobs/README.md b/addons/knobs/README.md
@@ -307,6 +307,34 @@ const defaultValue = 'kiwi';
 const value = radios(label, options, defaultValue);
 ```
 
+### options
+
+Configurable UI for selecting a value from a set of options. 
+
+```js
+import { optionsKnob as options } from '@storybook/addon-knobs';
+
+const label = 'Fruits';
+const valuesObj = {
+  Kiwi: 'kiwi',
+  Guava: 'guava',
+  Watermelon: 'watermelon',
+};
+const defaultValue = 'kiwi';
+const optionsObj = {
+  display: 'inline-radio'
+};
+
+const value = options(label, valuesObj, defaultValue, optionsObj);
+```
+> The display property for `optionsObj` accepts:
+> - `radio`
+> - `inline-radio`
+> - `check`
+> - `inline-check`
+> - `select`
+> - `multi-select`
+
 ### files
 
 Allows you to get a value from a file input from the user.

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "4.2.0-alpha.2",
+  "version": "4.2.0-alpha.5",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -23,9 +23,9 @@
   "dependencies": {
     "@emotion/core": "^10.0.2",
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.2",
-    "@storybook/components": "4.2.0-alpha.2",
-    "@storybook/core-events": "4.2.0-alpha.2",
+    "@storybook/addons": "4.2.0-alpha.5",
+    "@storybook/components": "4.2.0-alpha.5",
+    "@storybook/core-events": "4.2.0-alpha.5",
     "copy-to-clipboard": "^3.0.8",
     "core-js": "^2.5.7",
     "escape-html": "^1.0.3",
@@ -36,6 +36,7 @@
     "react": "^16.7.0-alpha.2",
     "react-color": "^2.14.1",
     "react-lifecycles-compat": "^3.0.4",
+    "react-select": "^2.1.0",
     "util-deprecate": "^1.0.2"
   },
   "peerDependencies": {