Merge branch 'master' into eslint-strict

# Conflicts:
#	addons/centered/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/.storybook/config.js
#	addons/notes/package.json
#	addons/notes/src/index.js
#	addons/notes/src/register.js
#	addons/options/src/manager/index.js
#	addons/storyshots/src/index.js
#	addons/storyshots/stories/required_with_context/Button.stories.js
#	addons/storyshots/stories/required_with_context/Welcome.js
#	app/react-native/package.json
#	app/react-native/src/manager/index.js
#	lib/channel-postmessage/package.json
#	lib/channel-postmessage/src/index.js
#	lib/channel-websocket/package.json
#	lib/channel-websocket/src/index.js
#	lib/cli/generators/METEOR/index.js
#	lib/cli/generators/REACT/template/stories/Welcome.js
#	lib/cli/generators/REACT_SCRIPTS/index.js
#	lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js
#	packages/react-storybook/src/server/track_usage.js
#	packages/storybook-ui/src/modules/ui/components/layout/usplit.js
#	scripts/prepublish.js

Author: ndelangen

Diff for: .bithoundrc

@@ -0,0 +1,12 @@
+{
+  "ignore": [
+    "addons/**/.storybook/**/*.js",
+    "lib/cli/generators/**/.stories/**.js",
+    "*.ts"
+  ],
+  "critics": {
+    "wc": {
+      "limit": 500
+    }
+  }
+}

Diff for: .gitignore

@@ -12,3 +12,4 @@ coverage/
 build
 packages/examples/automated-*
 yarn.lock
+/**/LICENSE

Diff for: .npmignore

@@ -1 +1,10 @@
+/src/
+/example/
+/demo/
+/docs/
+/node_modules/
+/.storybook/
+
+*.md
+
 .babelrc

Diff for: CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to React Storybook
+# Contributing to Storybook
 
 Thanks for your interest in improving Storybook! We are a community-driven project and welcome contributions of all kinds: from discussion to documentation to bugfixes to feature improvements.
 
@@ -33,16 +33,16 @@ To test your project against the current latest version of storybook, you can cl
   ```
   cd packages/react-storybook
   npm link
-  
+
   cd <your-project>
   npm link @kadira/storybook
-  
+
   # repeat with whichever other parts of the monorepo you are using.
   ```
 
 ### Reproductions
 
-The best way to help figure out an issue you are having is to produce a minimal reproduction against the `master` branch. 
+The best way to help figure out an issue you are having is to produce a minimal reproduction against the `master` branch.
 
 A good way to do that is using the example `test-cra` app embedded in this repository:
 
@@ -99,7 +99,18 @@ Issues that are tagged `question / support` or `needs reproduction` are great pl
 
 ### Triaging issues
 
-Once you've helped out on a few issues, if you'd like triage access, you can help label issues, and respond to reporters. New issues should be labelled as one of `bug`, `new feature`, `question / support` or `discussion`.
+Once you've helped out on a few issues, if you'd like triage access you can help label issues and respond to reporters.
+
+We use the following label scheme to categorize issues:
+- **type** - `bug`, `feature`, `question / support`, `discussion`, `greenkeeper`, `maintenance`.
+- **area** - `addon: x`, `addons-api`, `stories-api`, `ui`, etc.
+- **status** - `needs reproduction`, `needs PR`, `in progress`, etc.
+
+All issues should have a `type` label. `bug`/`feature`/`question`/`discussion` are self-explanatory. `greenkeeper` is for keeping package dependencies up to date. `maintenance` is a catch-all for any kind of cleanup or refactoring.
+
+They should also have one or more `area`/`status` labels. We use these labels to filter issues down so we can easily see all of the issues for a particular area, and keep the total number of open issues under control.
+
+For example, here is the list of [open, untyped issues](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20-label%3A%22bug%22%20-label%3A%22discussion%22%20-label%3A%22feature%22%20-label%3A%22maintenance%22%20-label%3A%22question%20%2F%20support%22%20-label%3A%22documentation%22%20-label%3A%22greenkeeper%22), or here is a list of [bugs that have not been modified since 2017-04-01](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3A%22bug%22%20updated%3A%3C%3D2017-04-01%20). For more info see [searching issues](https://help.github.com/articles/searching-issues/) in the Github docs.
 
 If an issue is a `bug`, and it doesn't have a clear reproduction that you have personally confirmed, label it `needs reproduction` and ask the author to try and create a reproduction, or have a go yourself.
 
@@ -109,15 +120,14 @@ If an issue is a `bug`, and it doesn't have a clear reproduction that you have p
 
 - Unreproducible issues should be closed if it's not possible to reproduce them (if the reporter drops offline, it is reasonable to wait 2 weeks before closing).
 
-- `bug`s should be closed when the issue is fixed and merged to `master`
+- `bug`s should be labeled `merged` when merged, and be closed when the issue is fixed and released.
 
-- `new feature`s should be closed when merged or if the feature is deemed to be not appropriate.
+- `feature`s, `maintenance`s, `greenkeeper`s should be labeled `merged` when merged, and closed when released or if the feature is deemed not appropriate.
 
 - `question / support`s should be closed when the question has been answered. If the questioner drops offline, a reasonable period to wait is two weeks.
 
 - `discussion`s should be closed at a maintainer's discretion.
 
-
 ## Development Guide
 
 > If you want to work on a UI feature, refer to the [Storybook UI](https://github.com/storybooks/storybook/tree/master/packages/storybook-ui) project.
@@ -155,7 +165,7 @@ getstorybook
 Then link storybook inside the sample project with:
 
 ```sh
-npm link @kadira/storybook
+npm link @storybook/react
 ```
 
 ### Getting Changes

Diff for: HISTORY.md

@@ -0,0 +1,25 @@
+## v.Next
+
+- Deprecated `{ linkTo, action }` as built-in addons: https://github.com/storybooks/storybook/issues/1017. From 3.0 use them as you would [any other addon](https://storybooks.js.org/docs/react-storybook/addons/using-addons/).
+
+Before:
+
+```js
+// .storybook/addons.js
+import '@kadira/storybook/addons'
+
+// *.stories.js
+import { linkTo, action } from '@kadira/storybook'
+```
+
+After:
+
+```js
+// .storybook/addons.js
+import '@storybook/addon-actions/register'
+import '@storybook/addon-links/register'
+
+// *.stories.js
+import { action } from '@storybook/addon-actions'
+import { linkTo } from '@storybook/addon-links'
+```

Diff for: LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Your Name. <name@emailprovider.io>
+Copyright (c) 2017 Kadira Inc. <hello@kadira.io>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Diff for: README.md

@@ -3,14 +3,15 @@
 [![Build Status](https://travis-ci.org/storybooks/storybook.svg?branch=master)](https://travis-ci.org/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://storybooks-slackin.herokuapp.com/badge.svg)](https://storybooks-slackin.herokuapp.com/)
 
-Storybook is a development environment for React UI components. It allows you to browse a component library, view the different states of each component, and interactively develop and test components.
+Storybook is a development environment for UI components.
+It allows you to browse a component library, view the different states of each component, and interactively develop and test components.
 
 ## Intro
 
-![React Storybook Screenshot](packages/react-storybook/docs/demo.gif)
+![Storybook Screenshot](app/react/docs/demo.gif)
 
 Storybook runs outside of your app. This allows you to develop UI components in isolation, which can improve component reuse, testability, and development speed. You can build quickly without having to worry about application-specific dependencies.
 
@@ -20,30 +21,32 @@ Storybook comes with a lot of [addons](https://storybooks.js.org/docs/react-stor
 
 First install storybook:
 ```js
-npm i -g getstorybook
+npm i -g @storybook/cli
 cd my-react-app
 getstorybook
 ```
 
 Once it's installed, you can `npm run storybook` and it will run the development server on your local machine, and give you a URL to browse some sample stories.
 
-For full documentation on using Storybook visit: https://storybooks.js.org
+For full documentation on using Storybook visit: [storybooks.js.org](https://storybooks.js.org)
 
 ## Main Projects
-- [react-storybook](packages/react-storybook) - Storybook for React components
-- [react-native-storybook](packages/react-native-storybook) - Storybook for React components
-- [storyshots](packages/storyshots) - Easy snapshot testing for storybook
-- [getstorybook](packages/getstorybook) - Streamlined installation for a variety of app types
+- [Storybook for react](app/react) - Storybook for React components
+- [Storybook for react-native](app/react-native) - Storybook for React components
+
+## Sub Projects
+- [Storyshots](lib/storyshots) - Easy snapshot testing for storybook
+- [CLI](lib/cli) - Streamlined installation for a variety of app types
 - [examples](examples) - Code examples to illustrate different Storybook use cases
 
 ## Addons
-- [addon-actions](packages/addon-actions/) - Log actions as users interact with components in storybook
-- [addon-comments](packages/addon-comments/) - Comment on storybook stories
-- [addon-graphql](packages/addon-graphql/) - Query a GraphQL server within Storybook stories
-- [addon-info](packages/addon-info/) - Annotate stories with extra component usage information
-- [addon-knobs](packages/addon-knobs/) - Interactively edit component prop data in the Storybook UI
-- [addon-notes](packages/addon-notes/) - Annotate storybook stories with notes
-- [addon-options](packages/addon-options/) - Customize the storybook UI in code
+- [addon-actions](addons/actions/) - Log actions as users interact with components in storybook
+- [addon-comments](addons/comments/) - Comment on storybook stories
+- [addon-graphql](addons/graphql/) - Query a GraphQL server within Storybook stories
+- [addon-info](addons/info/) - Annotate stories with extra component usage information
+- [addon-knobs](addons/knobs/) - Interactively edit component prop data in the Storybook UI
+- [addon-notes](addons/notes/) - Annotate storybook stories with notes
+- [addon-options](addons/options/) - Customize the storybook UI in code
 
 ## Contributing
 

Diff for: addons/actions/.storybook/addons.js

@@ -0,0 +1 @@
+import '../register';

Diff for: packages/addon-actions/.storybook/config.js renamed to addons/actions/.storybook/config.js

@@ -1,2 +1,2 @@
-import * as storybook from '@kadira/storybook';
+import * as storybook from '@storybook/react';
 storybook.configure(() => require('./stories'), module);

Diff for: packages/addon-actions/.storybook/stories.js renamed to addons/actions/.storybook/stories.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
 import { action, decorateAction } from '../src';
 
 const pickFirst = decorateAction([

Diff for: packages/addon-actions/CHANGELOG.md renamed to addons/actions/CHANGELOG.md

@@ -0,0 +1,56 @@
+# Storybook Addon Actions
+[![Greenkeeper badge](https://badges.greenkeeper.io/storybooks/storybook.svg)](https://greenkeeper.io/)
+[![Build Status](https://travis-ci.org/storybooks/storybook.svg?branch=master)](https://travis-ci.org/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)
+[![Storybook Slack](https://storybooks-slackin.herokuapp.com/badge.svg)](https://storybooks-slackin.herokuapp.com/)
+
+Storybook Addon Actions can be used to display data received by event handlers in [Storybook](https://storybooks.js.org).
+
+This addon works with Storybook for:
+[React](https://github.com/storybooks/storybook/tree/master/app/react) and
+[React Native](https://github.com/storybooks/storybook/tree/master/app/react-native).
+
+![Screenshot](docs/screenshot.png)
+
+## Getting Started
+
+You can use this addon without installing it manually.
+
+Import the `action` function and use it to create actions handlers. When creating action handlers, provide a **name** to make it easier to identify.
+
+> *Note: Make sure NOT to use reserved words as function names. [issues#29](https://github.com/storybooks/storybook-addon-actions/issues/29#issuecomment-288274794)*
+
+```js
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
+
+storiesOf('Button', module)
+  .add('default view', () => (
+    <Button onClick={ action('button-click') }>
+      Hello World!
+    </Button>
+  ))
+```
+
+## Action Decorators
+
+If you wish to process action data before sending them over to the logger, you can do it with action decorators.
+
+`decorateAction` takes an array of decorator functions. Each decorator function is passed an array of arguments, and should return a new arguments array to use. `decorateAction` returns a function that can be used like `action` but will log the modified arguments instead of the original arguments.
+
+```js
+import { action, decorateAction } from '@storybook/addon-actions'
+
+const firstArgAction = decorateAction([
+  args => args.slice(0, 1)
+]);
+
+storiesOf('Button', module)
+  .add('default view', () => (
+    <Button onClick={ firstArgAction('button-click') }>
+      Hello World!
+    </Button>
+  ))
+```

Diff for: addons/actions/README.md

@@ -1,43 +1,43 @@
-{
-  "name": "@kadira/storybook-addon-actions",
-  "version": "1.1.3",
-  "description": "Action Logger addon for storybook",
-  "main": "dist/index.js",
-  "scripts": {
-    "deploy-storybook": "storybook-to-ghpages",
-    "prepublish": "node ../../scripts/prepublish.js",
-    "storybook": "start-storybook -p 9001"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kadirahq/storybook-addon-actions.git"
-  },
-  "keywords": [
-    "storybook"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/kadirahq/storybook-addon-actions/issues"
-  },
-  "homepage": "https://github.com/kadirahq/storybook-addon-actions#readme",
-  "devDependencies": {
-    "@kadira/storybook": "*",
-    "@kadira/storybook-addons": "*",
-    "@kadira/storybook-ui": "*",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
-    "react-test-renderer": "^15.5.4",
-    "shelljs": "^0.7.7"
-  },
-  "dependencies": {
-    "deep-equal": "^1.0.1",
-    "json-stringify-safe": "^5.0.1",
-    "prop-types": "^15.5.8",
-    "@storybook/react-inspector": "^1.2.1"
-  },
-  "peerDependencies": {
-    "@kadira/storybook-addons": "*",
-    "react": "*",
-    "react-dom": "*"
-  }
-}
+{
+  "name": "@storybook/addon-actions",
+  "version": "3.0.0-alpha.0",
+  "description": "Action Logger addon for storybook",
+  "main": "dist/index.js",
+  "scripts": {
+    "deploy-storybook": "storybook-to-ghpages",
+    "prepublish": "node ../../scripts/prepublish.js",
+    "storybook": "start-storybook -p 9001"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/storybooks/storybook.git"
+  },
+  "keywords": [
+    "storybook"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/storybooks/storybook/issues"
+  },
+  "homepage": "https://github.com/storybooks/storybook/tree/master/packages/addon-actions",
+  "devDependencies": {
+    "@storybook/addons": "^3.0.0-alpha.0",
+    "@storybook/react": "^3.0.0-alpha.0",
+    "@storybook/ui": "^3.0.0-alpha.0",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
+    "react-test-renderer": "^15.5.4",
+    "shelljs": "^0.7.7"
+  },
+  "dependencies": {
+    "deep-equal": "^1.0.1",
+    "json-stringify-safe": "^5.0.1",
+    "prop-types": "^15.5.8",
+    "react-inspector": "^2.0.0"
+  },
+  "peerDependencies": {
+    "@storybook/addons": "^3.0.0-alpha.0",
+    "react": "*",
+    "react-dom": "*"
+  }
+}

Diff for: packages/addon-actions/docs/screenshot.png renamed to addons/actions/docs/screenshot.png

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import Inspector from '@storybook/react-inspector';
+import Inspector from 'react-inspector';
 import style from './style';
 
 class ActionLogger extends Component {

Diff for: packages/addon-actions/package.json renamed to addons/actions/package.json

@@ -1,5 +1,5 @@
 // addons, panels and events get unique names using a prefix
-export const ADDON_ID = 'kadirahq/storybook-addon-actions';
+export const ADDON_ID = 'storybook/addon-actions';
 export const PANEL_ID = `${ADDON_ID}/actions-panel`;
 export const EVENT_ID = `${ADDON_ID}/action-event`;
 

Diff for: packages/addon-actions/register.js renamed to addons/actions/register.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import addons from '@kadira/storybook-addons';
+import addons from '@storybook/addons';
 import ActionLogger from './containers/ActionLogger';
 import { ADDON_ID, PANEL_ID } from './';
 

Diff for: packages/addon-actions/src/components/ActionLogger/index.js renamed to addons/actions/src/components/ActionLogger/index.js

@@ -1,4 +1,4 @@
-import addons from '@kadira/storybook-addons';
+import addons from '@storybook/addons';
 import stringify from 'json-stringify-safe';
 import { EVENT_ID } from './';