Merge branch 'release/3.3' into dd/auto-import

storybookjs · Oct 31, 2017 · 1d0d679 · 1d0d679
2 parents e984abd + d42e4c1
commit 1d0d679
Show file tree

Hide file tree

Showing 73 changed files with 6,353 additions and 5,576 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -78,6 +78,9 @@ jobs:
       - run:
           name: Integration Test - Kichen sinks
           command: yarn test --integration
+      - store_artifacts:
+          path: integration/__image_snapshots__
+          destination: integration_image_snapshots
   example-react-native:
     <<: *defaults
     steps:

diff --git a/.github/stale.yml b/.github/stale.yml
@@ -0,0 +1,26 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 85
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 5
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - bug
+  - 'help wanted'
+  - 'in progress'
+  - 'do not merge'
+  - 'needs review'
+
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Hi everyone! Seems like there hasn't been much going on in this issue lately.
+  If there are still questions, comments, or bugs, please feel free to continue
+  the discussion. We do try to do some housekeeping every once in a while so
+  inactive issues will get closed after 90 days. Thanks!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  Hey there, it's me again! I am going to help our maintainers close this issue
+  so they can focus on development efforts instead. If the issue mentioned is
+  still a concern, please open a new ticket and mention this old one. Cheers
+  and thanks for using Storybook!
diff --git a/README.md b/README.md
@@ -44,6 +44,8 @@ cd my-react-app
 getstorybook
 ```
 
+The `-g` global install is used to run our cli tool in your project directory to generate templates for your existing projects. To avoid the global install and start your project manually, take a look at our [Slow Start Guide](https://storybook.js.org/basics/slow-start-guide/).
+
 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.
 
 **Storybook v2.x migration note**: If you're using Storybook v2.x and want to shift to 3.x version the easiest way is:

diff --git a/addons/actions/CHANGELOG.md b/addons/actions/CHANGELOG.md
diff --git a/addons/centered/CHANGELOG.md b/addons/centered/CHANGELOG.md
diff --git a/addons/comments/CHANGELOG.md b/addons/comments/CHANGELOG.md
diff --git a/addons/events/CHANGELOG.md b/addons/events/CHANGELOG.md
diff --git a/addons/graphql/CHANGELOG.md b/addons/graphql/CHANGELOG.md
diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "global": "^4.3.2",
-    "graphiql": "^0.11.6",
+    "graphiql": "^0.11.10",
     "graphql": "^0.11.7",
     "prop-types": "^15.6.0"
   },

diff --git a/addons/info/CHANGELOG.md b/addons/info/CHANGELOG.md