Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs2: Extract doc blocks into a separate package #18587

Merged
merged 11 commits into from
Jun 29, 2022
Prev Previous commit
Next Next commit
Merge commit '95bd68d08a0f40ab37de688c8966932b3fb85aa8' into pr/iaman…
…drewluca/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
ndelangen committed Jun 29, 2022

Verified

This commit was signed with the committer’s verified signature.
ndelangen Norbert de Langen
commit ed240ebf0d63f9a8ff1baf65b749b4a80b95dcd3
2 changes: 1 addition & 1 deletion renderers/react/src/docs/react-argtypes.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import mapValues from 'lodash/mapValues';
import { PureArgsTable as ArgsTable } from '@storybook/blocks';
import type { Args } from '@storybook/api';
import type { Args } from '@storybook/csf';
import { inferControls } from '@storybook/store';

import { storiesOf } from '../public-api';
You are viewing a condensed version of this merge commit. You can view the full changes here.