3851 Commits

Author SHA1 Message Date
Norbert de Langen
152630be57 Merge pull request #1351 from thomasbertet/fix-1307-invalid-node-type-to-props
Fix invalid prop 'node.type' supplied to 'Props'
2017-06-23 17:18:53 +02:00
Michael Shilman
4710321b9c Merge pull request #1326 from blairanderson/patch-1
fixes #1299 - addons/info: update readme
2017-06-23 23:56:46 +10:00
Norbert de Langen
51f4c9de71 Merge branch 'master' into fix-1307-invalid-node-type-to-props 2017-06-23 15:45:07 +02:00
Michael Shilman
bb1bd8b278 Merge pull request #1337 from storybooks/rn-storybook-websocket-url
websockets (ws) had removed socket.upgradeReq property, so instead we use req now
2017-06-23 23:43:38 +10:00
Michael Shilman
1264becc1b Merge branch 'master' into rn-storybook-websocket-url 2017-06-23 23:30:20 +10:00
Michael Shilman
235bb99130 Merge branch 'master' into marc-actions-uuid 2017-06-23 23:26:39 +10:00
Michael Shilman
a30166db48 Merge pull request #1306 from duncanbeevers/addon-info-omit-empty-inline-header
Addon Info: Omit empty inline info header
2017-06-23 23:13:53 +10:00
Michael Shilman
10ba79923a Merge branch 'master' into patch-1 2017-06-23 23:12:52 +10:00
Michael Shilman
e32629f31b Merge branch 'master' into addon-info-omit-empty-inline-header 2017-06-23 23:01:46 +10:00
Michael Shilman
319b1d318b Merge branch 'master' into fix-1307-invalid-node-type-to-props 2017-06-23 22:51:42 +10:00
Michael Shilman
2d41e23083 Merge branch 'master' into release-process 2017-06-23 22:10:00 +10:00
Michael Shilman
95ec30042a Merge pull request #1315 from storybooks/greenkeeper/lint-staged-4.0.0
Update lint-staged to the latest version 🚀
2017-06-23 22:09:21 +10:00
Michael Shilman
a2e76c5407 Merge branch 'master' into greenkeeper/lint-staged-4.0.0 2017-06-23 22:08:34 +10:00
Thomas Bertet
0bfb068b6f fix invalid prop node.type to Props 2017-06-23 11:16:40 +02:00
Michael Shilman
9790d5ae1c Fix RELEASES formatting 2017-06-23 18:54:50 +10:00
Michael Shilman
6696fe230c Merge pull request #1349 from storybooks/1284-hardcoded-react-dom-version
Ensure we add the correct version of `react-dom`
2017-06-23 16:53:16 +10:00
Tom Coleman
e1dfd2e117 Remove the cacheDirectory option from babel config
In storyshots, we are running babel directly, not through webpack, so we can't use this option, which applies to `babel-loader`. See https://github.com/storybooks/storybook/blob/master/app/react/src/server/config/babel.js#L15

https://github.com/storybooks/storybook/issues/1254
2017-06-23 14:40:41 +10:00
Michael Shilman
de576eb6e8 Fix RELEASE doc links and add tighter issue search 2017-06-23 14:22:21 +10:00
Tom Coleman
928ea5e1c1 Ensure we add the correct version of react-dom
We need to use an equal version to the `react` version the app is using.

#1284
2017-06-23 14:07:16 +10:00
Michael Shilman
fb93b18540 Added example of blocking bugs to release documentation 2017-06-23 13:58:38 +10:00
Michael Shilman
1797bbc6ba Add notes on our release process
Based on this gist:
https://gist.github.com/shilman/7993bc0c74974ef1ace7c4f96900554c
2017-06-23 13:54:28 +10:00
Marc Fallows
d8fb794362 Use uuid for action IDs instead of Math.random (fixes #1109) 2017-06-23 13:39:00 +10:00
Michael Shilman
598999308b Merge branch 'master' into rn-storybook-websocket-url 2017-06-23 08:04:35 +10:00
Michael Shilman
bf6faea25e Merge pull request #1338 from storybooks/remove-package-lock
Remove package lock
2017-06-23 08:04:11 +10:00
Duncan Beevers
549e55e05b
Addon Info: Omit empty inline info header 2017-06-22 10:55:16 -07:00
Michael Shilman
cf4f2205c1 Merge branch 'refs/heads/remove-package-lock' into rn-storybook-websocket-url 2017-06-23 01:24:39 +10:00
Michael Shilman
7787b9bf3c Ignore package-lock.json (for now) 2017-06-23 01:04:59 +10:00
Michael Shilman
b20e6f5091 Remove package-lock.json 2017-06-23 01:03:45 +10:00
Gytis Vinclovas
562e608538 websockets (ws) had removed socket.upgradeReq property, so instead we use req now. 2017-06-22 14:30:24 +03:00
Oleg Proskurin
0520eabf38 Merge pull request #1333 from mcmunder/patch-1
Update docs
2017-06-22 13:35:58 +04:00
Matthias Christoph Munder
c56d3f7ee4 Update docs
I (and others https://github.com/storybooks/storybook/issues/25) had a hard time finding information about how to apply styles from CSS frameworks like Boostrap etc... Maybe this link in the section about CSS testing makes it a bit easier?
2017-06-22 10:41:31 +02:00
Michael Shilman
a620cfed2a v3.1.5 v3.1.5 2017-06-22 16:36:43 +10:00
Michael Shilman
428768092a Updated CHANGELOG 2017-06-22 16:24:24 +10:00
Michael Shilman
84f67702c4 Merge pull request #1303 from storybooks/1266-fix-components-deps
Import demo components from @storybook/react
2017-06-22 15:25:19 +10:00
Michael Shilman
c61e045b06 Merge branch 'master' into 1266-fix-components-deps 2017-06-22 15:09:27 +10:00
Michael Shilman
f496deba0b Create @storybook/react/demo exports 2017-06-22 15:05:19 +10:00
Tom Coleman
3a27e214d2 Note about common next.js error 2017-06-22 14:58:06 +10:00
Michael Shilman
d1b625a08a Merge pull request #1332 from storybooks/1331-test-cra-on-tarballs
Use a pack -> install technique to recreate local packages
2017-06-22 13:40:36 +10:00
Tom Coleman
45300c361c Revert removing @storybook/react from storyshots 2017-06-22 12:20:25 +10:00
Tom Coleman
77974e0659 Added explanation of packs dir 2017-06-22 12:18:16 +10:00
Tom Coleman
b04849bc6e Use a pack -> install technique to recreate local packages
As suggested by https://github.com/npm/npm/pull/15900. This is a workaround until we get a better resolution of https://github.com/storybooks/storybook/issues/1286
2017-06-22 12:18:16 +10:00
Michael Shilman
e5041fa06a Add package-lock.json
Per discussion with @tmeasday 😉
2017-06-22 11:17:16 +10:00
Michael Shilman
b6de6ac954 Add placeholder tests to react-kitchen-sink 2017-06-22 10:54:16 +10:00
Michael Shilman
d04f2239bb Merge branch 'master' into 1266-fix-components-deps 2017-06-22 00:59:57 +10:00
Michael Shilman
5fcd85b311 Remove @storybook/react dependencies from storyshots
This is a hack. Currently the build is broken because `test-cra`
requires `@storybook/addon-storyshots` AND `@storybook/react`, but
`@storybook/addon-storyshots` requires `@storybook/react`. Before this
change, two versions of `@storybook/react` are getting loaded, and this
leads to a test error “Your test suite must contain at least one test.”

After this “fix” the error goes away. However,
`@storybook/addon-storyshots` should have a dev- dependency on
`@storybook/react`, because it uses it for its examples. But it only
has a peer-dep for now.
2017-06-22 00:24:33 +10:00
Michael Shilman
c7f7e07128 Remove unnecessary @storybook/react dep in @storybook/react-native 2017-06-21 21:46:31 +10:00
Michael Shilman
2c54e27b4a Merge pull request #1327 from natsathorn/master
add step for import addon-action to addons.js file before start using it
2017-06-21 20:52:34 +10:00
Natsathorn
62b2651456 add step for import addon-action to addons.js file before start using it 2017-06-21 13:08:31 +07:00
Blair Anderson
e4634420f2 addons/info: update readme
- include the defaults/options that are useable
2017-06-20 18:46:43 -07:00
Norbert de Langen
b975fc3e94 Update ROADMAP.md 2017-06-20 12:05:04 +02:00