Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dependencies.io-upd…
Browse files Browse the repository at this point in the history
…ate-build-341.0.0

# Conflicts:
#	lib/core/package.json
  • Loading branch information
Hypnosphi committed May 18, 2018
2 parents 7d83141 + 1facf93 commit 7d918df
Show file tree
Hide file tree
Showing 59 changed files with 320 additions and 288 deletions.
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
"glamor": "^2.20.40",
Expand Down
8 changes: 4 additions & 4 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
"glamor": "^2.20.40",
Expand Down
6 changes: 3 additions & 3 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
"global": "^4.3.2",
"prop-types": "^15.6.1",
Expand Down
2 changes: 1 addition & 1 deletion addons/centered/package.json
Original file line number Diff line number Diff line change
@@ -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 <mnmtanish@gmail.com>",
Expand Down
6 changes: 3 additions & 3 deletions addons/events/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -19,8 +19,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",
"format-json": "^1.0.3",
"prop-types": "^15.6.1",
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions addons/info/package.json
Original file line number Diff line number Diff line change
@@ -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.",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -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",
"glamor": "^2.20.40",
Expand Down
6 changes: 3 additions & 3 deletions addons/jest/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
"glamor": "^2.20.40",
"glamorous": "^4.13.0",
Expand Down
8 changes: 4 additions & 4 deletions addons/knobs/package.json
Original file line number Diff line number Diff line change
@@ -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",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions addons/links/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions addons/notes/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
"marked": "^0.3.19",
"prop-types": "^15.6.1",
Expand Down
4 changes: 2 additions & 2 deletions addons/options/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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": {
Expand Down
16 changes: 8 additions & 8 deletions addons/storyshots/package.json
Original file line number Diff line number Diff line change
@@ -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.",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -16,9 +16,9 @@
"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",
Expand All @@ -28,10 +28,10 @@
"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"
},
Expand Down
6 changes: 3 additions & 3 deletions addons/storysource/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions addons/viewport/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
"global": "^4.3.2",
"lodash.debounce": "^4.0.8",
Expand Down
6 changes: 3 additions & 3 deletions app/angular/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -22,8 +22,8 @@
"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",
Expand Down
4 changes: 2 additions & 2 deletions app/html/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/html",
"version": "4.0.0-alpha.6",
"version": "4.0.0-alpha.7",
"description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/apps/html",
"bugs": {
Expand All @@ -21,7 +21,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/core": "4.0.0-alpha.6",
"@storybook/core": "4.0.0-alpha.7",
"@storybook/react-dev-utils": "^5.0.0",
"airbnb-js-shims": "^1.4.1",
"babel-loader": "^7.1.4",
Expand Down
14 changes: 7 additions & 7 deletions app/marko/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/marko",
"version": "4.0.0-alpha.6",
"version": "4.0.0-alpha.7",
"description": "Storybook for Marko: Develop Marko Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/app/marko",
"bugs": {
Expand All @@ -22,12 +22,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "4.0.0-alpha.6",
"@storybook/channel-postmessage": "4.0.0-alpha.6",
"@storybook/client-logger": "4.0.0-alpha.6",
"@storybook/core": "4.0.0-alpha.6",
"@storybook/node-logger": "4.0.0-alpha.6",
"@storybook/ui": "4.0.0-alpha.6",
"@storybook/addons": "4.0.0-alpha.7",
"@storybook/channel-postmessage": "4.0.0-alpha.7",
"@storybook/client-logger": "4.0.0-alpha.7",
"@storybook/core": "4.0.0-alpha.7",
"@storybook/node-logger": "4.0.0-alpha.7",
"@storybook/ui": "4.0.0-alpha.7",
"airbnb-js-shims": "^1.4.1",
"babel-loader": "^7.1.4",
"babel-plugin-macros": "^2.2.1",
Expand Down

0 comments on commit 7d918df

Please sign in to comment.