4162 Commits

Author	SHA1	Message	Date
Norbert de Langen	eb73376b32	I think this makes michael happy	2022-04-05 19:46:04 +02:00
Norbert de Langen	677c189c41	wip	2022-04-05 19:26:09 +02:00
Michael Shilman	4cb1d65de4	Update git head to 6.5.0-alpha.56, update yarn.lock	2022-04-06 00:19:54 +08:00
Mateusz Burzyński	fc7fd5ed5a	Merge branch 'next' into emotion11 ... # Conflicts: # addons/storyshots/storyshots-core/package.json # examples/official-storybook/package.json # lib/cli/src/versions.ts # yarn.lock	2022-04-05 13:52:36 +02:00
Michael Shilman	5dee0358ff	Controls: Rework conditional controls with globals, queries	2022-04-05 14:23:09 +08:00
Tom Coleman	2e3164630f	Update versions	2022-04-04 17:35:10 +10:00
Tom Coleman	8d49c86e05	Move stuff around in external-docs	2022-04-04 17:19:20 +10:00
Michael Shilman	14fb90c1fc	Merge branch 'next' into tech/docs-2-0	2022-04-04 09:02:01 +08:00
Michael Shilman	a666dc995d	Build: Add junit summary for CircleCI	2022-04-04 08:42:14 +08:00
Michael Shilman	b860ea1b2a	Merge branch 'next' into tech/docs-2-0	2022-04-04 08:04:49 +08:00
Michael Shilman	e188c4b149	Update git head to 6.5.0-alpha.55, update yarn.lock	2022-04-03 12:13:39 +08:00
Michael Shilman	7d43d8053a	Update git head to 6.5.0-alpha.54, update yarn.lock	2022-04-01 21:03:28 +08:00
souppower	815fc203b1	Update react and react-dom peerDeps	2022-04-01 18:36:13 +09:00
Michael Shilman	d1364095b3	Update git head to 6.5.0-alpha.53, update yarn.lock	2022-04-01 11:30:23 +08:00
Michael Shilman	666f25dc35	Merge branch 'next' into tech/refactor-simplified-addons-api	2022-04-01 09:35:16 +08:00
Michael Shilman	ab1edc8bac	Merge pull request #17705 from storybookjs/fix-pnp-tests ... Addon-docs: Fix dependencies for yarn pnp	2022-04-01 09:18:59 +08:00
Michael Shilman	d3b4566eed	Merge pull request #17282 from storybookjs/feat/testing-utilities ... Core/React: Add testing utilities	2022-04-01 09:17:57 +08:00
Norbert de Langen	e4d52f32f5	remove packtracker, we're not using it	2022-03-31 16:30:12 +02:00
Michael Shilman	528e0fc3c3	Merge branch 'next' into feat/testing-utilities	2022-03-31 22:19:14 +08:00
Michael Shilman	bfbb086830	Merge branch 'next' into fix-pnp-tests	2022-03-31 22:16:38 +08:00
Michael Shilman	030b20c56b	Merge branch 'next' into emotion11	2022-03-31 22:15:31 +08:00
Michael Shilman	283236184a	Merge branch 'next' into tech/refactor-simplified-addons-api	2022-03-31 22:15:06 +08:00
Michael Shilman	d20eb1b5a9	Merge pull request #17840 from storybookjs/tech/fix-e2e-tests ... Build: Swap order of e2e tests around	2022-03-31 22:14:35 +08:00
Norbert de Langen	1eaa1f0d3b	fix https://app.circleci.com/pipelines/github/storybookjs/storybook/24681/workflows/7fecc8cb-1e2e-40dd-aec4-3b89c08606c9/jobs/371526	2022-03-31 15:18:48 +02:00
Michael Shilman	d50e67414e	Merge branch 'next' into fix-pnp-tests	2022-03-31 19:30:25 +08:00
Norbert de Langen	5ba27cca19	Merge branch 'next' into tech/improve-version-range-webpack	2022-03-31 12:48:21 +02:00
Mateusz Burzyński	8b1f7bd65f	Merge branch 'next' into emotion11	2022-03-31 10:13:14 +02:00
Norbert de Langen	3ee4170650	Merge branch 'next' into tech/refactor-simplified-addons-api ... # Conflicts: # MIGRATION.md # addons/actions/package.json # addons/controls/package.json # addons/interactions/package.json # addons/jest/package.json # addons/toolbars/package.json # lib/cli/src/versions.ts # yarn.lock	2022-03-31 10:05:37 +02:00
Mateusz Burzyński	2c161546f3	Merge branch 'next' into emotion11	2022-03-31 09:42:58 +02:00
Norbert de Langen	22d118b401	chsnge version ranges of webpack in the apps (same as app/react)	2022-03-31 09:18:39 +02:00
Michael Shilman	08ea89535a	Update git head to 6.5.0-alpha.52, update yarn.lock	2022-03-31 13:37:46 +08:00
Tom Coleman	16390bf871	Fix Deepscaan	2022-03-29 17:45:58 +11:00
Tom Coleman	47dd010f74	Merge remote-tracking branch 'origin/next' into tech/docs-2-0	2022-03-29 17:35:43 +11:00
Yann Braga	af4e1ab8cf	update yarn lock	2022-03-28 22:26:04 +02:00
Yann Braga	23d2209e5f	Merge branch 'next' into feat/testing-utilities ... - also rename parameters for better consistency	2022-03-28 18:26:21 +02:00
Yann Braga	bcf7e4d03a	Move composeConfigs logic from preview-web to store	2022-03-28 18:24:15 +02:00
Norbert de Langen	513da1fa1d	merge next	2022-03-28 12:23:50 +02:00
Michael Shilman	c6bb24c514	Update git head to 6.5.0-alpha.51, update yarn.lock	2022-03-26 00:13:53 +08:00
Norbert de Langen	789a272204	Merge branch 'next' into tech/refactor-simplified-addons-api ... # Conflicts: # addons/actions/package.json # addons/controls/package.json # addons/interactions/package.json # addons/jest/package.json # addons/toolbars/package.json # examples/web-components-kitchen-sink/yarn.lock # yarn.lock	2022-03-24 16:44:34 +01:00
Yann Braga	a4ea8486c7	allow setGlobalConfig to accept array of configurations and compose them	2022-03-23 17:23:50 +01:00
Yann Braga	531c2ca38b	Merge branch 'next' into feat/testing-utilities	2022-03-23 11:31:30 +01:00
Norbert de Langen	b3d741f728	Merge branch 'next' into norbert/sb-164-sb17553-pre-bundle-prettier-to-avoid	2022-03-23 10:51:33 +01:00
Michael Shilman	f3413fca1c	Update git head to 6.5.0-alpha.50, update yarn.lock	2022-03-23 15:39:08 +08:00
Michael Shilman	4bb108f51c	Merge branch 'next' into 11984-conditional-controls	2022-03-23 14:04:50 +08:00
Michael Shilman	ce6efb79b5	Addon-interactions: manager/preview addons refactor	2022-03-23 03:33:11 +08:00
Yann Braga	f9931a0494	Merge branch 'next' into feat/testing-utilities	2022-03-21 10:43:17 +01:00
Tom Coleman	637cb42a4c	Added an external-docs example to show the basic use case	2022-03-21 16:50:41 +11:00
Mateusz Burzyński	1d761c25fa	Merge branch 'next' into emotion11 ... # Conflicts: # addons/docs/package.json # addons/storyshots/storyshots-core/package.json # lib/ui/src/containers/menu.tsx # yarn.lock	2022-03-18 21:36:14 +01:00
Norbert de Langen	13a55fd586	Merge branch 'next' into fix-pnp-tests ... # Conflicts: # addons/docs/package.json	2022-03-18 15:48:07 +01:00
Norbert de Langen	5222fae414	fix lockfile	2022-03-18 15:46:34 +01:00