14130 Commits

Author SHA1 Message Date
filipp.riabchun
a5069e0859 TeamCity change in 'Open-source projects / Storybook' project: 'CLI test, latest CRA' build configuration settings were updated 2018-11-05 19:01:52 +00:00
Filipp Riabchun
9b7dc35f72
Merge branch 'next' into fix-deps 2018-11-05 22:38:32 +04:00
filipp.riabchun
5625a3962d TeamCity change in 'Open-source projects / Storybook' project: parameters of 'CLI test' build configuration were updated 2018-11-05 18:34:01 +00:00
dependabot[bot]
dd56c8563d
Merge branch 'master' into dependabot/npm_and_yarn/@angular/compiler-7.0.2 2018-11-05 18:05:23 +00:00
Filipp Riabchun
1b5036f7bd
Merge pull request #4658 from storybooks/dependabot/npm_and_yarn/@types/jest-23.3.9
Bump @types/jest from 23.3.8 to 23.3.9
2018-11-05 21:58:17 +04:00
Filipp Riabchun
f7fcf44872
Merge pull request #4674 from storybooks/dependabot/npm_and_yarn/copy-webpack-plugin-4.6.0
Bump copy-webpack-plugin from 4.5.4 to 4.6.0
2018-11-05 21:57:56 +04:00
Filipp Riabchun
2d1c5e5cfe
Merge pull request #4678 from storybooks/dependabot/npm_and_yarn/@ngrx/store-6.1.2
Bump @ngrx/store from 6.1.1 to 6.1.2
2018-11-05 21:57:03 +04:00
Filipp Riabchun
65d24eb3c4
Merge pull request #4686 from storybooks/dependabot/npm_and_yarn/merge-1.2.1
[Security] Bump merge from 1.2.0 to 1.2.1
2018-11-05 21:55:40 +04:00
Filipp Riabchun
5bb0d54fc6
Merge branch 'next' into master 2018-11-05 21:38:00 +04:00
Filipp Riabchun
62d2ebb24f
Merge branch 'next' into master 2018-11-05 21:37:51 +04:00
igor-dv
46cbd3bce4 Merge remote-tracking branch 'origin/next' into fix-deps 2018-11-05 19:35:51 +02:00
Hypnosphi
7de043ec79 Teamcity: try escaping from deadlock 2018-11-05 21:31:22 +04:00
Hypnosphi
d8e58bda2d Teamcity: try escaping from deadlock 2018-11-05 21:30:30 +04:00
Hypnosphi
8d9fd12867 Merge branch 'master' into next 2018-11-05 21:18:56 +04:00
igor-dv
825719a2a6 Merge remote-tracking branch 'origin/next' into core/separate-manager-from-preview
# Conflicts:
#	lib/core/src/server/config/webpack.config.dev.js
#	lib/core/src/server/config/webpack.config.prod.js
2018-11-05 19:15:45 +02:00
Hypnosphi
8774da02c1 TeamCity: make next the default branch 2018-11-05 21:14:54 +04:00
igor-dv
73834fc100 Merge remote-tracking branch 'origin/master' into core/separate-manager-from-preview
# Conflicts:
#	lib/core/src/server/build-static.js
2018-11-05 19:09:47 +02:00
filipp.riabchun
418cbfc98a TeamCity change in 'Open-source projects / Storybook' project: 'https://github.com/storybooks/storybook#refs/heads/master (1)' VCS root was updated 2018-11-05 17:09:38 +00:00
Filipp Riabchun
203af32d5d
Allow features in next 2018-11-05 21:05:36 +04:00
igor-dv
dc92c1dccd Merge remote-tracking branch 'origin/next' into fix-deps 2018-11-05 18:56:29 +02:00
Igor
e79b3af122
Merge pull request #4708 from dumbNickname/mjs-support
Change extensions ordering in webpack config
2018-11-05 18:53:31 +02:00
Igor
c85cedbb5b
Merge pull request #4715 from cfleschhut/docs/add_auth0_cosmos_to_examples
docs(examples): Add Auth0 Cosmos to list of examples
2018-11-05 18:52:21 +02:00
Igor
cbda39cadf
Merge pull request #4669 from tarikhamilton/knobs/number-proptypes-bug
Fix PropTypes in addons/knobs NumberType
2018-11-05 18:50:59 +02:00
Igor
356fc904ec
Merge pull request #4683 from storybooks/addon-jest/fix-configureviewport
Addon Viewport - fix "defaultViewport" configuration
2018-11-05 18:48:22 +02:00
Igor
2a553acc7c
Merge pull request #4689 from storybooks/addon-jest/fix-tests-matching
Addons Jest - Fix test matching
2018-11-05 18:46:22 +02:00
Filipp Riabchun
7cba6dce58
Merge pull request #4720 from storybooks/node-11-fix
Fix tests in node 11 by using `Array#sort` correctly
2018-11-05 20:29:04 +04:00
Michael Shilman
4c757d05f1
Merge pull request #4722 from storybooks/master
Merge master to next
2018-11-06 00:11:23 +08:00
Filipp Riabchun
7b908a3270
Merge pull request #4719 from storybooks/shilman/update-release-process
Update release process and `master` becomes the stable branch
2018-11-05 19:50:45 +04:00
Michael Shilman
e3b260d165 NPM publish:next 2018-11-05 23:26:14 +08:00
Michael Shilman
0f48e5fe70 Comment out notes per CRA's PR template 2018-11-05 23:08:34 +08:00
Andrew Moss
880d335b06 clarify that puppeteer.connect is async 2018-11-05 14:52:28 +00:00
Andrew Moss
6029c9f69a Documentation on storyshots-puppeteer customBrowser option 2018-11-05 14:49:40 +00:00
Filipp Riabchun
326c19b2cd
Merge branch 'master' into fix-deps 2018-11-05 18:47:34 +04:00
Andrew Moss
d11a346a8a Allow specifying an existing browser for storyshots-puppeteer - this is useful for integrating storyshots with a headless Chrome instance running on another machine or in a Docker container. 2018-11-05 14:42:18 +00:00
Hypnosphi
0106721470 Fix tests in node 11 by using Array#sort correctly 2018-11-05 18:33:09 +04:00
Michael Shilman
916894c682 Remove redundant change 2018-11-05 21:56:17 +08:00
Michael Shilman
9beeb45a39 Update PR template with note about branching 2018-11-05 21:49:39 +08:00
Michael Shilman
f916a81095 Update release process and master becomes the stable branch 2018-11-05 21:34:37 +08:00
filipp.riabchun
9f9a261ab4 TeamCity change in 'Open-source projects / Storybook' project: 'Build' build configuration settings were updated 2018-11-05 13:10:53 +00:00
Filipp Riabchun
d92f7733ef
Merge pull request #4695 from chadfawcett/fix-css-relative-asset-urls
Fix css relative asset urls
2018-11-05 16:46:39 +04:00
Filipp Riabchun
a9e44d9dac
Merge pull request #4675 from storybooks/dependabot/npm_and_yarn/@angular/core-7.0.2
Bump @angular/core from 7.0.1 to 7.0.2
2018-11-05 16:44:43 +04:00
Filipp Riabchun
97eecb7c94
Merge pull request #4687 from storybooks/dependabot/npm_and_yarn/docs/merge-1.2.1
[Security] Bump merge from 1.2.0 to 1.2.1 in /docs
2018-11-05 16:41:31 +04:00
Filipp Riabchun
53f189f0b6
Merge pull request #4699 from storybooks/dependabot/npm_and_yarn/typescript-3.1.6
Bump typescript from 3.1.4 to 3.1.6
2018-11-05 16:40:46 +04:00
filipp.riabchun
cf1eaf4033 TeamCity change in 'Open-source projects / Storybook' project: runners of 'CLI test' build configuration were updated 2018-11-05 12:39:12 +00:00
Igor
882df8b793
Merge pull request #4698 from hipstersmoothie/hipstersmoothie-patch-1
Update components/Node.js in info addon
2018-11-05 12:07:34 +02:00
Igor
6de09d6b40
Merge pull request #4663 from emilio-martinez/fix/angular-zone-dep
Set zone.js as a peer and dev dependency
2018-11-05 12:03:28 +02:00
Christian Fleschhut
3a8fdca1e7 docs(examples): Add Auth0 Cosmos to list of examples 2018-11-05 10:52:42 +01:00
Igor
e1b7cf63f4
Merge pull request #4619 from Stephanemw/master
chore(core): update css-loader to latest
2018-11-05 11:05:03 +02:00
Igor
c8bc4cc2ce
Merge pull request #4649 from transitive-bullshit/bug/build-static-promise
Fix a bug with buildStaticStandalone resolving too early
2018-11-05 11:04:29 +02:00
Okamuuu
e7de7b6b91 [documentation] Improve doc for React Native (#4680)
* fix a error message: ReferenceError: Can't find variable: React
* fix a warning message:  Missing 'module' parameter for story with a kind
of 'CenteredView'. It will break your HMR
* doc: write more detail about app entry
2018-11-05 10:08:03 +02:00