Norbert de Langen
7c09e95203
Merge branch 'release/3.3' into netlify-for-angularexample
2017-12-22 15:48:47 +01:00
Norbert de Langen
748afaf4aa
ADD switch case for netlify angular example
2017-12-22 13:51:02 +01:00
Norbert de Langen
84ffcd1ae9
ADD a switch case for Netlify official-storybook example
2017-12-22 13:31:16 +01:00
Tom Coleman
8823299d49
Merge branch 'release/3.3' into tmeasday/add-stories
2017-12-22 09:08:10 +11:00
Tom Coleman
e4be9f56aa
Ignore __snapshots__ when building
2017-12-22 08:57:10 +11:00
Norbert de Langen
4d59b5f291
Merge branch 'master' into release/3.3
...
# Conflicts:
# addons/a11y/package.json
# addons/comments/package.json
# addons/knobs/package.json
# package.json
# yarn.lock
2017-12-21 10:38:04 +01:00
Norbert de Langen
5bfae45211
FIX the failing netlify builds
2017-12-21 10:21:09 +01:00
Rob Halff
d35e69607b
ignore __mocks__/ folders
2017-12-14 11:16:17 +00:00
hypnos
cc8e9b3d69
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# CONTRIBUTING.md
# scripts/test.js
2017-12-07 02:51:48 +03:00
Daniel Duan
6b65ec9bd5
fix project location
2017-12-06 18:41:49 -05:00
Daniel Duan
3b9c50d5a0
dang it, the github text editor sucks.
2017-12-06 18:31:12 -05:00
Daniel Duan
54521a0401
remove isJest option
2017-12-06 18:16:17 -05:00
Norbert de Langen
81bb375846
REMOVE cli tests (not yet on master)
2017-12-07 00:01:19 +01:00
Norbert de Langen
e1b481ce2f
FIX react-native-test in CI
...
(copy and fix from 3.3)
2017-12-06 23:46:05 +01:00
Syneva Runyan
0db7bf4633
addressed code review
2017-11-29 19:11:04 -05:00
hypnos
feb942266b
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# yarn.lock
2017-11-29 04:33:51 +03:00
Chang Wang
c1525b1302
re-run yarn for vue examples
2017-11-27 11:40:50 -05:00
hypnos
1dd0024cb0
Test styles directly instead of using snapshots
2017-11-24 02:54:36 +03:00
Norbert de Langen
d3ceba4641
Merge branch 'master' into add-addon-jest
2017-11-21 08:27:15 +01:00
hypnos
58b0835944
Run prettier
2017-11-21 04:18:36 +03:00
hypnos
f3f6ea8a82
Temporary disable throws on warnings
2017-11-21 04:11:00 +03:00
Filipp Riabchun
483bb05a89
Merge branch 'master' into release/3.3
2017-11-21 03:54:27 +03:00
Filipp Riabchun
041deca8cc
Merge branch 'master' into make-console-error-and-log-fail-tests-#2196
2017-11-21 03:47:21 +03:00
hypnos
8fa2847249
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# examples/cra-kitchen-sink/src/stories/__snapshots__/addon-info.stories.storyshot
2017-11-21 03:37:04 +03:00
Syneva Runyan
688b57d180
mocked console.info for unit test execution
2017-11-19 18:22:46 -05:00
Filipp Riabchun
c7a2a9be26
Merge branch 'master' into release/3.3
2017-11-20 01:01:16 +03:00
Chang Wang
865d1932a8
separate netlify build tasks
2017-11-18 22:08:59 -05:00
Norbert de Langen
2d17ece429
WIP
2017-11-17 10:49:24 +01:00
Norbert de Langen
06e6f3c12a
Merge branch 'master' into make-console-error-and-log-fail-tests-#2196
2017-11-15 23:25:29 +01:00
hypnos
c1a7fd95a7
Merge remote-tracking branch 'origin/master' into release/3.3
...
# Conflicts:
# addons/knobs/package.json
# yarn.lock
2017-11-16 00:19:01 +03:00
hypnos
a0cfbfbc1d
Merge remote-tracking branch 'origin/master' into add-reset-to-lockfile-update-instruction
2017-11-15 23:38:01 +03:00
hypnos
8b278d6fae
Add --reset to lockfile update instruction
2017-11-15 23:36:37 +03: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
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
Dan Green
7c7773c123
Issue #2196 - Set console.warn and console.error to throw in tests
2017-11-12 13:40:07 -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
