6410 Commits

Author SHA1 Message Date
Michael Shilman
3c1715daca v3.3.0-alpha.4 v3.3.0-alpha.4 2017-11-22 03:15:31 -08:00
Michael Shilman
e43770da23 Changelog 3.3.0-alpha.4 2017-11-22 03:09:08 -08:00
Michael Shilman
8169dcb647
Merge pull request #2350 from storybooks/hotfix-cli
Hotfix cli
2017-11-22 02:56:52 -08:00
Filipp Riabchun
45ec0ee780
Merge branch 'release/3.3' into hotfix-cli 2017-11-22 13:21:47 +03:00
Filipp Riabchun
776f3a6f18
Merge pull request #2349 from storybooks/1328-fix-hmr-failure
Save the preview frame URL as the story changes.
2017-11-22 13:19:54 +03:00
hypnos
14f6306383 Fix CLI 2017-11-22 13:04:49 +03:00
Tom Coleman
6638f5cfb7 Save the preview frame URL as the story changes.
Sometimes when there are problems with HMR, we end up doing a
hard-reload of the preview iframe, whilst leaving the main window.

As the preview iframe didn't change its URL ever, this led to problems
where the old (usually original) story was loaded in such circumstances.

See #614 and #1328
2017-11-22 17:11:12 +11:00
hypnos
462a8d9425 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	addons/knobs/package.json
#	yarn.lock
2017-11-21 21:32:38 +03:00
Filipp Riabchun
762e8e3e00
Merge pull request #2344 from storybooks/dependencies.io-update-build-75.0.0
Update 6 dependencies from npm
2017-11-21 20:51:30 +03:00
Dependencies.io Bot
cf7171b7d8 Update vue-template-compiler from 2.5.6 to 2.5.8 in examples/vue-kitchen-sink 2017-11-21 16:32:20 +00:00
Dependencies.io Bot
104330af58 Update vue from 2.5.6 to 2.5.8 in examples/vue-kitchen-sink 2017-11-21 16:30:52 +00:00
Dependencies.io Bot
bdf771eaa4 Update vue-template-compiler from 2.5.6 to 2.5.8 in app/vue 2017-11-21 16:29:24 +00:00
Dependencies.io Bot
39f01799ab Update vue from 2.5.6 to 2.5.8 in app/vue 2017-11-21 16:27:57 +00:00
Dependencies.io Bot
9f92d009ca Update ws from 3.3.1 to 3.3.2 in app/react-native 2017-11-21 16:26:37 +00:00
Dependencies.io Bot
613f9540a2 Update vue from 2.5.6 to 2.5.8 in addons/knobs 2017-11-21 16:25:11 +00:00
Filipp Riabchun
5e6205844a
Merge branch 'master' into release/3.3 2017-11-21 04:19:32 +03: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
72e5c97c61
Merge pull request #2297 from storybooks/make-console-error-and-log-fail-tests-#2196
Issue #2196 - Set console.warn and console.error to throw in tests
2017-11-21 03:54:01 +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
de1da61c61 Update storyshots 2017-11-21 03:46:43 +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
Filipp Riabchun
cad0dc2738
Merge pull request #2343 from syneva-runyan/issue-2196_fix-unittest-warnings
Issue 2196 fix unittest warnings
2017-11-21 03:31:03 +03:00
Syneva Runyan
f7a5106288 updated storyshots snapshot 2017-11-19 21:29:58 -05:00
Syneva Runyan
48fe2475d4 self code review 2017-11-19 18:28:22 -05:00
Syneva Runyan
688b57d180 mocked console.info for unit test execution 2017-11-19 18:22:46 -05:00
Syneva Runyan
9d1a6296c6 Merge branch 'master' of https://github.com/syneva-runyan/storybook into issue-2196_fix-unittest-warnings 2017-11-19 17:31:09 -05:00
Syneva Runyan
fa401ece57 fixed unit test warnings 2017-11-19 17:25:13 -05:00
Filipp Riabchun
c7a2a9be26
Merge branch 'master' into release/3.3 2017-11-20 01:01:16 +03:00
Filipp Riabchun
69fd5df5c2
Merge pull request #2342 from storybooks/dependencies.io-update-build-73.0.0
Update 7 dependencies from npm
2017-11-20 00:56:16 +03:00
hypnos
8f14a16877 Fix new lint error 2017-11-20 00:48:29 +03:00
hypnos
a8ffd992ac Update eslint-plugin-react from 7.4.0 to 7.5.1 in / 2017-11-19 23:45:59 +03:00
hypnos
579ad870f1 Revert "Update eslint-plugin-react from 7.4.0 to 7.5.0 in /"
This reverts commit e45b2ae
2017-11-19 23:39:08 +03:00
Filipp Riabchun
3f97cb68fd
Merge branch 'master' into dependencies.io-update-build-73.0.0 2017-11-19 23:05:14 +03:00
Filipp Riabchun
2f662d2559
Merge pull request #2341 from storybooks/dependencies.io-update-build-73.1.0
Update gatsby in docs from 1.9.117 to 1.9.118
2017-11-19 23:05:05 +03:00
Dependencies.io Bot
678ef9741e Update vue-template-compiler from 2.5.5 to 2.5.6 in examples/vue-kitchen-sink 2017-11-19 16:34:31 +00:00
Dependencies.io Bot
6413e8aa96 Update vue from 2.5.5 to 2.5.6 in examples/vue-kitchen-sink 2017-11-19 16:32:50 +00:00
Dependencies.io Bot
0e083da64f Update vue-template-compiler from 2.5.5 to 2.5.6 in app/vue 2017-11-19 16:31:29 +00:00
Dependencies.io Bot
393ab51f25 Update vue from 2.5.5 to 2.5.6 in app/vue 2017-11-19 16:30:13 +00:00
Dependencies.io Bot
b65633554c Update vue from 2.5.5 to 2.5.6 in addons/knobs 2017-11-19 16:28:47 +00:00
Dependencies.io Bot
e45b2ae8ea Update eslint-plugin-react from 7.4.0 to 7.5.0 in / 2017-11-19 16:27:10 +00:00
Dependencies.io Bot
01e1bd61e8 Update eslint-config-prettier from 2.7.0 to 2.8.0 in / 2017-11-19 16:24:24 +00:00
Dependencies.io Bot
7116200307 Update gatsby from 1.9.117 to 1.9.118 2017-11-19 16:21:15 +00:00
Norbert de Langen
e2876e3011
Merge pull request #2340 from storybooks/cheapsteak/separate-netlify-instances
Separate netlify instances
2017-11-19 07:12:05 +01:00
Chang Wang
865d1932a8 separate netlify build tasks 2017-11-18 22:08:59 -05:00
hypnos
5a008b35f6 Merge remote-tracking branch 'origin/master' into release/3.3
# Conflicts:
#	yarn.lock
2017-11-19 02:23:52 +03:00
Filipp Riabchun
f4901bcf96
Merge pull request #2338 from storybooks/dependencies.io-update-build-72.1.0
Update 2 dependencies from npm
2017-11-18 20:18:33 +03:00
Filipp Riabchun
07df9aa146
Merge branch 'master' into dependencies.io-update-build-72.1.0 2017-11-18 20:06:56 +03:00
Filipp Riabchun
f2362c50f4
Merge pull request #2339 from storybooks/dependencies.io-update-build-72.0.0
Update gh-pages in / from 1.0.0 to 1.1.0
2017-11-18 20:06:25 +03:00