91 Commits

Author SHA1 Message Date
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
Chang Wang
7bbf441abf add netlify build script and toml config 2017-11-13 21:55:21 -05:00
Chang Wang
da7fa87895 add build script for netlify 2017-11-13 21:45:14 -05: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
Norbert de Langen
238338f9e1
FIX yarn test & selecting only core
This was broken by some internal change by jest or something.
By proving a absolute path this seems to work again.

Added the executed command for clearity.
2017-11-02 23:15:19 +01:00
hypnos
735497714c Upgrade eslint-config-airbnb and make it pass 2017-11-02 04:40:48 +03:00
hypnos
38d4e022ed Fix integration test 2017-10-31 23:52:10 +03:00
Norbert de Langen
462ea1cc4a Merge branch 'master' into release/3.3 2017-10-24 23:25:18 +02:00
Norbert de Langen
ce74a760ca FIX unit tests (should not run integration) 2017-10-24 11:34:03 +02:00
Norbert de Langen
6efc1ed71f switch to circleci/node 2017-10-24 09:57:09 +02:00
Norbert de Langen
c1d14191cb ADD integration test: automatic screenshot of cra-kitchen-sink and vue-kitchen-sink examples 2017-10-24 01:39:59 +02:00
hypnos
0d684f89dc Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	app/react-native/package.json
#	docs/pages/basics/faq/index.md
#	examples/vue-kitchen-sink/package.json
#	lib/cli/generators/SFC_VUE/index.js
#	lib/cli/generators/VUE/index.js
#	lib/cli/lib/helpers.js
#	lib/cli/package.json
#	lib/ui/package.json
#	package.json
#	yarn.lock
2017-10-17 03:24:46 +03:00
hypnos
844ea52a6c Dirty-check repo state on CI to ensure lockfiles being up-to-date 2017-10-05 20:33:49 +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
Filipp Riabchun
f152c0dcb6 Merge branch 'master' into ndelangen/upgrade-react 2017-09-30 06:21:30 -07:00
hypnos
7e32662666 Merge branch 'master' into release/3.3
# Conflicts:
#	.circleci/config.yml
#	CONTRIBUTING.md
#	README.md
#	addons/knobs/package.json
#	addons/storyshots/package.json
#	app/vue/package.json
#	docs/yarn.lock
#	lerna.json
#	package.json
#	scripts/hoist-internals.js
#	yarn.lock
2017-09-30 16:20:37 +03:00
Norbert de Langen
02c6198a8b UPGRADE react & friends && UPGRADE other dependencies 2017-09-29 23:36:38 +02:00
hypnos
2f53feb64a Use yarn workspaces on master 2017-09-29 23:00:47 +03:00
Norbert de Langen
44e5ec89ae Merge branch 'master' into release/3.3 2017-09-25 13:28:54 +02:00
hypnos
bf830237d2 Fix master detection 2017-09-24 13:56:27 +03:00
hypnos
74c324df80 Add prompt in default mode 2017-09-24 13:55:40 +03:00
Norbert de Langen
c73265b0c5
ADD branches cleanup script 2017-09-24 10:29:33 +02:00
hypnos
5afe9e556e Merge remote-tracking branch 'upstream/release/3.3' into cli-tests
# Conflicts:
#	package.json
#	yarn.lock
2017-09-09 03:04:04 +03:00
hypnos
824bbd6a6d Replace the deprecated prepublish script with prepare 2017-09-08 03:19:39 +03:00
hypnos
f34386104d bootstrap: use yarn install directly 2017-09-08 03:15:51 +03:00
hypnos
e91d60e2f4 Merge release/3.3 2017-09-08 01:44:20 +03:00
Norbert de Langen
5382fcbf54 IMPROVE yarn workspaces setup 2017-09-08 00:24:32 +02:00
hypnos
4d10a55997 Introduce yarn workspaces 2017-09-07 00:55:44 +03:00
Norbert de Langen
7ab74c6a34 LINTING 2017-09-06 20:57:31 +02:00
Norbert de Langen
4590da7130 Merge branch 'master' into release/3.3 2017-09-06 18:11:24 +02:00
Norbert de Langen
6e1ddabb56 REMOVE the say command after bootstrapping 2017-09-06 18:02:28 +02:00
Norbert de Langen
a3abd052a8 FIX failing scripts exiting with 0 2017-09-06 17:47:21 +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
d0b752d8d3 FIX linting after prettier upgrade 2017-09-06 00:54:12 +02:00
hypnos
a3e82305cc Integrate CLI tests into tests CLI 2017-09-04 01:59:55 +03:00
Norbert de Langen
6190aca9b2 ADD some jest arguments 2017-08-28 20:49:44 +02:00
Norbert de Langen
45476deff3 ADD CLI for running tests, supports jest-projects and passing params to jest
Could be expanded later to run a lots of test, and allows us to pick what tests we want to run
via command line flags or a GUI.
2017-08-28 20:49:02 +02:00
Norbert de Langen
e7660ac561 WIP 2017-08-28 20:49:01 +02:00
Norbert de Langen
9700dbd7d0 Allow lockfiles for packages 2017-08-27 23:23:48 +02:00
Norbert de Langen
55a2b9a0df IMPROVE confirm message 2017-08-23 23:16:40 +02:00
Norbert de Langen
30e7c3779b ADD a confirmation step when doing the reset task, it will NOT ask when --reset is set 2017-08-23 21:16:08 +02:00
Norbert de Langen
f84623d86b ADD .vscode and .idea to gitignore, but whitelist them from being removed with git clean 2017-08-23 20:08:16 +02:00
Norbert de Langen
1843196549 ADD crna-kitchen-sink bootstrap command 2017-08-23 08:30:15 +02:00
Norbert de Langen
879928d9af Merge branch 'master' into improve-bootstrap-command
# Conflicts:
#	.circleci/config.yml
2017-08-23 08:25:07 +02:00
Norbert de Langen
de7777e16c SWITCH to normal node for bootstrap script && CHANGE circleCI to use new bootstrap script 2017-08-21 01:03:34 +02:00
Norbert de Langen
c85776a605 WIP 2017-08-20 23:48:27 +02:00
Norbert de Langen
02e0950968 ADD build-packs 2017-08-19 22:31:09 +02:00
Norbert de Langen
31f83aa7c4 Merge branch 'master' into improve-bootstrap-command 2017-07-26 14:04:51 +02:00