62 Commits

Author SHA1 Message Date
Michael Shilman
424a97b7f6 Merge branch 'next' into fix/decoratestory 2019-07-15 08:58:27 +08:00
Norbert de Langen
9571fe1572 Merge branch 'next' into preview-hooks
# Conflicts:
#	addons/actions/package.json
#	addons/events/package.json
#	addons/events/src/index.ts
#	addons/ondevice-notes/package.json
#	dev-kits/addon-roundtrip/package.json
#	examples/dev-kits/package.json
#	examples/html-kitchen-sink/package.json
#	lib/client-api/package.json
#	lib/client-api/src/client_api.ts
#	lib/client-api/src/typings.d.ts
#	lib/client-api/tsconfig.json
#	lib/ui/src/index.js
#	yarn.lock
2019-07-10 16:08:11 +02:00
Norbert de Langen
e87c329e90 Do not merge p if not provided, if provided, no conditional is needed 2019-07-08 21:34:09 +02:00
Norbert de Langen
06c57aec43 FIX types of client-api & storystore
the function to merge all decorators & storyFn has been changed to no longer mutate
the storyFn called from within decorators must be called with a StoryContext
add a story for vue to test the behaviour
2019-07-08 15:07:20 +02:00
Michael Shilman
ae178d4539 Fix breaking change in client_api due to #7147 2019-07-08 12:05:24 +08:00
Norbert de Langen
74e48c5e09 FIX minor issues after client-api TS migration merge 2019-07-06 15:40:45 +02:00
Norbert de Langen
ff924d72f2 IMPROVE types 2019-07-05 08:56:36 +02:00
Norbert de Langen
bcf18cc95c FIX types 2019-07-02 02:09:43 +02:00
Jessica-Koch
239e73e48e add some dependencies 2019-07-01 00:33:09 -07:00
Jessica-Koch
ffc63188ae complete typings of items except
Committer: Jessica-Koch <jessicakoch136@icloud.com>
2019-07-01 00:31:44 -07:00
Jessica Koch
f3fbfe0793 correct some linting errors 2019-06-19 01:32:39 -07:00
Norbert de Langen
fcbff29ffd CHANGE versions again, sorry, CLI tests use published version, we should really fix that! 2019-06-17 21:18:42 -07:00