492 Commits

Author SHA1 Message Date
Dependencies.io Bot
670ae1bc19 Update postcss-loader from 2.0.8 to 2.0.9 in app/vue 2017-11-24 19:58:22 +00:00
Dependencies.io Bot
01736f5817 Update common-tags from 1.4.0 to 1.5.1 in app/vue 2017-11-24 19:57:03 +00:00
hypnos
1dd0024cb0 Test styles directly instead of using snapshots 2017-11-24 02:54:36 +03:00
Dependencies.io Bot
96ee7df9a4 Update webpack-dev-middleware from 1.12.0 to 1.12.1 in app/vue 2017-11-23 16:37:40 +00:00
Dependencies.io Bot
45696bf34c Update commander from 2.11.0 to 2.12.1 in app/vue 2017-11-23 16:36:13 +00:00
Michael Shilman
5022705708 Merge branch 'release/3.3' of github.com:storybooks/storybook into release/3.3 2017-11-22 03:29:00 -08:00
hypnos
9c3ec0aa6d Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-22 14:17:16 +03:00
Michael Shilman
3c1715daca v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
Roberto Wesley Overdijk
2462dcc7ed
Merge branch 'master' into patch-1 2017-11-22 10:19:55 +01:00
Tom Coleman
6638f5cfb7 Save the preview frame URL as the story changes.
Sometimes when there are problems with HMR, we end up doing a
hard-reload of the preview iframe, whilst leaving the main window.

As the preview iframe didn't change its URL ever, this led to problems
where the old (usually original) story was loaded in such circumstances.

See #614 and #1328
2017-11-22 17:11:12 +11:00
hypnos
462a8d9425 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-11-21 21:32:38 +03:00
Roberto Wesley Overdijk
525b43a424
Add DotEnv dep 2017-11-21 18:52:29 +01:00
Roberto Wesley Overdijk
6fe7b4b824
add support for .env files
Add DotEnv for webpack
2017-11-21 18:49:44 +01:00
Dependencies.io Bot
bdf771eaa4 Update vue-template-compiler from 2.5.6 to 2.5.8 in app/vue 2017-11-21 16:29:24 +00:00
Dependencies.io Bot
39f01799ab Update vue from 2.5.6 to 2.5.8 in app/vue 2017-11-21 16:27:57 +00:00
Filipp Riabchun
c7a2a9be26
Merge branch 'master' into release/3.3 2017-11-20 01:01:16 +03:00
Dependencies.io Bot
0e083da64f Update vue-template-compiler from 2.5.5 to 2.5.6 in app/vue 2017-11-19 16:31:29 +00:00
Dependencies.io Bot
393ab51f25 Update vue from 2.5.5 to 2.5.6 in app/vue 2017-11-19 16:30:13 +00:00
Hypnosphi
83d76e4536 Merge remote-tracking branch 'origin/master' into release/3.3 2017-11-17 21:17:28 +03:00
Dependencies.io Bot
e111d45afb Update vue-template-compiler from 2.5.3 to 2.5.5 in app/vue 2017-11-17 17:49:44 +00:00
Dependencies.io Bot
e5499fe719 Update vue from 2.5.3 to 2.5.5 in app/vue 2017-11-17 17:48:07 +00:00
Dependencies.io Bot
2e0f72264d Update vue-hot-reload-api from 2.2.3 to 2.2.4 in app/vue 2017-11-17 17:46:35 +00:00
Michael Shilman
7a6c901d71 v3.2.16 2017-11-15 18:03:04 -08:00
Norbert de Langen
0fefa9808d
Merge branch 'release/3.3' into shilman/refactor-core 2017-11-15 22:55:34 +01:00
Norbert de Langen
cdcecb6a78
Merge branch 'release/3.3' into add-support-for-importing-markdown-in-storybook-react 2017-11-15 22:44:56 +01:00
Norbert de Langen
e8c8f33f97
Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/links/package.json
#	addons/storyshots/package.json
#	examples/cra-kitchen-sink/.storybook/addons.js
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-15 19:40:55 +01:00
Dan Green
f3d0827695 Add support for markdown to jest, vue, react native, and angular 2017-11-13 23:06:01 -05:00
hypnos
091e1ab70e Remove packages' devDependencies that duplicate the root ones 2017-11-14 02:36:07 +03:00
Norbert de Langen
4039493fda
Merge branch 'release/3.3' into shilman/refactor-core 2017-11-13 07:50:03 +01: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
hypnos
01f8b63a9a Merge branch 'master' into release/3.3
# Conflicts:
#	addons/comments/package.json
#	addons/comments/src/manager/components/CommentItem/index.js
#	addons/comments/src/manager/components/CommentItem/style.js
#	addons/knobs/package.json
#	app/react-native/src/preview/components/OnDeviceUI/index.js
#	examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
#	yarn.lock
2017-11-10 03:11:24 +03:00
Michael Shilman
dd4e81336a Remove framework init.js
- move keyboard handling to the UI library, rather than introducing new
deps
- keep QS handling in each framework (for now)
2017-11-09 14:20:42 +09:00
Dependencies.io Bot
897d05b2ab Update vue-loader from 13.4.0 to 13.5.0 in app/vue 2017-11-08 10:45:03 +00:00
Dependencies.io Bot
095fbb92bc Update vue-hot-reload-api from 2.2.0 to 2.2.3 in app/vue 2017-11-08 10:43:36 +00:00
Michael Shilman
e8f76ceed5 Self-binding core client/config API 2017-11-08 15:41:41 +09:00
Michael Shilman
f938dd472c Merge updates from release/3.3
- resolve conflicts
- fix RN story_store (make it an EventEmitter)
2017-11-08 15:26:14 +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
AaronFriel
b893e3b2dc Fix package.json in app/vue 2017-11-06 16:33:57 -06:00
AaronFriel
ccd20f1294 Add cross-env as root devdep, remove unnecessary script. 2017-11-06 16:20:51 -06:00
Aaron Friel
8d03cda91d Build scripts working on Windows. 2017-11-06 16:20:21 -06:00
Filipp Riabchun
16276a8058
Merge branch 'master' into update-dev-deps 2017-11-06 22:07:44 +03:00
Filipp Riabchun
1c5a7d1234
Merge branch 'master' into update-file-loader 2017-11-06 21:36:56 +03:00
Michael Shilman
4573883f70 Refactor client / config / redux API into core
Questionable changes:
- ability to pass a story decorator function
- pass clearDecorators to ConfigAPI

React/Vue/Angular working (apparently). RN still broken.
2017-11-06 19:57:39 +09:00
hypnos
5db6040221 Update react-modal to 3.1.0 2017-11-06 05:57:56 +03:00
hypnos
1609d048c7 Update file-loader to 1.1.5 2017-11-06 03:41:07 +03:00
Michael Shilman
9eca833707 Refactor StoryStore into @storybook/core 2017-11-06 00:52:36 +09:00
hypnos
971ac96f9a Update devDependencies 2017-11-05 03:07:18 +03:00