Merge remote-tracking branch 'origin/master' into generic-addon-decor…

…ators # Conflicts: # addons/viewport/package.json
storybookjs · May 12, 2018 · 7b19079 · 7b19079
2 parents 06101ef + 44bee5a
commit 7b19079
Show file tree

Hide file tree

Showing 59 changed files with 334 additions and 291 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,46 @@
+# 4.0.0-alpha.6
+
+2018-May-12
+
+#### Breaking Changes
+
+-   Fix the import of external md files [#3472](https://github.com/storybooks/storybook/pull/3472)
+
+#### Features
+
+-   Add marko support to storybooksJS [#3504](https://github.com/storybooks/storybook/pull/3504)
+-   Storybook addon Jest angular suport [#3532](https://github.com/storybooks/storybook/pull/3532)
+-   Storybook for HTML snippets [#3475](https://github.com/storybooks/storybook/pull/3475)
+-   Feature/config custom chrome executable path [#3518](https://github.com/storybooks/storybook/pull/3518)
+-   Channel-postmessage: handle events from the same window [#3519](https://github.com/storybooks/storybook/pull/3519)
+-   Force re-render event [#3515](https://github.com/storybooks/storybook/pull/3515)
+
+#### Bug Fixes
+
+-   Ignore any unstructured output from the package managers [#3563](https://github.com/storybooks/storybook/pull/3563)
+-   Use the --use-npm flag also for version checking [#3535](https://github.com/storybooks/storybook/pull/3535)
+-   Clean out the store if `configure` fails [#3558](https://github.com/storybooks/storybook/pull/3558)
+-   Fix render order in preview [#3520](https://github.com/storybooks/storybook/pull/3520)
+
+# 4.0.0-alpha.5
+
+Broken release (@storybook/core-events had not been published publicly)
+
+# 3.4.4
+
+2018-May-12
+
+#### Bug Fixes
+
+-   Ignore home package.json no license field [#3531](https://github.com/storybooks/storybook/pull/3531)
+-   fixed Duplicate declaration h [#3409](https://github.com/storybooks/storybook/pull/3409)
+-   Storyshots integrity tests options [#3418](https://github.com/storybooks/storybook/pull/3418)
+-   Fix dynamic knobs [d2a289e](https://github.com/storybooks/storybook/commit/d2a289e524c51e794f5f3a34164a69ba3d5409fa)
+
+#### Dependency Upgrades
+
+-   jest-image-snapshot version to ^2.4.1 [#3500](https://github.com/storybooks/storybook/pull/3500)
+
 # 4.0.0-alpha.4
 
 2018-April-27

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,10 +25,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/client-logger": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
-    "@storybook/core-events": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/client-logger": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/core-events": "4.0.0-alpha.6",
     "axe-core": "^3.0.2",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -20,9 +20,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
-    "@storybook/core-events": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/core-events": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "glamor": "^2.20.40",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -24,8 +24,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/core-events": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/core-events": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.1",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <[email protected]>",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -19,8 +19,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/core-events": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/core-events": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.1",

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

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "A Storybook addon to show additional information for your stories.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -13,8 +13,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/client-logger": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
+    "@storybook/client-logger": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "core-js": "2.5.6",
     "glamor": "^2.20.40",

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -25,8 +25,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
     "glamorous": "^4.12.5",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Storybook Addon Prop Editor Component",
   "license": "MIT",
   "main": "dist/index.js",
@@ -13,9 +13,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
-    "@storybook/core-events": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/core-events": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "escape-html": "^1.0.3",

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -20,9 +20,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
-    "@storybook/core-events": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/core-events": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.1"

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -18,7 +18,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "marked": "^0.3.19",
     "prop-types": "^15.6.1",

diff --git a/addons/options/package.json b/addons/options/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"
@@ -19,7 +19,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0"
   },
   "peerDependencies": {

diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storyshots",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -16,9 +16,9 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/core": "4.0.0-alpha.4",
-    "@storybook/node-logger": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/core": "4.0.0-alpha.6",
+    "@storybook/node-logger": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "glob": "^7.1.2",
     "global": "^4.3.2",
@@ -28,10 +28,10 @@
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "4.0.0-alpha.4",
-    "@storybook/addon-links": "4.0.0-alpha.4",
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/react": "4.0.0-alpha.4",
+    "@storybook/addon-actions": "4.0.0-alpha.6",
+    "@storybook/addon-links": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/react": "4.0.0-alpha.6",
     "enzyme-to-json": "^3.3.3",
     "react": "^16.3.2"
   },

diff --git a/addons/storysource/package.json b/addons/storysource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-storysource",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Stories addon for storybook",
   "keywords": [
     "storybook"
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
     "babel-runtime": "^6.26.0",
     "estraverse": "^4.2.0",
     "loader-utils": "^1.1.0",

diff --git a/addons/viewport/package.json b/addons/viewport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-viewport",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Storybook addon to change the viewport size to mobile",
   "keywords": [
     "storybook"
@@ -11,8 +11,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.4",
-    "@storybook/components": "4.0.0-alpha.4",
+    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/components": "4.0.0-alpha.6",
     "@storybook/core-events": "4.0.0-alpha.4",
     "babel-runtime": "^6.26.0",
     "global": "^4.3.2",

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular",
   "bugs": {
@@ -22,8 +22,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "4.0.0-alpha.4",
-    "@storybook/node-logger": "4.0.0-alpha.4",
+    "@storybook/core": "4.0.0-alpha.6",
+    "@storybook/node-logger": "4.0.0-alpha.6",
     "@storybook/react-dev-utils": "^5.0.0",
     "airbnb-js-shims": "^1.4.1",
     "angular2-template-loader": "^0.6.2",

diff --git a/app/html/package.json b/app/html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/html",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.6",
   "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/html",
   "bugs": {
@@ -21,7 +21,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "4.0.0-alpha.4",
+    "@storybook/core": "4.0.0-alpha.6",
     "@storybook/react-dev-utils": "^5.0.0",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.4",