177 Commits

Author SHA1 Message Date
Norbert de Langen
5966ae3d8e
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/storyshots/package.json
#	lib/ui/package.json
#	yarn.lock
2017-12-21 15:58:34 +01:00
Norbert de Langen
5eaa473b24
Merge branch 'master' into fix-babel-core 2017-12-21 11:03:05 +01:00
hypnos
34edb72e19 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-12-18 23:56:37 +01:00
Michael Shilman
2aea83798e v3.2.18 2017-12-18 13:58:53 -08:00
Emmanuel Vuigner
54ae75fabf
fix: move babel-core to peerDependencies
typo

do same for storyshots addon
2017-12-15 13:49:21 +01:00
Jason Murad
b82dd67812 fix bug introduced in #2417 2017-12-08 18:10:39 -05:00
Thomas Bertet
cfdf2b43f5 unignore testresults & pretty things 2017-12-05 10:21:38 +01:00
hypnos
dfd188966f Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/vue-kitchen-sink/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-12-05 03:22:47 +03:00
Filipp Riabchun
e10786e1da
Update package.json 2017-12-05 01:34:10 +03:00
Filipp Riabchun
5fe1769292
Merge branch 'master' into optimize-storyshots-peers 2017-12-05 01:33:36 +03:00
Michael Shilman
2e1fe20fc6 v3.2.17 2017-12-03 11:59:11 -08:00
Jason Murad
a86df5f9b6 add a blank line 2017-12-03 00:08:36 -05:00
Jason Murad
9f90d969fc unmount after storyshot snapshot 2017-12-03 00:01:44 -05:00
Tobias Lengsholz
45755f959a
Remove react-test-renderer storyshot snapshots, since they dont work yet 2017-12-01 19:28:23 +01:00
Tobias Lengsholz
2b2b27d06d
Move enzyme-to-json dependency to storyshots, split initStoryshots tests 2017-12-01 18:56:08 +01:00
Tobias Lengsholz
f42b29a1d4 Extend readme 2017-12-01 18:48:02 +01:00
Tobias Lengsholz
b4c7098b27 Add enzyme-to-json for serializing, initStoryshots with custom renderer 2017-12-01 18:47:50 +01:00
Tobias Lengsholz
8143264747 Add option to pass serializer to storyshots 2017-12-01 18:47:15 +01:00
Tobias Lengsholz
5ddb6b5a9f
Use snapshot with options as default, pass on renderer to test-bodies 2017-12-01 16:20:37 +01:00
Tobias Lengsholz
50a4b06d2b
Add option in snapshot generator to use renderer from options if passed 2017-12-01 16:17:08 +01:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
hypnos
c2538e2d91 Optimize @storybook/addon-storyshots peerDependencies 2017-11-18 14:20:34 +03:00
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -08:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
hypnos
8c8b35a2d2 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	CHANGELOG.md
#	addons/actions/package.json
#	addons/background/package.json
#	addons/centered/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/graphql/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	lerna.json
#	lib/addons/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/ui/package.json
#	yarn.lock
2017-11-11 03:24:39 +03:00
hypnos
0c4ef51fc5 Update React to 16.1.0 2017-11-10 19:58:38 +03:00
Michael Shilman
0be4efcec8 v3.2.15 2017-11-10 11:39:27 +09:00
Norbert de Langen
cf054ad1b3
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/knobs/package.json
#	addons/knobs/src/components/types/Array.js
#	examples/cra-kitchen-sink/package.json
#	package.json
#	yarn.lock
2017-11-07 09:33:30 +01:00
Michael Shilman
1a6082a4ad v3.3.0-alpha.3 2017-11-07 12:56:56 +09:00
hypnos
bd3cb9f717 Update read-pkg-up to 3.0.0 2017-11-06 03:53:40 +03:00
hypnos
bb97feaa33 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/knobs/package.json
#	addons/storyshots/src/index.js
#	yarn.lock
2017-11-03 22:33:56 +03:00
hypnos
68bfb04784 Fix new lint errors 2017-11-03 03:59:01 +03:00
Norbert de Langen
f20d8603b1
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/containers/CommentsPanel/dataStore.js
#	addons/comments/src/manager/containers/CommentsPanel/index.js
#	addons/info/src/components/PropTable.js
#	lib/cli/bin/generate.js
#	lib/cli/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js
#	lib/ui/src/modules/ui/components/addon_panel/index.test.js
#	scripts/test.js
2017-11-03 00:43:42 +01:00
Travis Bloom
696563f2a0 return the test in storyshots so if async work needs to occur before snapshotting, jest waits before failing 2017-11-02 15:22:34 -04:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
Michael Shilman
f15eaa6a68 v3.2.14 2017-11-01 16:21:34 +09:00
Norbert de Langen
effe2ee84b Merge branch 'master' into release/3.3
# Conflicts:
#	app/react-native/readme.md
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/cra-kitchen-sink/src/stories/index.js
#	examples/crna-kitchen-sink/package.json
#	integration/__image_snapshots__/cra-kitchen-sink-snap.png
#	integration/__image_snapshots__/vue-kitchen-sink-snap.png
#	yarn.lock
2017-10-31 23:26:48 +01:00
Daniel Duan
a4dff5fdd9 #1557 getting rid of old change logs 2017-10-28 19:20:35 -04:00
Norbert de Langen
dada6088fd Merge branch 'release/3.3' into storyshots-warn-on-no-stories 2017-10-23 18:20:27 +02:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
Norbert de Langen
2932684e9a Merge branch 'master' into storyshots-warn-on-no-stories 2017-10-23 16:36:13 +02:00
Norbert de Langen
0e7befd50a Update README.md 2017-10-23 16:05:38 +02:00
Michael Shilman
a701365e70 v3.2.13 2017-10-20 21:44:34 +02:00
Clayton Ferris
ee4b362a28 adds error when storyshots finds no stories 2017-10-18 05:30:38 +00:00
Michael Shilman
b577ddd543 v3.3.0-alpha.2 2017-10-03 22:10:15 +02:00
Michael Shilman
3f97c6f175 v3.2.12 2017-10-03 00:29:46 +02:00
Michael Shilman
5030ee196c v3.3.0-alpha.1 2017-10-02 20:57:35 +02:00
Norbert de Langen
a270216e96 Merge branch 'master' into release/3.3
# Conflicts:
#	CONTRIBUTING.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	dependencies.yml
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/crna-kitchen-sink/package.json
#	examples/react-native-vanilla/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	yarn.lock
2017-09-30 23:19:44 +02:00
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
Norbert de Langen
98e066388c Merge branch 'master' into ndelangen/upgrade-react 2017-09-29 23:39:29 +02:00