Merge pull request storybookjs#4725 from storybooks/release/4.0

Get release/4.0 changes into next

.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt

@@ -6,7 +6,7 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot
 object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster : GitVcsRoot({
     uuid = "cec03c4b-d52c-42a0-8e9e-53bde85d6b33"
     id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster"
-    name = "https://github.com/storybooks/storybook#refs/heads/master"
+    name = "Main root"
     url = "git@github.com:storybooks/storybook.git"
     branch = "refs/heads/next"
     branchSpec = """

RELEASES.md

@@ -114,4 +114,5 @@ in a patch release.
 #### How does my PR get merged?
 
 - For PATCH PR's, any maintainer can review, test, approve, and merge it.
+- For MINOR/MAJOR PR's, once a maintainer reviews, tests, and approves it, s/he should clear it with the other maintainers before merging it into the release branch.
 - Once a release date has been set and we cut off merging, we'll create a temporary branch to hold that release so that it doesn't block merging to `next`.

addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/client-logger": "4.0.0",
-    "@storybook/components": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/client-logger": "4.0.2",
+    "@storybook/components": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "axe-core": "^3.1.2",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"

addons/actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -26,9 +26,9 @@
     "@emotion/core": "^0.13.1",
     "@emotion/provider": "^0.11.2",
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/components": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/components": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
     "lodash": "^4.17.11",

addons/backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "util-deprecate": "^1.0.2"

addons/centered/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",

addons/events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.2",
     "react-lifecycles-compat": "^3.0.4",

addons/google-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -24,7 +24,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "global": "^4.3.2",
     "react-ga": "^2.5.3"
   }

addons/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",

addons/info/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "A Storybook addon to show additional information for your stories.",
   "keywords": [
     "addon",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/client-logger": "4.0.0",
-    "@storybook/components": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/client-logger": "4.0.2",
+    "@storybook/components": "4.0.2",
     "core-js": "2.5.7",
     "global": "^4.3.2",
     "marksy": "^6.1.0",

addons/jest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/components": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/components": "4.0.2",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "upath": "^1.1.0",

addons/knobs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/components": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/components": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "copy-to-clipboard": "^3.0.8",
     "escape-html": "^1.0.3",
     "fast-deep-equal": "^2.0.1",

addons/links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Story Links addon for storybook",
   "keywords": [
     "addon",
@@ -24,9 +24,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0",
-    "@storybook/components": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/components": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"
   },

addons/notes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "marked": "^0.5.1",
     "prop-types": "^15.6.2"
   },

addons/ondevice-backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-backgrounds",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -26,7 +26,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "prop-types": "^15.6.2"
   },
   "peerDependencies": {

addons/ondevice-knobs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-knobs",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Display storybook story knobs on your deviced.",
   "keywords": [
     "addon",
@@ -23,7 +23,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "deep-equal": "^1.0.1",
     "prop-types": "^15.6.2",
     "react-native-color-picker": "^0.4.0",

addons/ondevice-notes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-notes",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -21,7 +21,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "prop-types": "^15.6.2",
     "react-native-simple-markdown": "^1.1.0"
   },

addons/options/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Options addon for storybook",
   "keywords": [
     "addon",
@@ -23,7 +23,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "util-deprecate": "^1.0.2"
   },
   "peerDependencies": {

addons/storyshots/storyshots-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "keywords": [
     "addon",
@@ -28,17 +28,17 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@storybook/addons": "4.0.0",
+    "@storybook/addons": "4.0.2",
     "glob": "^7.1.3",
     "global": "^4.3.2",
     "jest-specific-snapshot": "^1.0.0",
     "read-pkg-up": "^4.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "4.0.0",
-    "@storybook/addon-links": "4.0.0",
+    "@storybook/addon-actions": "4.0.2",
+    "@storybook/addon-links": "4.0.2",
     "@storybook/addons": "4.0.0",
-    "@storybook/react": "4.0.0",
+    "@storybook/react": "4.0.2",
     "enzyme-to-json": "^3.3.4",
     "react": "^16.6.0"
   }

addons/storyshots/storyshots-puppeteer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots-puppeteer",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Image snappshots addition to StoryShots base on puppeteer",
   "keywords": [
     "addon",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@storybook/node-logger": "4.0.0",
+    "@storybook/node-logger": "4.0.2",
     "jest-image-snapshot": "^2.6.0",
     "puppeteer": "^1.9.0"
   },

addons/storysource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Stories addon for storybook",
   "keywords": [
     "addon",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@storybook/addons": "4.0.0",
-    "@storybook/components": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/components": "4.0.2",
     "estraverse": "^4.2.0",
     "loader-utils": "^1.1.0",
     "prettier": "^1.14.3",

addons/viewport/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Storybook addon to change the viewport size to mobile",
   "keywords": [
     "addon",
@@ -24,9 +24,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0",
-    "@storybook/components": "4.0.0",
-    "@storybook/core-events": "4.0.0",
+    "@storybook/addons": "4.0.2",
+    "@storybook/components": "4.0.2",
+    "@storybook/core-events": "4.0.2",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "util-deprecate": "^1.0.2"