Merge branch 'next' into tech/overhaul-ui

# Conflicts: # addons/a11y/package.json # addons/actions/package.json # addons/backgrounds/package.json # addons/cssresources/package.json # addons/events/package.json # addons/google-analytics/package.json # addons/info/package.json # addons/info/src/__snapshots__/index.test.js.snap # addons/jest/package.json # addons/knobs/package.json # addons/links/package.json # addons/notes/package.json # addons/storyshots/storyshots-core/package.json # addons/storyshots/storyshots-core/src/frameworks/vue/renderTree.js # addons/viewport/package.json # app/angular/package.json # app/ember/package.json # app/html/package.json # app/marko/package.json # app/mithril/package.json # app/polymer/package.json # app/react/package.json # app/riot/package.json # app/svelte/package.json # app/vue/package.json # examples/cra-kitchen-sink/package.json # examples/official-storybook/package.json # examples/preact-kitchen-sink/package.json # examples/vue-kitchen-sink/src/stories/__snapshots__/addon-centered.stories.storyshot # examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot # lib/addons/package.json # lib/channel-websocket/package.json # lib/components/package.json # lib/core/package.json # lib/ui/package.json # yarn.lock
pgoforth · Dec 21, 2018 · a2a7823 · a2a7823
2 parents a600edb + 99fe0a8
commit a2a7823
Show file tree

Hide file tree

Showing 81 changed files with 1,436 additions and 524 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 4.2.0-alpha.6 (December 20, 2018)
+
+### Features
+
+* React-Native: Change on-device layout to absolute position ([#4962](https://github.com/storybooks/storybook/pull/4962))
+* Addon-Info: add css classes for style overrides ([#4589](https://github.com/storybooks/storybook/pull/4589))
+
+### Bug Fixes
+
+* Addon-Info: Display description when story name matches component ([#4863](https://github.com/storybooks/storybook/pull/4863))
+* React-Native: Disable warning if story is not set in async storage ([#5068](https://github.com/storybooks/storybook/pull/5068))
+* React-Native: Fixed isUIHidden param ([#5067](https://github.com/storybooks/storybook/pull/5067))
+* Vue: Fix reloading and story decoration ([#5057](https://github.com/storybooks/storybook/pull/5057))
+
+### Maintenance
+
+* TypeScript: migrate @storybook/channels to typescript ([#4977](https://github.com/storybooks/storybook/pull/4977))
+
+### Dependency Upgrades
+
+* Bump babel-plugin-macros from 2.4.2 to 2.4.3 ([#5060](https://github.com/storybooks/storybook/pull/5060))
+* Bump @babel/core from 7.2.0 to 7.2.2 ([#5059](https://github.com/storybooks/storybook/pull/5059))
+* Bump ember-cli-htmlbars-inline-precompile from 1.0.5 to 2.1.0 ([#5064](https://github.com/storybooks/storybook/pull/5064))
+* Bump react-test-renderer from 16.6.3 to 16.7.0 ([#5063](https://github.com/storybooks/storybook/pull/5063))
+* Bump autoprefixer from 9.4.2 to 9.4.3 ([#5061](https://github.com/storybooks/storybook/pull/5061))
+
 ## 4.2.0-alpha.5 (December 19, 2018)
 
 ### Bug Fixes

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -26,10 +26,10 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/client-logger": "4.2.0-alpha.5",
-    "@storybook/components": "4.2.0-alpha.5",
-    "@storybook/core-events": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/client-logger": "4.2.0-alpha.6",
+    "@storybook/components": "4.2.0-alpha.6",
+    "@storybook/core-events": "4.2.0-alpha.6",
     "axe-core": "^3.1.2",
     "core-js": "^2.5.7",
     "react": "^16.7.0-alpha.2",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -22,9 +22,9 @@
   "dependencies": {
     "@emotion/core": "^10.0.2",
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/components": "4.2.0-alpha.5",
-    "@storybook/core-events": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/components": "4.2.0-alpha.6",
+    "@storybook/core-events": "4.2.0-alpha.6",
     "core-js": "^2.5.7",
     "emotion-theming": "^10.0.2",
     "fast-deep-equal": "^2.0.1",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -26,10 +26,10 @@
   "dependencies": {
     "@emotion/core": "^10.0.2",
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/components": "4.2.0-alpha.5",
-    "@storybook/client-logger": "4.2.0-alpha.5",
-    "@storybook/core-events": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/components": "4.2.0-alpha.6",
+    "@storybook/client-logger": "4.2.0-alpha.6",
+    "@storybook/core-events": "4.2.0-alpha.6",
     "core-js": "^2.5.7",
     "eventemitter3": "^3.1.0",
     "global": "^4.3.2",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",

diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "10.0.2",
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/components": "4.2.0-alpha.5",
-    "@storybook/core-events": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/components": "4.2.0-alpha.6",
+    "@storybook/core-events": "4.2.0-alpha.6",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/core-events": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/core-events": "4.2.0-alpha.6",
     "core-js": "^2.5.7",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.2",

diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/core-events": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/core-events": "4.2.0-alpha.6",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "react-ga": "^2.5.3"

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

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-alpha.6",
   "description": "A Storybook addon to show additional information for your stories.",
   "keywords": [
     "addon",
@@ -22,9 +22,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^10.0.2",
-    "@storybook/addons": "4.2.0-alpha.5",
-    "@storybook/client-logger": "4.2.0-alpha.5",
-    "@storybook/components": "4.2.0-alpha.5",
+    "@storybook/addons": "4.2.0-alpha.6",
+    "@storybook/client-logger": "4.2.0-alpha.6",
+    "@storybook/components": "4.2.0-alpha.6",
     "core-js": "^2.5.7",
     "global": "^4.3.2",
     "marksy": "^6.1.0",