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.

Sign up for GitHub

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
Merged

Docs2: Extract doc blocks into a separate package #18587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
93c4ff1
Extract doc blocks
shilman Jun 28, 2022
3a293e9
Merge branch 'future/base' into future/doc-blocks-take2
shilman Jun 29, 2022
ed240eb
Merge commit '95bd68d08a0f40ab37de688c8966932b3fb85aa8' into pr/iaman…
ndelangen Jun 29, 2022
69e4485
Merge branch 'future/doc-blocks-take2' of github.com:storybookjs/stor…
ndelangen Jun 29, 2022
2f0b362
we should revert this once the prebuilt manager is merged
ndelangen Jun 29, 2022
5b923f1
Merge branch 'future/base' into future/doc-blocks-take2
ndelangen Jun 29, 2022
7511432
fix example
ndelangen Jun 29, 2022
8b80e55
Merge branch 'future/base' into future/doc-blocks-take2
ndelangen Jun 29, 2022
4b11506
fix version mismatch
ndelangen Jun 29, 2022
37dd381
fixes
ndelangen Jun 29, 2022
36027e1
fix snapshots
ndelangen Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'future/base' into future/doc-blocks-take2 
# Conflicts:
#	addons/controls/package.json
#	addons/docs/package.json
#	yarn.lock
  • Loading branch information
@ndelangen
ndelangen committed Jun 29, 2022
commit 5b923f10fb7877a93498a4d0ea58058afa933bea
12 changes: 6 additions & 6 deletions addons/controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.6",
"@storybook/api": "7.0.0-alpha.6",
"@storybook/blocks": "7.0.0-alpha.6",
"@storybook/client-logger": "7.0.0-alpha.6",
"@storybook/components": "7.0.0-alpha.6",
"@storybook/core-common": "7.0.0-alpha.6",
"@storybook/addons": "7.0.0-alpha.7",
"@storybook/api": "7.0.0-alpha.7",
"@storybook/blocks": "7.0.0-alpha.7",
"@storybook/client-logger": "7.0.0-alpha.7",
"@storybook/components": "7.0.0-alpha.7",
"@storybook/core-common": "7.0.0-alpha.7",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/node-logger": "7.0.0-alpha.7",
"@storybook/store": "7.0.0-alpha.7",
Expand Down
12 changes: 6 additions & 6 deletions addons/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
"@babel/preset-env": "^7.12.11",
"@jest/transform": "^26.6.2",
"@mdx-js/react": "^1.6.22",
"@storybook/addons": "7.0.0-alpha.6",
"@storybook/api": "7.0.0-alpha.6",
"@storybook/blocks": "7.0.0-alpha.6",
"@storybook/components": "7.0.0-alpha.6",
"@storybook/core-common": "7.0.0-alpha.6",
"@storybook/core-events": "7.0.0-alpha.6",
"@storybook/addons": "7.0.0-alpha.7",
"@storybook/api": "7.0.0-alpha.7",
"@storybook/blocks": "7.0.0-alpha.7",
"@storybook/components": "7.0.0-alpha.7",
"@storybook/core-common": "7.0.0-alpha.7",
"@storybook/core-events": "7.0.0-alpha.7",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/csf-tools": "7.0.0-alpha.7",
"@storybook/docs-tools": "7.0.0-alpha.7",
Expand Down
2 changes: 1 addition & 1 deletion lib/blocks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/blocks",
"version": "7.0.0-alpha.6",
"version": "7.0.0-alpha.7",
"description": "Storybook Doc Blocks",
"keywords": [
"storybook"
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.