Skip to content

Commit

Permalink
Merge branch 'next' into tech/router
Browse files Browse the repository at this point in the history
  • Loading branch information
@ndelangen
ndelangen committed Jan 17, 2019
2 parents d6a69fa + 5f407a1 commit 4e880b5
Show file tree
Hide file tree
Showing 52 changed files with 3,417 additions and 645 deletions.
2 changes: 1 addition & 1 deletion addons/a11y/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"axe-core": "^3.1.2",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"memoizerific": "^1.11.3",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@storybook/components": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"fast-deep-equal": "^2.0.1",
"global": "^4.3.2",
"lodash": "^4.17.11",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@storybook/components": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"eventemitter3": "^3.1.0",
"global": "^4.3.2",
"memoizerific": "^1.11.3",
Expand Down
2 changes: 1 addition & 1 deletion addons/centered/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions addons/cssresources/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "10.0.5",
"@emotion/styled": "10.0.6",
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/components": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"prop-types": "^15.6.2",
"react": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/events/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"format-json": "^1.0.3",
"prop-types": "^15.6.2",
"react": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/google-analytics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react-ga": "^2.5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"graphiql": "^0.12.0",
"graphql": "^14.0.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/info/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@storybook/client-logger": "5.0.0-alpha.5",
"@storybook/components": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"marksy": "^6.1.0",
"nested-object-assign": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion addons/jest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@storybook/components": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"prop-types": "^15.6.2",
"react": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"copy-to-clipboard": "^3.0.8",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"escape-html": "^1.0.3",
"fast-deep-equal": "^2.0.1",
"global": "^4.3.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"prop-types": "^15.6.2",
"qs": "^6.5.2"
Expand Down
2 changes: 1 addition & 1 deletion addons/ondevice-backgrounds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"prop-types": "^15.6.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion addons/ondevice-knobs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"deep-equal": "^1.0.1",
"prop-types": "^15.6.2",
"react-native-color-picker": "^0.4.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/ondevice-notes/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"prop-types": "^15.6.2",
"react-native-simple-markdown": "^1.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/options/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"util-deprecate": "^1.0.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"glob": "^7.1.3",
"global": "^4.3.2",
"jest-specific-snapshot": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-puppeteer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@storybook/core": "5.0.0-alpha.5",
"@storybook/node-logger": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"jest-image-snapshot": "^2.6.0",
"puppeteer": "^1.11.0",
"regenerator-runtime": "^0.12.1"
Expand Down
2 changes: 1 addition & 1 deletion addons/storysource/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/components": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"estraverse": "^4.2.0",
"loader-utils": "^1.2.1",
"prettier": "^1.14.3",
Expand Down
2 changes: 1 addition & 1 deletion addons/viewport/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@storybook/components": "5.0.0-alpha.5",
"@storybook/core-events": "5.0.0-alpha.5",
"@storybook/theming": "5.0.0-alpha.5",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"memoizerific": "^1.11.3",
"prop-types": "^15.6.2",
Expand Down
6 changes: 3 additions & 3 deletions app/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@storybook/core": "5.0.0-alpha.5",
"@storybook/node-logger": "5.0.0-alpha.5",
"angular2-template-loader": "^0.6.2",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"fork-ts-checker-webpack-plugin": "^0.5.2",
"global": "^4.3.2",
"react": "^16.7.0",
Expand All @@ -37,10 +37,10 @@
"sass-loader": "^7.1.0",
"ts-loader": "^5.3.2",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"webpack": "^4.28.3"
"webpack": "^4.28.4"
},
"devDependencies": {
"zone.js": "^0.8.27"
"zone.js": "^0.8.28"
},
"peerDependencies": {
"@angular-devkit/core": "^0.6.1 || >=7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion app/ember/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@ember/test-helpers": "^1.0.0",
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion app/html/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dependencies": {
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"react": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion app/marko/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"marko-loader": "^1.3.3",
"raw-loader": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion app/mithril/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@babel/plugin-transform-react-jsx": "^7.2.0",
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down
4 changes: 2 additions & 2 deletions app/polymer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"@storybook/core": "5.0.0-alpha.5",
"@webcomponents/webcomponentsjs": "^1.2.0",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"regenerator-runtime": "^0.12.1",
"webpack": "^4.28.3"
"webpack": "^4.28.4"
},
"devDependencies": {
"lit-html": "^0.14.0",
Expand Down
2 changes: 1 addition & 1 deletion app/preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@babel/plugin-transform-react-jsx": "^7.2.0",
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion app/react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shelljs": "^0.8.2",
"url-parse": "^1.4.3",
"uuid": "^3.3.2",
"webpack": "^4.28.3",
"webpack": "^4.28.4",
"webpack-dev-middleware": "^3.4.0",
"webpack-hot-middleware": "^2.24.3",
"ws": "^6.1.0"
Expand Down
4 changes: 2 additions & 2 deletions app/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
"babel-plugin-react-docgen": "^2.0.0",
"babel-preset-react-app": "^7.0.0",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"lodash": "^4.17.11",
"mini-css-extract-plugin": "^0.5.0",
"prop-types": "^15.6.2",
"react-dev-utils": "^7.0.1",
"regenerator-runtime": "^0.12.1",
"semver": "^5.6.0",
"webpack": "^4.28.3"
"webpack": "^4.28.4"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion app/riot/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dependencies": {
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"raw-loader": "^1.0.0",
"react": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion app/svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down
2 changes: 1 addition & 1 deletion app/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@storybook/core": "5.0.0-alpha.5",
"common-tags": "^1.8.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"global": "^4.3.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down
20 changes: 10 additions & 10 deletions examples/angular-cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@
"test:watch": "jest --watch"
},
"dependencies": {
"@angular/common": "^7.1.4",
"@angular/compiler": "^7.1.4",
"@angular/core": "^7.1.4",
"@angular/forms": "^7.1.4",
"@angular/platform-browser": "^7.1.4",
"@angular/platform-browser-dynamic": "^7.2.0",
"@angular/common": "^7.2.1",
"@angular/compiler": "^7.2.1",
"@angular/core": "^7.2.1",
"@angular/forms": "^7.2.1",
"@angular/platform-browser": "^7.2.1",
"@angular/platform-browser-dynamic": "^7.2.1",
"@ngrx/store": "^7.0.0",
"core-js": "^2.6.1",
"core-js": "^2.6.2",
"rxjs": "^6.3.3",
"rxjs-compat": "^6.3.3",
"zone.js": "^0.8.27"
"zone.js": "^0.8.28"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.11.4",
"@angular/cli": "^7.1.4",
"@angular/compiler-cli": "^7.1.4",
"@angular/cli": "^7.2.2",
"@angular/compiler-cli": "^7.2.1",
"@storybook/addon-actions": "5.0.0-alpha.5",
"@storybook/addon-backgrounds": "5.0.0-alpha.5",
"@storybook/addon-centered": "5.0.0-alpha.5",
Expand Down
4 changes: 2 additions & 2 deletions examples/cra-ts-kitchen-sink/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/react": "5.0.0-alpha.5",
"@types/enzyme": "^3.1.15",
"@types/react": "^16.7.18",
"@types/react": "^16.7.20",
"@types/react-dom": "^16.0.11",
"@types/storybook__addon-actions": "^3.4.1",
"@types/storybook__addon-info": "^3.4.2",
Expand All @@ -30,7 +30,7 @@
"fork-ts-checker-webpack-plugin": "^0.5.2",
"react-docgen-typescript-loader": "^3.0.0",
"react-scripts": "^2.1.3",
"tslint": "^5.12.0",
"tslint": "^5.12.1",
"tslint-config-airbnb": "^5.11.1",
"typescript": "^3.2.2"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/ember-cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"babel-loader": "^8",
"broccoli-asset-rev": "^3.0.0",
"cross-env": "^5.2.0",
"ember-ajax": "^4.0.0",
"ember-ajax": "^4.0.2",
"ember-cli": "~3.7.1",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^7.1.2",
Expand All @@ -44,7 +44,7 @@
"ember-resolver": "^5.0.1",
"ember-source": "~3.7.0",
"loader.js": "^4.2.3",
"webpack": "^4.28.3",
"webpack": "^4.28.4",
"webpack-cli": "^3.2.1"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion examples/marko-cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"@storybook/addons": "5.0.0-alpha.5",
"@storybook/marko": "5.0.0-alpha.5",
"prettier": "^1.14.3",
"webpack": "^4.28.3"
"webpack": "^4.28.4"
}
}
Loading

0 comments on commit 4e880b5

Please sign in to comment.