58 Commits

Author SHA1 Message Date
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
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
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
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
3f6f07fa28 convert vanilla app to hmr 2017-10-31 13:04:59 -04:00
Daniel Duan
3d8e344263 react-native update 2017-10-29 18:20:37 -04:00
Daniel Duan
39fdb4e60b vanilla app runs jest fine 2017-10-29 18:16:44 -04:00
hypnos
ebbda931fd Merge remote-tracking branch 'origin/master' into react-native-0.49.1-9.0.0-app--react-native
# Conflicts:
#	yarn.lock
2017-10-10 01:24:17 +02:00
Michael Shilman
70825cb2dc resolve conflicts merging master into release/3.3 2017-10-02 20:20:10 +02:00
hypnos
2e8240d176 Fix/suppress current eslint warnings.
Raise `import/no-unresolved` and `import/extensions` to error level
everywhere except `docs`
2017-10-02 01:40:46 +03: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
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
Norbert de Langen
5e74ef8207 CHANGE @storybook/addon-knobs/dist/{{framework}} to @storybook/addon-knobs/{{framework}}
And other review comments
2017-09-11 22:31:21 +02:00
Norbert de Langen
f5b059652b CHANGE examples to use new refactored addon-knobs 2017-09-11 13:21:13 +02:00
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Norbert de Langen
8dd71b2bb1 Merge branch 'release/3.3' into thomasbertet/fix-ordering-chunk-load
# Conflicts:
#	app/react/src/server/index.html.js
#	app/vue/src/server/index.html.js
2017-09-06 08:18:33 +02:00
Norbert de Langen
f1ff7b1e1f Merge branch 'master' into release/3.3
# Conflicts:
#	app/react/src/server/babel_config.test.js
#	examples/cra-kitchen-sink/src/stories/index.js
#	examples/crna-kitchen-sink/storybook/stories/index.js
#	examples/react-native-vanilla/package.json
#	examples/react-native-vanilla/storybook/stories/index.js
#	lib/ui/src/modules/ui/components/layout/index.js
2017-09-06 01:33:18 +02:00
Norbert de Langen
665116009c Merge branch 'master' into ndelangen/fix-prettier-linting 2017-09-06 00:59:28 +02:00
Norbert de Langen
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
Norbert de Langen
341cccad75 REMOVE mock-fs and replace it with jest.mock() 2017-09-06 00:39:33 +02:00
Norbert de Langen
7fc24513f8 Merge branch 'release/3.3' into commit-yarn-lock 2017-08-27 22:24:08 +02:00
Norbert de Langen
740cb19ace ADD knobs addon to addons.js to register them 2017-08-26 20:23:32 +02:00
Norbert de Langen
502fe0f7b1 ADD snapshot 2017-08-26 19:46:45 +02:00
Norbert de Langen
90a6c3d608 ADD knobs to package.json 2017-08-26 19:42:37 +02:00
Norbert de Langen
b41a487915 Merge branch 'release/3.3' into addon-knobs-rn-example 2017-08-26 00:54:29 +02:00
hypnos
7548bb0ae2 merge master 2017-08-22 23:43:09 +03:00
hypnos
e30e53cd52 Merge remote-tracking branch 'upstream/master' into commit-yarn-lock
# Conflicts:
#	CONTRIBUTING.md
#	examples/crna-kitchen-sink/package.json
#	examples/test-cra/package.json
2017-08-22 23:42:29 +03:00
hypnos
8721f0777d Fix new lint errors 2017-08-22 23:25:47 +03:00
hypnos
0e33495a95 Merge remote-tracking branch 'upstream/master' into stricter-lint-imports
# Conflicts:
#	examples/crna-kitchen-sink/storybook/stories/Button/index.android.js
#	examples/crna-kitchen-sink/storybook/stories/Button/index.ios.js
#	examples/crna-kitchen-sink/storybook/stories/CenterView/index.js
#	examples/crna-kitchen-sink/storybook/stories/Welcome/index.js
#	examples/react-native-vanilla/storybook/stories/Button/index.android.js
#	examples/react-native-vanilla/storybook/stories/Button/index.ios.js
#	examples/react-native-vanilla/storybook/stories/CenterView/index.js
#	examples/react-native-vanilla/storybook/stories/Welcome/index.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js
#	lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js
2017-08-22 23:23:25 +03:00
Michael Shilman
46211e99d5 Use prop-types for RN CLI instead of deprecated react PropTypes 2017-08-22 09:59:48 -07:00
hypnos
a4c5142126 Stop ignoring yarn.locks 2017-08-22 00:42:06 +03:00
Norbert de Langen
a274227adc Merge branch 'master' into addon-knobs-rn-example 2017-08-18 11:59:00 +02:00
Norbert de Langen
63eaa5af49 Merge branch 'master' into stricter-lint-imports 2017-08-18 10:57:33 +02:00
hypnos
cb92897063 Promote no-extraneous-dependencies to error level and make it pass 2017-08-18 04:35:25 +03:00
Norbert de Langen
e6da5eab68 FIXED test-cra & others that manually link 2017-08-16 14:10:47 +02:00
Gytis Vinclovas
c93ffffe1f Added knobs examples to crna and vanilla react native. 2017-08-10 11:27:32 +03:00
Michael Shilman
279dc892b2 Updated RN packager host with PR comments 2017-08-01 12:07:27 -07:00
Michael Shilman
8f10fce540 Use RN packager host by default in examples and also CLI templates 2017-08-01 11:13:11 -07:00
Norbert de Langen
de75c5df89 Merge branch 'master' into release/3.2 2017-07-25 22:34:27 +02:00
Norbert de Langen
c11c189d7e UPDATE everything (including eslint 4) 2017-07-25 11:20:08 +02:00
Tom Coleman
9b80a992cf Remove react dependency 2017-07-24 14:59:09 +10:00
Michael Shilman
0f8755c413 Reset storybook on startup?
@matt-oakes I’m not sure why I need to do this but I get a “URL
required” prop-types error unless I force `resetStorybook` in
`react-native-vanilla` example
2017-07-22 12:12:28 -07:00
Norbert de Langen
3862c99541 Merge branch 'master' into release/3.2
# Conflicts:
#	addons/actions/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	lerna.json
#	lib/cli/package.json
#	lib/ui/package.json
2017-07-20 09:23:47 +02:00
Norbert de Langen
9e0d929079 Merge branch 'master' into master 2017-07-19 23:58:51 +02:00
Norbert de Langen
9469f5da55 REVERT storyshots changes 2017-07-19 17:38:45 +02:00
Norbert de Langen
3c84722b54 Merge branch 'release/3.2' into storybook-native-ui 2017-07-19 10:31:00 +02:00
Norbert de Langen
9faced558e CI run jest in series && add dummy deploy 2017-07-19 10:11:23 +02:00
Norbert de Langen
cad2b8d419 export getStorybook from config 2017-07-19 08:21:47 +02:00
Julius Räihä
d25927a5fa Storyshots: framework option should override package dependency check 2017-07-18 14:56:25 +03:00
Norbert de Langen
15540df990 CHANGE indentation rule eslint (prettier) 2017-07-08 22:57:21 +02:00