Skip to content

Commit

Permalink
Merge branch 'next' into add-more-stories
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen committed Jan 30, 2019
2 parents 6aecb80 + d5bce5f commit 2df42fa
Show file tree
Hide file tree
Showing 13 changed files with 4,328 additions and 1,209 deletions.
4 changes: 2 additions & 2 deletions examples/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@ngrx/store": "^7.1.0",
"core-js": "^2.6.2",
"rxjs": "^6.3.3",
"rxjs-compat": "^6.3.3",
"rxjs-compat": "^6.4.0",
"zone.js": "^0.8.29"
},
"devDependencies": {
Expand All @@ -47,7 +47,7 @@
"@storybook/angular": "5.0.0-alpha.10",
"@types/core-js": "^2.5.0",
"@types/jest": "^23.3.13",
"@types/node": "~10.12.18",
"@types/node": "~10.12.19",
"@types/webpack-env": "^1.13.6",
"global": "^4.3.2",
"jasmine-core": "~3.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-ts-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@storybook/addons": "5.0.0-alpha.10",
"@storybook/react": "5.0.0-alpha.10",
"@types/enzyme": "^3.1.15",
"@types/react": "^16.7.21",
"@types/react": "^16.7.22",
"@types/react-dom": "^16.0.11",
"@types/storybook__addon-actions": "^3.4.1",
"@types/storybook__addon-info": "^3.4.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/official-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prop-types": "^15.6.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"storybook-chromatic": "^1.2.4",
"storybook-chromatic": "^1.2.5",
"ts-loader": "^5.3.3",
"uuid": "^3.3.2",
"webpack": "^4.29.0"
Expand Down
Loading

0 comments on commit 2df42fa

Please sign in to comment.