Merge branch 'master' into master

storybookjs · Jul 26, 2017 · 5a2d0b6 · 5a2d0b6
2 parents 52b4dd1 + 548a5bf
commit 5a2d0b6
Show file tree

Hide file tree

Showing 31 changed files with 110 additions and 101 deletions.
diff --git a/.eslintrc-markdown.js b/.eslintrc-markdown.js
@@ -51,6 +51,9 @@ module.exports = {
     'react/react-in-jsx-scope': ignore,
     'react/jsx-filename-extension': ignore,
     'jsx-a11y/accessible-emoji': ignore,
+    'jsx-a11y/href-no-hash': ignore,
+    'jsx-a11y/label-has-for': ignore,
+    'jsx-a11y/anchor-is-valid': ['warn', { aspects: ['invalidHref'] }],
     'react/no-unescaped-entities': ignore,
   },
 };
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -66,6 +66,9 @@ module.exports = {
       },
     ],
     'jsx-a11y/accessible-emoji': ignore,
+    'jsx-a11y/href-no-hash': ignore,
+    'jsx-a11y/label-has-for': ignore,
+    'jsx-a11y/anchor-is-valid': ['warn', { aspects: ['invalidHref'] }],
     'react/no-unescaped-entities': ignore,
   },
 };
diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -29,10 +29,10 @@
     "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4",
-    "shelljs": "^0.7.7"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "react-test-renderer": "^15.6.1",
+    "shelljs": "^0.7.8"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/addons/comments/package.json b/addons/comments/package.json
@@ -39,10 +39,10 @@
     "@kadira/storybook-database-cloud": "*",
     "@kadira/storybook-deployer": "*",
     "git-url-parse": "^6.2.2",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4",
-    "shelljs": "^0.7.7"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "react-test-renderer": "^15.6.1",
+    "shelljs": "^0.7.8"
   },
   "peerDependencies": {
     "react": "*"

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -28,8 +28,8 @@
     "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   },
   "peerDependencies": {
     "react": "*"

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -27,9 +27,9 @@
     "prop-types": "^15.5.10"
   },
   "devDependencies": {
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "shelljs": "^0.7.7"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "shelljs": "^0.7.8"
   },
   "peerDependencies": {
     "react": "*"

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -23,9 +23,9 @@
   },
   "devDependencies": {
     "git-url-parse": "^6.2.2",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "react-test-renderer": "^15.6.1"
   },
   "peerDependencies": {
     "react": "*"

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -33,8 +33,8 @@
     "@types/react": "^15.0.21",
     "git-url-parse": "^6.2.2",
     "raw-loader": "^0.5.1",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
     "style-loader": "^0.17.0",
     "typescript": "^2.2.2",
     "typescript-definition-tester": "^0.0.5"

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -25,9 +25,9 @@
     "@storybook/addons": "^3.1.6"
   },
   "devDependencies": {
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "shelljs": "^0.7.7"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "shelljs": "^0.7.8"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -25,9 +25,9 @@
   },
   "devDependencies": {
     "git-url-parse": "^6.2.2",
-    "react": "^15.5.4",
+    "react": "^15.6.1",
     "react-addons-test-utils": "^15.5.1",
-    "react-dom": "^15.5.4"
+    "react-dom": "^15.6.1"
   },
   "peerDependencies": {
     "react": "*"

diff --git a/addons/options/package.json b/addons/options/package.json
@@ -24,10 +24,10 @@
     "@storybook/addons": "^3.1.6"
   },
   "devDependencies": {
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4",
-    "shelljs": "^0.7.7"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
+    "react-test-renderer": "^15.6.1",
+    "shelljs": "^0.7.8"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
@@ -27,14 +27,14 @@
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.1.6",
     "@storybook/channels": "^3.1.6",
     "@storybook/react": "^3.1.9",
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "react": "*",
     "react-test-renderer": "*"
   }

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -30,7 +30,7 @@
     "@storybook/channel-websocket": "^3.1.6",
     "@storybook/ui": "^3.1.9",
     "autoprefixer": "^7.1.1",
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-loader": "^7.0.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -56,7 +56,7 @@
     "json-loader": "^0.5.4",
     "json5": "^0.5.1",
     "postcss-loader": "^2.0.5",
-    "shelljs": "^0.7.7",
+    "shelljs": "^0.7.8",
     "style-loader": "^0.17.0",
     "url-loader": "^0.5.8",
     "util-deprecate": "^1.0.2",
@@ -68,8 +68,8 @@
   },
   "devDependencies": {
     "babel-cli": "^6.24.1",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
     "react-native": "^0.43.3"
   },
   "peerDependencies": {

diff --git a/app/react/package.json b/app/react/package.json
@@ -29,7 +29,7 @@
     "@storybook/ui": "^3.1.9",
     "airbnb-js-shims": "^1.1.1",
     "autoprefixer": "^7.1.1",
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-loader": "^7.0.0",
     "babel-plugin-react-docgen": "^1.5.0",
     "babel-preset-es2015": "^6.24.1",
@@ -63,7 +63,7 @@
     "redux": "^3.6.0",
     "request": "^2.81.0",
     "serve-favicon": "^2.4.3",
-    "shelljs": "^0.7.7",
+    "shelljs": "^0.7.8",
     "style-loader": "^0.17.0",
     "url-loader": "^0.5.8",
     "util-deprecate": "^1.0.2",
@@ -76,8 +76,8 @@
     "babel-cli": "^6.24.1",
     "mock-fs": "^4.3.0",
     "nodemon": "^1.11.0",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/docs/components/Homepage/index.js b/docs/components/Homepage/index.js
@@ -43,13 +43,13 @@ import Footer from '../Footer';
 const Homepage = ({ users }) =>
   <div className="container">
     <Helmet title="Storybook - UI dev environment you'll love to use" />
-    {/* <Header currentSection="home" />*/}
+    {/* <Header currentSection="home" /> */}
     <Heading />
     <Demo />
-    {/* <Platforms />*/}
+    {/* <Platforms /> */}
     <MainLinks />
     <UsedBy users={users} />
-    {/* <Featured featuredStorybooks={featuredStorybooks} />*/}
+    {/* <Featured featuredStorybooks={featuredStorybooks} /> */}
     <Footer />
   </div>;
 

diff --git a/docs/package.json b/docs/package.json
@@ -22,7 +22,7 @@
     "@storybook/addons": "latest",
     "@storybook/react": "latest",
     "babel-cli": "^6.24.1",
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.4.0",
@@ -44,9 +44,9 @@
     "markdown-it-replace-link": "^1.0.1",
     "marked": "^0.3.6",
     "prop-types": "^15.5.10",
-    "react": "^15.5.4",
+    "react": "^15.6.1",
     "react-document-title": "^2.0.3",
-    "react-dom": "^15.5.4",
+    "react-dom": "^15.6.1",
     "react-helmet": "^5.0.3",
     "react-motion": "^0.1.0",
     "react-responsive-grid": "^0.3.3",

diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
@@ -14,8 +14,8 @@
     "format-json": "^1.0.3",
     "global": "^4.3.2",
     "prop-types": "^15.5.10",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
     "uuid": "^3.1.0"
   },
   "devDependencies": {

diff --git a/examples/react-native-vanilla/package.json b/examples/react-native-vanilla/package.json
@@ -25,6 +25,6 @@
     "@storybook/channel-postmessage": "file:../../lib/channel-postmessage",
     "@storybook/react-native": "file:../../app/react-native",
     "@storybook/ui": "file:../../lib/ui",
-    "react-dom": "^15.5.4"
+    "react-dom": "^15.6.1"
   }
 }
diff --git a/examples/test-cra/package.json b/examples/test-cra/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "global": "^4.3.2",
     "prop-types": "^15.5.10",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   },
   "devDependencies": {
     "@storybook/addon-actions": "file:../../packs/storybook-addon-actions.tgz",

diff --git a/examples/test-cra/src/stories/ComponentWithRef.js b/examples/test-cra/src/stories/ComponentWithRef.js
@@ -7,7 +7,13 @@ class ComponentWithRef extends Component {
   }
   scrollWidth = 0;
   render() {
-    return <div ref={r => (this.ref = r)} />;
+    return (
+      <div
+        ref={r => {
+          this.ref = r;
+        }}
+      />
+    );
   }
 }
 

diff --git a/lib/addons/package.json b/lib/addons/package.json
@@ -19,6 +19,6 @@
     "prepublish": "node ../../scripts/prepublish.js"
   },
   "devDependencies": {
-    "shelljs": "^0.7.7"
+    "shelljs": "^0.7.8"
   }
 }
diff --git a/lib/addons/src/index.js b/lib/addons/src/index.js
@@ -1,16 +1,11 @@
-function channelError() {
-  throw new Error(
-    'Accessing nonexistent addons channel, see https://storybook.js.org/basics/faq/#why-is-there-no-addons-channel'
-  );
-}
-
 export class AddonStore {
   constructor() {
     this.loaders = {};
     this.panels = {};
     // this.channel should get overwritten by setChannel if package versions are
-    // correct and AddonStore is a proper singleton. If not, throw an error.
-    this.channel = { on: channelError, emit: channelError };
+    // correct and AddonStore is a proper singleton. If not, this will be null
+    // (currently required by @storybook/react-native getStorybookUI)
+    this.channel = null;
     this.preview = null;
     this.database = null;
   }

diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
@@ -13,6 +13,6 @@
     "json-stringify-safe": "^5.0.1"
   },
   "devDependencies": {
-    "shelljs": "^0.7.7"
+    "shelljs": "^0.7.8"
   }
 }
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
@@ -12,6 +12,6 @@
     "global": "^4.3.2"
   },
   "devDependencies": {
-    "shelljs": "^0.7.7"
+    "shelljs": "^0.7.8"
   }
 }
diff --git a/lib/channels/package.json b/lib/channels/package.json
@@ -8,6 +8,6 @@
     "prepublish": "node ../../scripts/prepublish.js"
   },
   "devDependencies": {
-    "shelljs": "^0.7.7"
+    "shelljs": "^0.7.8"
   }
 }
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -33,7 +33,7 @@
     "json5": "^0.5.1",
     "merge-dirs": "^0.2.1",
     "opencollective": "^1.0.3",
-    "shelljs": "^0.7.7",
+    "shelljs": "^0.7.8",
     "update-notifier": "^2.1.0"
   }
 }
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
@@ -15,6 +15,6 @@
     "jscodeshift": "^0.3.30"
   },
   "devDependencies": {
-    "shelljs": "^0.7.7"
+    "shelljs": "^0.7.8"
   }
 }
diff --git a/lib/components/package.json b/lib/components/package.json
@@ -17,8 +17,8 @@
     "prop-types": "^15.5.10"
   },
   "devDependencies": {
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/lib/ui/example/package.json b/lib/ui/example/package.json
@@ -6,7 +6,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.25.0",
     "babel-eslint": "^7.2.2",
     "babel-loader": "^6.4.1",
     "babel-preset-es2015": "^6.24.1",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "keycode": "^2.1.8",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4"
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   }
 }