79 Commits

Author SHA1 Message Date
Norbert de Langen
29e1c02a65
SORT package.json files 2018-08-15 23:16:19 +02:00
Norbert de Langen
a039c96426
Merge branch 'master' into babel-7
# Conflicts:
#	MIGRATION.md
#	addons/backgrounds/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/info/src/__snapshots__/index.test.js.snap
#	addons/jest/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/options/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	addons/viewport/package.json
#	app/angular/package.json
#	app/html/package.json
#	app/marko/package.json
#	app/mithril/package.json
#	app/polymer/package.json
#	app/react/package.json
#	app/vue/package.json
#	examples/angular-cli/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/html-kitchen-sink/package.json
#	examples/marko-cli/package.json
#	examples/mithril-kitchen-sink/package.json
#	examples/official-storybook/package.json
#	examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot
#	examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
#	examples/polymer-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	jest.config.js
#	lib/cli/package.json
#	lib/cli/test/snapshots/angular-cli/package.json
#	lib/cli/test/snapshots/marko/package.json
#	lib/cli/test/snapshots/meteor/package.json
#	lib/cli/test/snapshots/mithril/package.json
#	lib/cli/test/snapshots/polymer/package.json
#	lib/cli/test/snapshots/react/package.json
#	lib/cli/test/snapshots/react_project/package.json
#	lib/cli/test/snapshots/react_scripts/package.json
#	lib/cli/test/snapshots/sfc_vue/package.json
#	lib/cli/test/snapshots/update_package_organisations/package.json
#	lib/cli/test/snapshots/vue/package.json
#	lib/cli/test/snapshots/webpack_react/package.json
#	lib/codemod/package.json
#	lib/components/src/layout/__snapshots__/index.stories.storyshot
#	lib/core/package.json
#	lib/core/src/server/config/webpack.config.prod.js
#	package.json
#	yarn.lock
2018-08-15 00:01:36 +02:00
Norbert de Langen
935cefd27a
FIX linting issues after eslint upgrade (partial fix) 2018-08-05 17:57:17 +02:00
Norbert de Langen
7689c0baa2
FIX snapshots 2018-08-04 16:14:24 +02:00
t_hammb
4dbc6e2732 fixing addon type naming conventions. 2018-07-23 13:43:11 -07:00
t_hammb
ba27a85ff1 fixing issue with deprecated file. Changing radio button import. 2018-07-20 14:17:34 -07:00
t_hammb
34e74f8f92 refining code more and fixing more issues found within the code. 2018-07-19 11:26:20 -07:00
Bryce Hammond
28a14d322f Add radio buttons knob type 2018-07-17 16:17:57 -07:00
Hypnosphi
ee6472d054 Fix RN test 2018-07-05 23:31:48 +03:00
Hypnosphi
de3e2aa3e4 Extract core event names to a separate package 2018-05-01 00:24:27 +03:00
Hypnosphi
cdb7cab87b Stop using deprecated React methods 2018-03-30 20:28:20 +03:00
Hypnosphi
c347cd32de Cleanup dependencies: RN examples 2018-02-25 15:16:30 +03:00
Hypnosphi
def1e04dbb Cleanup dependencies 2018-02-25 03:53:03 +03:00
Hypnosphi
d6b75c3f80 eslint: remove rules that duplicate airbnb config 2018-02-17 21:27:49 +03:00
Tom Coleman
48cd3110d3 Merge remote-tracking branch 'origin/master' into tmeasday/shilman-refactor-core-rebase 2018-01-03 17:36:26 +11:00
Norbert de Langen
3ff3a8fd7a
UPGRADE react-native 2017-12-23 21:11:08 +01:00
Norbert de Langen
8808ba5304
UPDATE snapshots 2017-12-23 20:19:22 +01:00
Norbert de Langen
3cfacfe4ec UPGRADE jest to latest & FIX all failing unittests 2017-12-23 18:48:29 +01:00
hypnos
0e4da0ee74 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/src/index.js
#	examples/cra-kitchen-sink/src/__snapshots__/storyshots.test.js.snap
2017-12-07 02:02:30 +03:00
Norbert de Langen
6b8edd2dfb
ADD mocks for RN Dimentions & WebSocket 2017-12-06 23:05:22 +01:00
Daniel Duan
5ec57c1f3a fix example to actually run storybook and document how to run it 2017-11-08 23:53:25 -05: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
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