Merge remote-tracking branch 'origin/master' into upgrade-events

# Conflicts: # lib/core/package.json
storybookjs · Feb 27, 2018 · 7516d7f · 7516d7f
2 parents 2b11bd6 + e000d4a
commit 7516d7f
Show file tree

Hide file tree

Showing 115 changed files with 502 additions and 1,097 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -5,13 +5,13 @@ const ignore = 0;
 module.exports = {
   root: true,
   extends: [
-    'eslint-config-airbnb',
+    'airbnb',
     'plugin:jest/recommended',
     'plugin:import/react-native',
     'prettier',
     'prettier/react',
   ],
-  plugins: ['prettier', 'jest', 'react', 'json'],
+  plugins: ['prettier', 'jest', 'import', 'react', 'jsx-a11y', 'json'],
   parser: 'babel-eslint',
   parserOptions: {
     sourceType: 'module',

diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -11,7 +11,7 @@
 |[info](addons/info)              |+| | | | |
 |[jest](addons/jest)              |+| | | | |
 |[knobs](addons/knobs)            |+|+|+|+|+|
-|[links](addons/links)            |+|+|+|+| |
+|[links](addons/links)            |+|+|+|+|+|
 |[notes](addons/notes)            |+| |+|+|+|
 |[options](addons/options)        |+|+|+|+|+|
 |[storyshots](addons/storyshots)  |+|+|+|+| |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -208,7 +208,7 @@
 -   Addon Storysource improvements [#3040](https://github.com/storybooks/storybook/pull/3040)
 -   #3029 use @storybook/podda to fix npm engine version in podda [#3033](https://github.com/storybooks/storybook/pull/3033)
 -   Add moduleMetdata decorator for supplying common Angular metadata [#2959](https://github.com/storybooks/storybook/pull/2959)
--   [Addon Storysource] Add auto scrolling to the selected story [#3025](https://github.com/storybooks/storybook/pull/3025)
+-   `Addon Storysource` Add auto scrolling to the selected story [#3025](https://github.com/storybooks/storybook/pull/3025)
 -   add GitHub flavored markdown notes [#2946](https://github.com/storybooks/storybook/pull/2946)
 -   Added beforeScreenshot config option to addons/storyshots, to allow testing of components with mounting animations [#2972](https://github.com/storybooks/storybook/pull/2972)
 -   Enable groupId option for knobs to be organized into sub panels. [#2661](https://github.com/storybooks/storybook/pull/2661)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Build Status on CircleCI](https://circleci.com/gh/storybooks/storybook.svg?style=shield)](https://circleci.com/gh/storybooks/storybook)
 [![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook)
 [![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847)
-[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)  
+[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)
 [![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)](https://now-examples-slackin-rrirkqohko.now.sh/)
 [![Backers on Open Collective](https://opencollective.com/storybook/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/storybook/sponsors/badge.svg)](#sponsors)
 
@@ -80,15 +80,21 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo
 
 ### Addons
 
--   [storyshots](addons/storyshots) - Easy snapshot testing for storybook
--   [actions](addons/actions/) - Log actions as users interact with components in storybook
--   [links](addons/links/) - Create links between stories
--   [comments](addons/comments/) - Comment on storybook stories
+-   [a11y](addons/a11y/) - Test components for user accessibility in Storybook
+-   [actions](addons/actions/) - Log actions as users interact with components in the Storybook UI
+-   [background](addons/background/) - Let users choose backgrounds in the Storybook UI
+-   [centered](addons/centered/) - Center the alignment of your components within the Storybook UI
+-   [events](addons/events/) - Interactively fire events to components that respond to EventEmitter
 -   [graphql](addons/graphql/) - Query a GraphQL server within Storybook stories
 -   [info](addons/info/) - Annotate stories with extra component usage information
+-   [jest](addons/jest/) - View the results of components' unit tests in Storybook
 -   [knobs](addons/knobs/) - Interactively edit component prop data in the Storybook UI
--   [notes](addons/notes/) - Annotate storybook stories with notes
--   [options](addons/options/) - Customize the storybook UI in code
+-   [links](addons/links/) - Create links between stories
+-   [notes](addons/notes/) - Annotate Storybook stories with notes
+-   [options](addons/options/) - Customize the Storybook UI in code
+-   [storyshots](addons/storyshots/) - Easy snapshot testing for components in Storybook
+-   [storysource](addons/storysource/) - View the code of your stories within the Storybook UI
+-   [viewport](addons/viewport/) - Change display sizes and layouts for responsive components using Storybook
 
 See [Addon / Framework Support Table](ADDONS_SUPPORT.md)
 

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -27,8 +27,10 @@
   "dependencies": {
     "@storybook/components": "^3.4.0-alpha.9",
     "axe-core": "^2.6.1",
+    "babel-runtime": "^6.26.0",
+    "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -21,11 +21,13 @@
   },
   "dependencies": {
     "@storybook/components": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
+    "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
     "global": "^4.3.2",
     "make-error": "^1.3.4",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-inspector": "^2.2.2",
     "uuid": "^3.2.1"
   },

diff --git a/addons/background/README.md b/addons/background/README.md
@@ -3,13 +3,13 @@
 [![Build Status on CircleCI](https://circleci.com/gh/storybooks/storybook.svg?style=shield)](https://circleci.com/gh/storybooks/storybook)
 [![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook)
 [![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847)
-[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)  
+[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook)
 [![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)](https://now-examples-slackin-rrirkqohko.now.sh/)
 [![Backers on Open Collective](https://opencollective.com/storybook/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/storybook/sponsors/badge.svg)](#sponsors)
 
 * * *
 
-Storybook Centered Decorator can be used to center components inside the preview in [Storybook](https://storybook.js.org).
+Storybook Background Addon can be used to change background colors inside the preview in [Storybook](https://storybook.js.org).
 
 [Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
@@ -18,7 +18,7 @@ Storybook Centered Decorator can be used to center components inside the preview
 ## Installation
 
 ```sh
-npm i --save @storybook/addon-backgrounds
+npm i -D @storybook/addon-backgrounds
 ```
 
 ## Configuration

diff --git a/addons/background/package.json b/addons/background/package.json
@@ -24,8 +24,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -10,6 +10,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2"
   },
   "devDependencies": {

diff --git a/addons/events/docs/.DS_Store b/addons/events/docs/.DS_Store
diff --git a/addons/events/package.json b/addons/events/package.json
@@ -23,9 +23,8 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "format-json": "^1.0.3",
-    "prop-types": "^15.6.0",
-    "react-textarea-autosize": "^5.2.1",
-    "uuid": "^3.2.1"
+    "prop-types": "^15.6.1",
+    "react-textarea-autosize": "^5.2.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/addons/events/src/components/Panel.js b/addons/events/src/components/Panel.js
@@ -66,7 +66,7 @@ export default class Events extends Component {
     const { events } = this.state;
     return (
       <div style={styles.wrapper}>
-        {events.map(event => <Event key={event.id} {...event} onEmit={this.onEmit} />)}
+        {events.map(event => <Event key={event.name} {...event} onEmit={this.onEmit} />)}
       </div>
     );
   }

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -22,10 +22,11 @@
     "storybook": "start-storybook -p 9001"
   },
   "dependencies": {
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "graphiql": "^0.11.11",
     "graphql": "^0.13.1",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9"

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -18,11 +18,12 @@
     "@storybook/client-logger": "^3.4.0-alpha.9",
     "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
+    "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
     "global": "^4.3.2",
     "marksy": "^6.0.3",
     "nested-object-assign": "^1.0.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-addons-create-fragment": "^15.5.3",
     "util-deprecate": "^1.0.2"
   },

diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap
@@ -158,9 +158,7 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
             >
               <div>
                 <h1>
-                  function func(x) {
-          return x + 1;
-        }
+                  function func(x) {return x + 1;}
                 </h1>
                 <h2>
                   [object Object]

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -26,10 +26,11 @@
   },
   "dependencies": {
     "@storybook/components": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.6",
     "global": "^4.3.2",
-    "prop-types": "^15.6.0"
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -22,7 +22,7 @@
     "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
     "moment": "^2.20.1",
-    "prop-types": "^15.6.0",
+    "prop-types": "^15.6.1",
     "react-color": "^2.11.4",
     "react-datetime": "^2.14.0",
     "react-textarea-autosize": "^5.2.1",

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -23,15 +23,15 @@
   },
   "dependencies": {
     "@storybook/components": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
-    "prop-types": "^15.5.10"
+    "prop-types": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9",
     "enzyme": "^3.3.0",
     "react": "^16.1.0",
-    "react-dom": "^16.1.0",
-    "shelljs": "^0.8.1"
+    "react-dom": "^16.1.0"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -21,8 +21,8 @@
   },
   "dependencies": {
     "babel-runtime": "^6.26.0",
-    "marked": "^0.3.16",
-    "prop-types": "^15.6.0",
+    "marked": "^0.3.17",
+    "prop-types": "^15.6.1",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {

diff --git a/addons/options/package.json b/addons/options/package.json
@@ -19,6 +19,9 @@
     "prepare": "node ../../scripts/prepare.js",
     "storybook": "start-storybook -p 9001"
   },
+  "dependencies": {
+    "babel-runtime": "^6.26.0"
+  },
   "devDependencies": {
     "@storybook/react": "^3.4.0-alpha.9"
   },

diff --git a/addons/storyshots/.babelrc b/addons/storyshots/.babelrc
diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
@@ -23,23 +23,15 @@
     "global": "^4.3.2",
     "jest-image-snapshot": "^2.3.0",
     "jest-specific-snapshot": "^0.3.0",
-    "prop-types": "^15.6.0",
     "puppeteer": "^1.1.1",
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^3.4.0-alpha.9",
+    "@storybook/addon-links": "^3.4.0-alpha.9",
     "@storybook/addons": "^3.4.0-alpha.9",
     "@storybook/react": "^3.4.0-alpha.9",
-    "babel-cli": "^6.26.0",
-    "babel-jest": "^22.4.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
     "enzyme-to-json": "^3.3.1",
-    "jest": "^22.4.2",
-    "jest-cli": "^22.4.2",
     "react": "^16.1.0",
     "react-dom": "^16.1.0"
   },

diff --git a/addons/storyshots/stories/required_with_context/Welcome.stories.js b/addons/storyshots/stories/required_with_context/Welcome.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { storiesOf } from '@storybook/react';  // eslint-disable-line
-import { linkTo } from '@storybook/addon-links'; // eslint-disable-line
+import { storiesOf } from '@storybook/react';
+import { linkTo } from '@storybook/addon-links';
 import { Welcome } from '@storybook/react/demo';
 
 storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo('Button')} />);
diff --git a/addons/storysource/package.json b/addons/storysource/package.json
@@ -20,14 +20,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "acorn": "^5.3.0",
+    "acorn": "^5.5.0",
     "acorn-es7": "^0.1.0",
     "acorn-jsx": "^4.1.1",
-    "acorn-stage3": "^0.5.0",
+    "acorn-stage3": "^0.6.0",
+    "babel-runtime": "^6.26.0",
     "estraverse": "^4.2.0",
     "loader-utils": "^1.1.0",
-    "prettier": "^1.10.2",
-    "prop-types": "^15.5.10",
+    "prettier": "^1.11.0",
+    "prop-types": "^15.6.1",
     "react-syntax-highlighter": "^7.0.1"
   },
   "peerDependencies": {

diff --git a/addons/viewport/package.json b/addons/viewport/package.json
@@ -12,8 +12,9 @@
   },
   "dependencies": {
     "@storybook/components": "^3.4.0-alpha.9",
+    "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
-    "prop-types": "^15.5.10"
+    "prop-types": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0",

diff --git a/app/angular/.babelrc b/app/angular/.babelrc