40921 Commits

Author SHA1 Message Date
Norbert de Langen
6537a1203b
fix 2022-07-01 11:57:19 +02:00
Norbert de Langen
ea3191f0c8
Merge branch 'next' into future/base
# Conflicts:
#	addons/storyshots/storyshots-puppeteer/package.json
#	addons/storysource/package.json
#	examples/official-storybook/stories/addon-a11y/highlight.stories.js
#	lib/api/src/lib/stories.ts
#	lib/api/src/tests/stories.test.ts
#	lib/core-server/src/build-static.ts
#	lib/core-server/src/utils/StoryIndexGenerator.ts
#	lib/manager-webpack4/src/presets/manager-preset.ts
#	lib/telemetry/src/get-monorepo-type.ts
#	yarn.lock
2022-07-01 11:51:12 +02:00
Norbert de Langen
73d821fe3a
cleanup 2022-06-29 21:07:07 +02:00
Michael Shilman
6b559e831c Update git head to 7.0.0-alpha.8, update yarn.lock 2022-06-29 23:59:23 +08:00
Michael Shilman
24725501c3 v7.0.0-alpha.8 v7.0.0-alpha.8 2022-06-29 23:55:07 +08:00
Michael Shilman
94f0d5a5ed Update root, peer deps, version.ts/json to 7.0.0-alpha.8 [ci skip] 2022-06-29 23:38:30 +08:00
Michael Shilman
83be3c348a 7.0.0-alpha.8 changelog 2022-06-29 23:38:07 +08:00
Norbert de Langen
eff9366ab5
Merge pull request #18587 from storybookjs/future/doc-blocks-take2
Docs2: Extract doc blocks into a separate package
2022-06-29 15:14:03 +02:00
Norbert de Langen
36027e190a
fix snapshots 2022-06-29 14:55:36 +02:00
Norbert de Langen
37dd381f97
fixes 2022-06-29 14:31:18 +02:00
Norbert de Langen
4b1150679b
fix version mismatch 2022-06-29 14:10:24 +02:00
Norbert de Langen
8b80e55c1b
Merge branch 'future/base' into future/doc-blocks-take2 2022-06-29 14:03:58 +02:00
Norbert de Langen
1ff07faea7
fix snapshot tests 2022-06-29 14:03:44 +02:00
Norbert de Langen
75114322b9
fix example 2022-06-29 13:59:11 +02:00
Norbert de Langen
5b923f10fb
Merge branch 'future/base' into future/doc-blocks-take2
# Conflicts:
#	addons/controls/package.json
#	addons/docs/package.json
#	yarn.lock
2022-06-29 13:54:19 +02:00
Norbert de Langen
4b2035344e
Merge branch 'future/base' of github.com:storybookjs/storybook into future/base 2022-06-29 13:45:08 +02:00
Norbert de Langen
ff95de65a0
Merge branch 'next' into future/base
# Conflicts:
#	lib/builder-webpack4/src/preview/babel-loader-preview.ts
#	lib/builder-webpack5/src/preview/babel-loader-preview.ts
#	lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix
#	lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix
#	lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix
#	lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix
#	lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix
#	lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix
#	lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix
#	lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix
#	lib/manager-webpack4/src/presets/babel-loader-manager.ts
#	lib/manager-webpack5/src/presets/babel-loader-manager.ts
2022-06-29 13:41:54 +02:00
Michael Shilman
c1aef91bf2 Update git head to 7.0.0-alpha.7, update yarn.lock 2022-06-29 19:33:21 +08:00
Michael Shilman
d334cabd25 v7.0.0-alpha.7 v7.0.0-alpha.7 2022-06-29 19:29:39 +08:00
Norbert de Langen
2f0b3626ae
we should revert this once the prebuilt manager is merged 2022-06-29 13:24:47 +02:00
Norbert de Langen
69e4485dc9
Merge branch 'future/doc-blocks-take2' of github.com:storybookjs/storybook into future/doc-blocks-take2 2022-06-29 13:14:56 +02:00
Norbert de Langen
ed240ebf0d
Merge commit '95bd68d08a0f40ab37de688c8966932b3fb85aa8' into pr/iamandrewluca/18323
# Conflicts:
#	.circleci/config.yml
#	SECURITY.md
#	addons/a11y/src/components/VisionSimulator.test.tsx
#	app/vue/src/client/preview/config.ts
#	app/vue3/src/client/preview/config.ts
#	docs/addons/writing-addons.md
#	docs/api/cli-options.md
#	docs/builders/webpack.md
#	docs/configure/css-troubleshooting/angular.mdx
#	docs/contribute/code.md
#	docs/contribute/new-snippets.md
#	docs/essentials/interactions.md
#	docs/essentials/introduction.md
#	docs/faq.md
#	docs/get-started/install.md
#	docs/sharing/publish-storybook.md
#	docs/snippets/common/button-story-project-args-theme.js.mdx
#	docs/snippets/common/storybook-main-enable-transcludemarkdown.js.mdx
#	docs/snippets/common/storybook-main-with-single-static-dir.js.mdx
#	docs/snippets/common/storybook-test-runner-install.npm.js.mdx
#	docs/snippets/common/storybook-test-runner-install.yarn.js.mdx
#	docs/snippets/common/storybook-vite-builder-aliasing.js.mdx
#	docs/writing-stories/build-pages-with-storybook.md
#	docs/writing-stories/play-function.md
#	docs/writing-tests/snapshot-testing.md
#	docs/writing-tests/visual-testing.md
#	examples/vue-3-cli/.storybook/main.js
#	examples/vue-cli/.storybook/main.js
#	examples/vue-kitchen-sink/.storybook/main.js
#	examples/vue-kitchen-sink/.storybook/preview.js
#	examples/vue-kitchen-sink/src/App.vue
#	examples/vue-kitchen-sink/src/stories/__snapshots__/core.stories.storyshot
#	examples/vue-kitchen-sink/src/stories/__snapshots__/custom-decorators.stories.storyshot
#	examples/vue-kitchen-sink/src/stories/core.stories.js
#	lib/cli/src/generators/ANGULAR/angular-helpers.ts
#	lib/cli/src/generators/ANGULAR/index.ts
#	lib/components/package.json
#	lib/components/src/blocks/ArgsTable/ArgsTable.tsx
#	lib/components/src/blocks/Source.tsx
#	lib/components/src/spaced/Spaced.tsx
#	lib/components/src/tabs/tabs.tsx
#	lib/core-server/package.json
#	lib/preview-web/src/Preview.tsx
#	lib/preview-web/src/PreviewWeb.integration.test.ts
#	lib/preview-web/src/PreviewWeb.mockdata.ts
#	lib/preview-web/src/PreviewWeb.test.ts
#	lib/preview-web/src/PreviewWeb.tsx
#	lib/ui/src/index.tsx
#	yarn.lock
2022-06-29 13:14:45 +02:00
Michael Shilman
44d892356d Update root, peer deps, version.ts/json to 7.0.0-alpha.7 [ci skip] 2022-06-29 19:06:01 +08:00
Michael Shilman
bf03b23e7d 7.0.0-alpha.7 changelog 2022-06-29 19:05:40 +08:00
Michael Shilman
36d99ceeb0
Merge pull request #18546 from storybookjs/future/tsup-libs-1
Build: Use TSUP to compile `core-common`
2022-06-29 18:49:51 +08:00
Michael Shilman
fcacaf742f
Merge pull request #18544 from storybookjs/future/tsup-presets-1
Build: Use TSUP to compile the presets
2022-06-29 18:48:44 +08:00
Michael Shilman
ad680d1acc
Merge pull request #18543 from storybookjs/future/tsup-frameworks-1
Build: Use TSUP to compile the frameworks
2022-06-29 18:46:58 +08:00
Michael Shilman
cdf7eee821
Merge pull request #18534 from storybookjs/future/tsup-renderers-1
Build: Use TSUP to compile the renderers
2022-06-29 18:45:17 +08:00
Michael Shilman
3a293e9937 Merge branch 'future/base' into future/doc-blocks-take2 2022-06-29 18:41:17 +08:00
Michael Shilman
a4a8c8adbf Upgrade sb bench 2022-06-29 18:38:07 +08:00
Michael Shilman
e3308f6630
Merge pull request #18504 from storybookjs/future/SB-444
TypeScript: Re-structure types for frameworks and presets
2022-06-29 18:31:40 +08:00
Michael Shilman
7eef5f0ede
Merge pull request #18502 from ddalpange/support-cjs
Webpack: Support .cjs extension
2022-06-29 18:18:12 +08:00
Yohan Kim
37cd0c2a8b Updatet snaphots 2022-06-29 17:54:05 +09:00
Yohan Kim
2625f6a4a4 Fix order of extensions 2022-06-29 17:46:27 +09:00
Norbert de Langen
1deadc575c
Merge branch 'future/tsup-presets-1' into future/tsup-libs-1 2022-06-29 09:57:45 +02:00
Norbert de Langen
4cc186bae2
Merge branch 'future/tsup-frameworks-1' into future/tsup-presets-1 2022-06-29 09:57:27 +02:00
Norbert de Langen
e4e20c174c
Merge branch 'future/tsup-renderers-1' into future/tsup-frameworks-1 2022-06-29 09:57:08 +02:00
Norbert de Langen
3310271cdb
Merge branch 'future/SB-444' into future/tsup-renderers-1 2022-06-29 09:56:41 +02:00
Norbert de Langen
83759ea727
Merge branch 'future/base' into future/SB-444
# Conflicts:
#	docs/snippets/html/button-story-with-args.ts.mdx
2022-06-29 09:56:16 +02:00
Norbert de Langen
1036764079
Merge branch 'future/base' into future/tsup-renderers-1
# Conflicts:
#	docs/snippets/html/button-story-with-args.ts.mdx
2022-06-29 09:55:33 +02:00
Norbert de Langen
884b72104d
Merge branch 'future/base' into future/tsup-frameworks-1
# Conflicts:
#	docs/snippets/html/button-story-with-args.ts.mdx
2022-06-29 09:54:54 +02:00
Norbert de Langen
a9938d4127
Merge branch 'future/base' into future/tsup-presets-1
# Conflicts:
#	docs/snippets/html/button-story-with-args.ts.mdx
2022-06-29 09:53:36 +02:00
Norbert de Langen
8731c24bce
Merge branch 'future/base' into future/tsup-libs-1
# Conflicts:
#	docs/snippets/html/button-story-with-args.ts.mdx
2022-06-29 09:51:27 +02:00
Norbert de Langen
6c3556bb9e
Merge pull request #18597 from storybookjs/future/update-base-with-next
Future/update base with next
2022-06-29 09:15:30 +02:00
Norbert de Langen
90bbbda292
Merge branch 'next' into future/update-base-with-next
# Conflicts:
#	addons/interactions/package.json
#	examples/angular-cli/package.json
#	examples/official-storybook/package.json
#	examples/svelte-kitchen-sink/package.json
#	examples/vue-3-cli/package.json
#	examples/vue-kitchen-sink/package.json
#	examples/web-components-kitchen-sink/package.json
#	package.json
#	yarn.lock
2022-06-29 08:52:29 +02:00
Norbert de Langen
88486fbb42
apply review comments (thanks) 2022-06-29 08:45:17 +02:00
Michael Shilman
63460cf5a1 Merge branch 'future/base' into future/SB-444 2022-06-29 10:00:47 +08:00
Michael Shilman
4eefe54504
Merge pull request #17800 from storybookjs/addon-highlight
Essentials: Add highlight addon
2022-06-29 09:52:23 +08:00
winkerVSbecks
8396fc8c39 update examples to use addon-highlight 2022-06-28 19:57:30 -04:00
winkerVSbecks
c7da962221 update deps version for addon-highlight 2022-06-28 18:52:33 -04:00