Merge remote-tracking branch 'origin/master' into angular-storyshots

# Conflicts: # .editorconfig # addons/storyshots/package.json # examples/angular-cli/package.json # examples/vue-kitchen-sink/package.json # yarn.lock
adrukh · Jan 14, 2018 · 5fcf200 · 5fcf200
2 parents d5b30aa + 20af34a
commit 5fcf200
Show file tree

Hide file tree

Showing 132 changed files with 3,142 additions and 569 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,6 +3,6 @@ root = true
 [*]
 end_of_line = lf
 
-[*.{js,json,ts,vue}]
+[*.{js,json,ts,vue,html}]
 indent_style = space
 indent_size = 2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,102 @@
+# 3.4.0-alpha.4
+
+2018-January-13
+
+Republish `3.4.0-alpha.3` due to potential publishing errors
+
+# 3.4.0-alpha.3
+
+2018-January-13
+
+#### Features
+
+-   Polymer 2 support [#2225](https://github.com/storybooks/storybook/pull/2225)
+-   Add image snapshots to addon-storyshots [#2413](https://github.com/storybooks/storybook/pull/2413)
+-   Angular template support for Storybook [#2690](https://github.com/storybooks/storybook/pull/2690)
+
+#### Bug Fixes
+
+-   Remove polymer-cli dependency [#2741](https://github.com/storybooks/storybook/pull/2741)
+-   Add scss for components in angular apps by default. [#2703](https://github.com/storybooks/storybook/pull/2703)
+
+#### Maintenance
+
+-   Change ng stories dir [#2672](https://github.com/storybooks/storybook/pull/2672)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+54 Upgrades
+</summary>
+
+-   Upgraded `jest-image-snapshot` in `/` from "2.2.1" to "2.3.0" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `polymer-webpack-loader` in `app/polymer` from "2.0.0" to "2.0.1" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `jest-image-snapshot` in `addons/storyshots` from "2.2.1" to "2.3.0" [#2740](https://github.com/storybooks/storybook/pull/2740)
+-   Upgraded `shelljs` in `/` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `addons/links` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/react` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/react` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/angular` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/angular` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/react-native` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/react-native` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `autoprefixer` in `app/vue` from "7.2.4" to "7.2.5" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `app/vue` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Upgraded `shelljs` in `lib/cli` from "0.7.8" to "0.8.0" [#2734](https://github.com/storybooks/storybook/pull/2734)
+-   Update gatsby in /docs from 1.9.153 to 1.9.154 [#2733](https://github.com/storybooks/storybook/pull/2733)
+-   Update @angular/cli in examples/angular-cli from 1.6.3 to 1.6.4 [#2726](https://github.com/storybooks/storybook/pull/2726)
+-   Upgraded `commander` in `/` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-cli` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-config` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-diff` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-environment-jsdom` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest-jasmine2` in `/` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `/` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `prettier` in `/` from "1.9.2" to "1.10.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `tslint` in `/` from "5.8.0" to "5.9.1" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/react` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `common-tags` in `app/react` from "1.7.0" to "1.7.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `app/react` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/angular` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `common-tags` in `app/angular` from "1.7.0" to "1.7.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `zone.js` in `app/angular` from "0.8.19" to "0.8.20" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `app/angular` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/react-native` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `app/vue` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `common-tags` in `app/vue` from "1.7.0" to "1.7.2" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `nodemon` in `app/vue` from "1.14.10" to "1.14.11" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `babel-jest` in `examples/cra-kitchen-sink` from "22.0.4" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `jest` in `examples/cra-kitchen-sink` from "22.0.5" to "22.0.6" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `commander` in `lib/cli` from "2.12.2" to "2.13.0" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `zone.js` in `examples/angular-cli` from "0.8.19" to "0.8.20" [#2724](https://github.com/storybooks/storybook/pull/2724)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.7" to "3.3.8" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.27" to "1.7.28" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `gatsby` in `/docs` from "1.9.151" to "1.9.153" [#2722](https://github.com/storybooks/storybook/pull/2722)
+-   Upgraded `@storybook/addon-actions` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `@storybook/addon-links` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `@storybook/addons` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `@storybook/react` in `/docs` from "3.3.6" to "3.3.7" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `gatsby-link` in `/docs` from "1.6.33" to "1.6.34" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `gatsby-transformer-remark` in `/docs` from "1.7.26" to "1.7.27" [#2710](https://github.com/storybooks/storybook/pull/2710)
+-   Upgraded `gatsby` in `/docs` from "1.9.150" to "1.9.151" [#2710](https://github.com/storybooks/storybook/pull/2710)
+
+</details>
+
+# 3.3.9
+
+2018-January-13
+
+#### Bug Fixes
+
+-   Start haul/react-native using named binaries instead of cli.js [#2715](https://github.com/storybooks/storybook/pull/2715)
+-   Reflect the new peer dependencies in docs and CLI templates [#2714](https://github.com/storybooks/storybook/pull/2714)
+-   Don't mangle function names for production builds [#2705](https://github.com/storybooks/storybook/pull/2705)
+
 # 3.4.0-alpha.2
 
 2018-January-11

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,8 +25,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.1",
+    "@storybook/components": "^3.4.0-alpha.4",
     "axe-core": "^2.6.1",
+    "glamorous": "^4.11.2",
     "prop-types": "^15.6.0"
   },
   "peerDependencies": {

diff --git a/addons/a11y/src/components/Panel.js b/addons/a11y/src/components/Panel.js
@@ -6,10 +6,10 @@ import Report from './Report';
 
 const styles = {
   passes: {
-    color: '#2ecc71',
+    color: '#0D6731',
   },
   violations: {
-    color: '#e74c3c',
+    color: '#AC2300',
   },
 };
 
@@ -47,11 +47,11 @@ class Panel extends Component {
       <Tabs
         tabs={[
           {
-            label: <span style={styles.violations}>Violations</span>,
+            label: <span style={styles.violations}>{violations.length} Violations</span>,
             panel: <Report passes={false} items={violations} empty="No a11y violations found." />,
           },
           {
-            label: <span style={styles.passes}>Passes</span>,
+            label: <span style={styles.passes}>{passes.length} Passes</span>,
             panel: <Report passes items={passes} empty="No a11y check passed" />,
           },
         ]}

diff --git a/addons/a11y/src/components/Report/RerunButton.js b/addons/a11y/src/components/Report/RerunButton.js
@@ -0,0 +1,17 @@
+import glamorous from 'glamorous';
+
+const RerunButton = glamorous.button({
+  position: 'absolute',
+  bottom: 0,
+  right: 0,
+  border: 'none',
+  borderTop: 'solid 1px rgba(0, 0, 0, 0.2)',
+  borderLeft: 'solid 1px rgba(0, 0, 0, 0.2)',
+  background: 'rgba(255, 255, 255, 0.5)',
+  padding: '5px 10px',
+  borderRadius: '4px 0 0 0',
+  color: 'rgba(0, 0, 0, 0.5)',
+  textTransform: 'uppercase',
+});
+
+export default RerunButton;
diff --git a/addons/a11y/src/components/Report/index.js b/addons/a11y/src/components/Report/index.js
@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-
+import addons from '@storybook/addons';
+import RerunButton from './RerunButton';
 import Item from './Item';
 
 const styles = {
@@ -17,17 +18,23 @@ const styles = {
   },
 };
 
-function Report({ items, empty, passes }) {
-  if (items.length) {
-    return (
+function onRerunClick() {
+  const channel = addons.getChannel();
+  channel.emit('addon:a11y:rerun');
+}
+
+const Report = ({ items, empty, passes }) => (
+  <Fragment>
+    {items.length ? (
       <div style={styles.container}>
         {items.map(item => <Item passes={passes} item={item} key={item.id} />)}
       </div>
-    );
-  }
-
-  return <span style={styles.empty}>{empty}</span>;
-}
+    ) : (
+      <span style={styles.empty}>{empty}</span>
+    )}
+    <RerunButton onClick={onRerunClick}>Re-run tests</RerunButton>
+  </Fragment>
+);
 
 Report.propTypes = {
   items: PropTypes.arrayOf(

diff --git a/addons/a11y/src/components/Tabs.js b/addons/a11y/src/components/Tabs.js
@@ -5,6 +5,7 @@ import { baseFonts } from '@storybook/components';
 const styles = {
   container: {
     width: '100%',
+    position: 'relative',
     ...baseFonts,
   },
   tabs: {

diff --git a/addons/a11y/src/components/WrapStory.js b/addons/a11y/src/components/WrapStory.js
@@ -15,8 +15,24 @@ class WrapStory extends Component {
     channel: {},
   };
 
-  /* eslint-disable react/no-find-dom-node */
+  constructor(props) {
+    super(props);
+    this.runA11yCheck = this.runA11yCheck.bind(this);
+  }
+
   componentDidMount() {
+    const { channel } = this.props;
+    channel.on('addon:a11y:rerun', this.runA11yCheck);
+    this.runA11yCheck();
+  }
+
+  componentWillUnmount() {
+    const { channel } = this.props;
+    channel.removeListener('addon:a11y:rerun', this.runA11yCheck);
+  }
+
+  /* eslint-disable react/no-find-dom-node */
+  runA11yCheck() {
     const { channel } = this.props;
     const wrapper = findDOMNode(this);
 

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"

diff --git a/addons/background/package.json b/addons/background/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",

diff --git a/addons/background/src/index.js b/addons/background/src/index.js
@@ -5,7 +5,7 @@ import addons from '@storybook/addons';
 
 const style = {
   wrapper: {
-    overflow: 'scroll',
+    overflow: 'auto',
     position: 'fixed',
     top: 0,
     bottom: 0,

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <[email protected]>",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",

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

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -15,8 +15,8 @@
     "storybook": "start-storybook -p 9010"
   },
   "dependencies": {
-    "@storybook/client-logger": "^3.4.0-alpha.1",
-    "@storybook/components": "^3.4.0-alpha.1",
+    "@storybook/client-logger": "^3.4.0-alpha.4",
+    "@storybook/components": "^3.4.0-alpha.4",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "marksy": "^6.0.3",

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -25,7 +25,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/components": "^3.4.0-alpha.1",
+    "@storybook/components": "^3.4.0-alpha.4",
     "glamor": "^2.20.40",
     "glamorous": "^4.11.2",
     "global": "^4.3.2",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "3.4.0-alpha.1",
+  "version": "3.4.0-alpha.4",
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/addons/knobs/polymer.js b/addons/knobs/polymer.js
@@ -0,0 +1 @@
+module.exports = require('./dist/polymer');