Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/storybooks/storybook into…
Browse files Browse the repository at this point in the history
… change-ng-stories-dir
  • Loading branch information
Quramy committed Jan 8, 2018
2 parents 5473d29 + c6a841e commit 52078a4
Show file tree
Hide file tree
Showing 57 changed files with 302 additions and 273 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 3.3.5

2018-January-08

#### Bug Fixes

- Remove src from individual .npmignore files [#2677](https://github.com/storybooks/storybook/pull/2677)

# 3.4.0-alpha.0

2018-January-07
Expand All @@ -16,10 +24,12 @@
<summary>
4 PRs
</summary>

- Update webpack extend warning. [#2660](https://github.com/storybooks/storybook/pull/2660)
- ADD demo images to a new img folder with the documentation site [#2644](https://github.com/storybooks/storybook/pull/2644)
- write doc about .css/.scss rules for Angular [#2634](https://github.com/storybooks/storybook/pull/2634)
- Updated documentation wrt ejs exclusion [#2633](https://github.com/storybooks/storybook/pull/2633)

</details>

#### Maintenance
Expand All @@ -28,10 +38,12 @@
<summary>
4 PRs
</summary>

- Only update CLI snapsots on postpublish script, skip smoke tests [#2671](https://github.com/storybooks/storybook/pull/2671)
- Fix the timezone for example dates [#2654](https://github.com/storybooks/storybook/pull/2654)
- Update prereq yarn install level [#2638](https://github.com/storybooks/storybook/pull/2638)
- Separate stories in angular-cli example [#2592](https://github.com/storybooks/storybook/pull/2592)

</details>

#### Dependency Upgrades
Expand Down
4 changes: 2 additions & 2 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "a11y addon for storybook",
"keywords": [
"a11y",
Expand All @@ -25,7 +25,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/components": "^3.3.4",
"@storybook/components": "^3.4.0-alpha.0",
"axe-core": "^2.6.1",
"prop-types": "^15.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Action Logger addon for storybook",
"keywords": [
"storybook"
Expand Down
2 changes: 1 addition & 1 deletion addons/background/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "A storybook addon to show different backgrounds for your preview",
"keywords": [
"addon",
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": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Storybook decorator to center components",
"license": "MIT",
"author": "Muhammed Thanish <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion addons/events/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-events",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Add events to your Storybook stories.",
"keywords": [
"addon",
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": "3.3.4",
"version": "3.4.0-alpha.0",
"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": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "A Storybook addon to show additional information for your stories.",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -15,8 +15,8 @@
"storybook": "start-storybook -p 9010"
},
"dependencies": {
"@storybook/client-logger": "^3.3.4",
"@storybook/components": "^3.3.4",
"@storybook/client-logger": "^3.4.0-alpha.0",
"@storybook/components": "^3.4.0-alpha.0",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"marksy": "^6.0.3",
Expand Down
4 changes: 2 additions & 2 deletions addons/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-jest",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand All @@ -25,7 +25,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/components": "^3.3.4",
"@storybook/components": "^3.4.0-alpha.0",
"glamor": "^2.20.40",
"glamorous": "^4.11.2",
"global": "^4.3.2",
Expand Down
1 change: 0 additions & 1 deletion addons/knobs/.npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
src
.babelrc
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-knobs",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Storybook Addon Prop Editor Component",
"license": "MIT",
"main": "dist/index.js",
Expand Down
4 changes: 2 additions & 2 deletions addons/links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-links",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Story Links addon for storybook",
"keywords": [
"storybook"
Expand All @@ -22,7 +22,7 @@
"storybook": "start-storybook -p 9001"
},
"dependencies": {
"@storybook/components": "^3.3.4",
"@storybook/components": "^3.4.0-alpha.0",
"global": "^4.3.2",
"prop-types": "^15.5.10"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/notes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-notes",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Write notes for your Storybook stories.",
"keywords": [
"addon",
Expand Down
2 changes: 1 addition & 1 deletion addons/options/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-options",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Options addon for storybook",
"keywords": [
"storybook"
Expand Down
1 change: 0 additions & 1 deletion addons/storyshots/.npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
src
.babelrc
10 changes: 5 additions & 5 deletions addons/storyshots/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-storyshots",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -16,7 +16,7 @@
"example": "jest storyshot.test"
},
"dependencies": {
"@storybook/channels": "^3.3.4",
"@storybook/channels": "^3.4.0-alpha.0",
"babel-runtime": "^6.26.0",
"glob": "^7.1.2",
"global": "^4.3.2",
Expand All @@ -25,8 +25,8 @@
"read-pkg-up": "^3.0.0"
},
"devDependencies": {
"@storybook/addons": "^3.3.4",
"@storybook/react": "^3.3.4",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/react": "^3.4.0-alpha.0",
"babel-cli": "^6.26.0",
"babel-jest": "^20.0.3",
"babel-plugin-transform-runtime": "^6.23.0",
Expand All @@ -40,7 +40,7 @@
"react-dom": "^16.1.0"
},
"peerDependencies": {
"@storybook/addons": "^3.3.4",
"@storybook/addons": "^3.4.0-alpha.0",
"babel-core": "^6.26.0 || ^7.0.0-0",
"react": "*",
"react-test-renderer": "*"
Expand Down
4 changes: 2 additions & 2 deletions addons/viewport/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-viewport",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Storybook addon to change the viewport size to mobile",
"main": "register.js",
"keywords": [
Expand All @@ -11,7 +11,7 @@
},
"license": "MIT",
"dependencies": {
"@storybook/components": "^3.3.4",
"@storybook/components": "^3.4.0-alpha.0",
"global": "^4.3.2",
"prop-types": "^15.5.10"
},
Expand Down
1 change: 0 additions & 1 deletion app/angular/.npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
docs
src
.babelrc
14 changes: 7 additions & 7 deletions app/angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/angular",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"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 @@ -23,12 +23,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "^3.3.4",
"@storybook/addon-links": "^3.3.4",
"@storybook/addons": "^3.3.4",
"@storybook/channel-postmessage": "^3.3.4",
"@storybook/core": "^3.3.4",
"@storybook/ui": "^3.3.4",
"@storybook/addon-actions": "^3.4.0-alpha.0",
"@storybook/addon-links": "^3.4.0-alpha.0",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/channel-postmessage": "^3.4.0-alpha.0",
"@storybook/core": "^3.4.0-alpha.0",
"@storybook/ui": "^3.4.0-alpha.0",
"airbnb-js-shims": "^1.1.1",
"angular2-template-loader": "^0.6.2",
"autoprefixer": "^7.2.4",
Expand Down
1 change: 0 additions & 1 deletion app/react-native/.npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
docs
src
.babelrc
14 changes: 7 additions & 7 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/react-native",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "A better way to develop React Native Components for your app",
"keywords": [
"react",
Expand All @@ -25,12 +25,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "^3.3.4",
"@storybook/addon-links": "^3.3.4",
"@storybook/addons": "^3.3.4",
"@storybook/channel-websocket": "^3.3.4",
"@storybook/core": "^3.3.4",
"@storybook/ui": "^3.3.4",
"@storybook/addon-actions": "^3.4.0-alpha.0",
"@storybook/addon-links": "^3.4.0-alpha.0",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/channel-websocket": "^3.4.0-alpha.0",
"@storybook/core": "^3.4.0-alpha.0",
"@storybook/ui": "^3.4.0-alpha.0",
"autoprefixer": "^7.2.4",
"babel-loader": "^7.1.2",
"babel-plugin-syntax-async-functions": "^6.13.0",
Expand Down
1 change: 0 additions & 1 deletion app/react/.npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
docs
src
.babelrc
18 changes: 9 additions & 9 deletions app/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/react",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Storybook for React: Develop React Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/app/react",
"bugs": {
Expand All @@ -23,14 +23,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "^3.3.4",
"@storybook/addon-links": "^3.3.4",
"@storybook/addons": "^3.3.4",
"@storybook/channel-postmessage": "^3.3.4",
"@storybook/client-logger": "^3.3.4",
"@storybook/core": "^3.3.4",
"@storybook/node-logger": "^3.3.4",
"@storybook/ui": "^3.3.4",
"@storybook/addon-actions": "^3.4.0-alpha.0",
"@storybook/addon-links": "^3.4.0-alpha.0",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/channel-postmessage": "^3.4.0-alpha.0",
"@storybook/client-logger": "^3.4.0-alpha.0",
"@storybook/core": "^3.4.0-alpha.0",
"@storybook/node-logger": "^3.4.0-alpha.0",
"@storybook/ui": "^3.4.0-alpha.0",
"airbnb-js-shims": "^1.4.0",
"autoprefixer": "^7.2.4",
"babel-loader": "^7.1.2",
Expand Down
1 change: 0 additions & 1 deletion app/vue/.npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
docs
src
.babelrc
14 changes: 7 additions & 7 deletions app/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/vue",
"version": "3.3.4",
"version": "3.4.0-alpha.0",
"description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.",
"homepage": "https://github.com/storybooks/storybook/tree/master/apps/vue",
"bugs": {
Expand All @@ -23,12 +23,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "^3.3.4",
"@storybook/addon-links": "^3.3.4",
"@storybook/addons": "^3.3.4",
"@storybook/channel-postmessage": "^3.3.4",
"@storybook/core": "^3.3.4",
"@storybook/ui": "^3.3.4",
"@storybook/addon-actions": "^3.4.0-alpha.0",
"@storybook/addon-links": "^3.4.0-alpha.0",
"@storybook/addons": "^3.4.0-alpha.0",
"@storybook/channel-postmessage": "^3.4.0-alpha.0",
"@storybook/core": "^3.4.0-alpha.0",
"@storybook/ui": "^3.4.0-alpha.0",
"airbnb-js-shims": "^1.4.0",
"autoprefixer": "^7.2.4",
"babel-loader": "^7.1.2",
Expand Down
8 changes: 4 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"storybook": "start-storybook -p 9009 -s src/pages"
},
"dependencies": {
"@storybook/addon-actions": "^3.3.3",
"@storybook/addon-links": "^3.3.3",
"@storybook/addons": "^3.3.3",
"@storybook/react": "^3.3.3",
"@storybook/addon-actions": "^3.3.4",
"@storybook/addon-links": "^3.3.4",
"@storybook/addons": "^3.3.4",
"@storybook/react": "^3.3.4",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-loader": "^6.4.1",
Expand Down
Loading

0 comments on commit 52078a4

Please sign in to comment.