451 Commits

Author SHA1 Message Date
Dan Green
e35045f298 (#1513) Replace console with npmlog in app/react 2017-11-21 21:54:46 -05:00
Roberto Wesley Overdijk
8ac5086743
Add DotEnv dep 2017-11-21 18:53:04 +01:00
Roberto Wesley Overdijk
9af8b8472c
add support for .env files
add support for .env files
2017-11-21 18:51:07 +01: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
Dan Green
6dafcdeb7a Add support for markdown to react storybook 2017-11-12 22:36:03 -05: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
hypnos
f48fbd3231 Run prettier 2017-11-09 02:35:38 +03: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
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
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
e94b1f9aab Move LinkTo component to a separate addon-links/react endpoint 2017-11-06 07:23:36 +03: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
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
hypnos
9856f319da Fix apps 2017-11-02 04:56:40 +03: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
hypnos
5362da6137 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	app/react/src/server/index.js
#	app/vue/src/server/index.js
2017-11-01 05:10:22 +03:00
Filipp Riabchun
7d07c40688
Merge branch 'master' into derekstavis-patch-2 2017-11-01 05:02:12 +03:00
hypnos
73a8026801 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	examples/cra-kitchen-sink/package.json
#	yarn.lock
2017-11-01 05:00:41 +03:00
Dependencies.io Bot
288e9aa305 Update babel-preset-react-app from 3.0.3 to 3.1.0 in app/react 2017-10-31 23:37:46 +00:00
Filipp Riabchun
e98afd942c
Merge branch 'master' into derekstavis-patch-2 2017-11-01 02:32:25 +03:00
Filipp Riabchun
61a8ed026b
Merge branch 'master' into release/3.3 2017-11-01 01:37:42 +03:00
Norbert de Langen
83e719131b
Update README.md 2017-10-31 23:28:48 +01: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
b3427bccbb
Merge branch 'master' into patch-2 2017-10-27 21:50:33 -04:00
Dependencies.io Bot
c94d7e3bae Update glamorous from 4.10.0 to 4.11.0 in app/react 2017-10-27 16:25:55 +00:00
Norbert de Langen
0ad2674382 Merge branch 'master' into patch-2 2017-10-25 07:34:23 +02:00
Norbert de Langen
462ea1cc4a Merge branch 'master' into release/3.3 2017-10-24 23:25:18 +02:00
Dependencies.io Bot
be4f7854d0 Update chalk from 2.2.0 to 2.3.0 in app/react 2017-10-24 16:27:47 +00:00
Derek W. Stavis
d67d2c7f69 Avoid logging an object on compilation errors
In certain configurations Storybook might log the whole Webpack
build object when warnings or errors are thrown. This was caused
by a `logger.error` call inside the `index.js` catch. This fixes by logging
the error only when it's an instance of an error.
2017-10-24 11:27:59 -02:00
Norbert de Langen
254e52f8f2 Merge branch 'master' into release/3.3 2017-10-23 16:42:06 +02:00
gkrafsig
171da12dd4 Updating to new favicon 2017-10-22 20:42:55 -04:00
hypnos
059835eb2d Merge remote-tracking branch 'origin/master' into release/3.3 2017-10-22 22:51:34 +03:00