Merge branch 'master' into feature/more-components

storybookjs · May 18, 2018 · 43279a3 · 43279a3
2 parents 7d971b8 + 54bc624
commit 43279a3
Show file tree

Hide file tree

Showing 62 changed files with 835 additions and 798 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,35 @@
+# 4.0.0-alpha.7
+
+2018-May-17
+
+#### Breaking Changes
+
+-   Support webpack4 modules format [#3576](https://github.com/storybooks/storybook/pull/3576)
+
+#### Features
+
+-   Addon-centered for Angular [#3573](https://github.com/storybooks/storybook/pull/3573)
+
+#### Maintenance
+
+-   Generic addon decorators [#3555](https://github.com/storybooks/storybook/pull/3555)
+-   Refactor transitional decorator from addon-notes [#3559](https://github.com/storybooks/storybook/pull/3559)
+
+# 3.4.5
+
+2018-May-17
+
+#### Features
+
+-   Addon-info: improve prop options [#3428](https://github.com/storybooks/storybook/pull/3428)
+
+#### Bug Fixes
+
+-   Addon-storysource: Remove nested braces in code block [#3568](https://github.com/storybooks/storybook/pull/3568)
+-   Addon-info: Fix double quotes in prop table, add additional examples [#3401](https://github.com/storybooks/storybook/pull/3401)
+-   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)
+
 # 4.0.0-alpha.6
 
 2018-May-12

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.6",
+  "version": "4.0.0-alpha.7",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,10 +25,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@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",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/client-logger": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "axe-core": "^3.0.2",
     "babel-runtime": "^6.26.0",
     "emotion": "^9.1.3",

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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -20,9 +20,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/components": "4.0.0-alpha.6",
-    "@storybook/core-events": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "emotion": "^9.1.3",

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.6",
+  "version": "4.0.0-alpha.7",
   "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.6",
-    "@storybook/core-events": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "emotion": "^9.1.3",
     "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.0.0-alpha.6",
+  "version": "4.0.0-alpha.7",
   "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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -19,14 +19,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/core-events": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "emotion": "^9.1.3",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.1",
     "react-emotion": "^9.1.3",
-    "react-lifecycles-compat": "^3.0.2",
+    "react-lifecycles-compat": "^3.0.4",
     "react-textarea-autosize": "^6.1.0",
     "util-deprecate": "^1.0.2"
   },

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.6",
+  "version": "4.0.0-alpha.7",
   "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.6",
+  "version": "4.0.0-alpha.7",
   "description": "A Storybook addon to show additional information for your stories.",
   "repository": {
     "type": "git",
@@ -13,8 +13,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/client-logger": "4.0.0-alpha.6",
-    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/client-logger": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "core-js": "2.5.6",
     "emotion": "^9.1.3",
@@ -24,7 +24,7 @@
     "prop-types": "^15.6.1",
     "react-addons-create-fragment": "^15.5.3",
     "react-emotion": "^9.1.3",
-    "react-lifecycles-compat": "^3.0.2",
+    "react-lifecycles-compat": "^3.0.4",
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {

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.6",
+  "version": "4.0.0-alpha.7",
   "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.6",
-    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "emotion": "^9.1.3",
     "global": "^4.3.2",

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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Storybook Addon Prop Editor Component",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/components": "4.0.0-alpha.6",
-    "@storybook/core-events": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "escape-html": "^1.0.3",
@@ -27,7 +27,7 @@
     "react-color": "^2.14.1",
     "react-datetime": "^2.14.0",
     "react-emotion": "^9.1.3",
-    "react-lifecycles-compat": "^3.0.2",
+    "react-lifecycles-compat": "^3.0.4",
     "react-textarea-autosize": "^6.1.0",
     "util-deprecate": "^1.0.2"
   },

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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -20,9 +20,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/components": "4.0.0-alpha.6",
-    "@storybook/core-events": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "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.6",
+  "version": "4.0.0-alpha.7",
   "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.6",
+    "@storybook/addons": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "emotion": "^9.1.3",
     "marked": "^0.3.19",

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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"
@@ -19,7 +19,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
     "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.6",
+  "version": "4.0.0-alpha.7",
   "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
   "repository": {
     "type": "git",
@@ -16,22 +16,22 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/core": "4.0.0-alpha.6",
-    "@storybook/node-logger": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/core": "4.0.0-alpha.7",
+    "@storybook/node-logger": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "glob": "^7.1.2",
     "global": "^4.3.2",
     "jest-image-snapshot": "^2.4.1",
     "jest-specific-snapshot": "^0.5.0",
-    "puppeteer": "^1.3.0",
+    "puppeteer": "^1.4.0",
     "read-pkg-up": "^3.0.0"
   },
   "devDependencies": {
-    "@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",
+    "@storybook/addon-actions": "4.0.0-alpha.7",
+    "@storybook/addon-links": "4.0.0-alpha.7",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/react": "4.0.0-alpha.7",
     "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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Stories addon for storybook",
   "keywords": [
     "storybook"
@@ -20,8 +20,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/components": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
     "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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Storybook addon to change the viewport size to mobile",
   "keywords": [
     "storybook"
@@ -11,9 +11,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.6",
-    "@storybook/components": "4.0.0-alpha.6",
-    "@storybook/core-events": "4.0.0-alpha.6",
+    "@storybook/addons": "4.0.0-alpha.7",
+    "@storybook/components": "4.0.0-alpha.7",
+    "@storybook/core-events": "4.0.0-alpha.7",
     "babel-runtime": "^6.26.0",
     "emotion": "^9.1.3",
     "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.6",
+  "version": "4.0.0-alpha.7",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/angular",
   "bugs": {
@@ -22,14 +22,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/core": "4.0.0-alpha.6",
-    "@storybook/node-logger": "4.0.0-alpha.6",
+    "@storybook/core": "4.0.0-alpha.7",
+    "@storybook/node-logger": "4.0.0-alpha.7",
     "@storybook/react-dev-utils": "^5.0.0",
     "airbnb-js-shims": "^1.4.1",
     "angular2-template-loader": "^0.6.2",
     "babel-loader": "^7.1.4",
-    "babel-plugin-macros": "^2.2.0",
-    "babel-preset-env": "^1.6.0",
+    "babel-plugin-macros": "^2.2.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.23.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
@@ -39,9 +39,9 @@
     "html-webpack-plugin": "^3.2.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^7.0.1",
-    "ts-loader": "^4.2.0",
-    "webpack": "^4.8.0",
-    "webpack-hot-middleware": "^2.22.1",
+    "ts-loader": "^4.3.0",
+    "webpack": "^4.8.3",
+    "webpack-hot-middleware": "^2.22.2",
     "zone.js": "^0.8.26"
   },
   "peerDependencies": {