Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: storybookjs/storybook
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.3.12
Choose a base ref
...
head repository: storybookjs/storybook
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.3.13
Choose a head ref
  • 19 commits
  • 93 files changed
  • 4 contributors

Commits on Oct 14, 2021

  1. Update git head to 6.3.12, update yarn.lock

    @shilman
    shilman committed Oct 14, 2021
    Copy the full SHA
    839f068 View commit details

  2. 6.3.12 latest.json version file

    @shilman
    shilman committed Oct 14, 2021
    Copy the full SHA
    3b513ba View commit details

Commits on Oct 26, 2021

  1. Merge pull request #16373 from meetpatel5396/patch-3 

    Update checkbox-story.mdx.mdx
    @shilman
    shilman committed Oct 26, 2021
    Copy the full SHA
    46cb7b1 View commit details

  2. Merge pull request #16378 from meetpatel5396/patch-4 

    Update doc-blocks.md
    @shilman
    shilman committed Oct 26, 2021
    Copy the full SHA
    8311b06 View commit details

  3. Merge pull request #16428 from happycollision/webpack-debug-docs 

    Fix docs: debug webpack command example
    @jonniebigodes @shilman
    jonniebigodes authored and shilman committed Oct 26, 2021
    Copy the full SHA
    1bc7640 View commit details

  4. Merge pull request #16463 from srmagura/docs-tsconfig-paths 

    docs: Reference section about TSConfig paths
    @shilman
    shilman committed Oct 26, 2021
    Copy the full SHA
    18a143f View commit details

  5. Merge pull request #12167 from tyankatsu0105/docs/add-default-value 

    docs: add typescript defaults reference
    @shilman
    shilman committed Oct 26, 2021
    Copy the full SHA
    095a4f6 View commit details

Commits on Nov 3, 2021

  1. Merge pull request #16379 from srmagura/faq-is-storybook 

    Add FAQ entry about process.env.STORYBOOK
    @jonniebigodes @shilman
    jonniebigodes authored and shilman committed Nov 3, 2021
    Copy the full SHA
    69be63b View commit details

  2. Merge pull request #16501 from solimant/patch-1 

    Fix typo in comment
    @jonniebigodes @shilman
    jonniebigodes authored and shilman committed Nov 3, 2021
    Copy the full SHA
    5ce4447 View commit details

  3. Merge pull request #16457 from facugaich/args-docs-patch 

    Docs: Fix React TS types in Args section snippets
    @jonniebigodes @shilman
    jonniebigodes authored and shilman committed Nov 3, 2021
    Copy the full SHA
    66fa879 View commit details

  4. Merge pull request #16516 from storybookjs/fix/docspage-inline-docs 

    Improve inline/iframe rendering documentation
    @shilman
    shilman committed Nov 3, 2021
    Copy the full SHA
    789136d View commit details

Commits on Nov 4, 2021

  1. Merge pull request #16577 from storybookjs/interactions-docs 

    Docs: Add first Interactions docs
    @shilman
    shilman committed Nov 4, 2021
    Copy the full SHA
    7b44fa2 View commit details

Commits on Nov 11, 2021

  1. Merge pull request #16580 from storybookjs/handle-release-branches-wo… 

    …rkflow

Add handle-release-branches-workflow

(Also includes 3757dd8, f3d4353, 6aac0a7, e8494fb from `next`)
    @kylegach
    kylegach committed Nov 11, 2021
    Copy the full SHA
    4cb0a54 View commit details

Commits on Nov 12, 2021

  1. Fix handle-release-branches workflow 

    - Ensure that not-on-remote branches are still pushed
- Prevent `main` from triggering dispatch event
    @kylegach
    kylegach committed Nov 12, 2021
    Copy the full SHA
    69dbf36 View commit details

Commits on Nov 26, 2021

  1. Merge pull request #16801 from storybookjs/fix-handle-release-branche… 

    …s-workflow

Fix `handle-release-branches` workflow
    @kylegach
    kylegach committed Nov 26, 2021
    Copy the full SHA
    f86f2f7 View commit details

Commits on Jan 10, 2022

  1. Merge pull request #17180 from storybookjs/17179-fix-cli-table3-color… 

    …s-dep

Bump cli-table3 to fix colors bug
    @shilman
    shilman committed Jan 10, 2022
    Copy the full SHA
    454990a View commit details

  2. 6.3.13 changelog

    @shilman
    shilman committed Jan 10, 2022
    Copy the full SHA
    5008315 View commit details

  3. Update root, peer deps, version.ts/json to 6.3.13 [ci skip]

    @shilman
    shilman committed Jan 10, 2022
    Copy the full SHA
    a3ea147 View commit details

  4. v6.3.13

    @shilman
    shilman committed Jan 10, 2022
    Copy the full SHA
    bea9abf View commit details
Showing with 1,298 additions and 1,097 deletions.
  1. +0 −14 .circleci/config.yml
  2. +99 −0 .github/workflows/handle-release-branches.yml
  3. +0 −30 .teamcity/settings.kts
  4. +7 −1 CHANGELOG.md
  5. +10 −10 addons/a11y/package.json
  6. +8 −8 addons/actions/package.json
  7. +8 −8 addons/backgrounds/package.json
  8. +8 −8 addons/controls/package.json
  9. +23 −23 addons/docs/package.json
  10. +14 −14 addons/essentials/package.json
  11. +7 −7 addons/jest/package.json
  12. +6 −6 addons/links/package.json
  13. +11 −11 addons/storyshots/storyshots-core/package.json
  14. +4 −4 addons/storyshots/storyshots-puppeteer/package.json
  15. +9 −9 addons/storysource/package.json
  16. +7 −7 addons/toolbars/package.json
  17. +8 −8 addons/viewport/package.json
  18. +8 −8 app/angular/package.json
  19. +4 −4 app/ember/package.json
  20. +6 −6 app/html/package.json
  21. +5 −5 app/preact/package.json
  22. +7 −7 app/react/package.json
  23. +8 −8 app/server/package.json
  24. +5 −5 app/svelte/package.json
  25. +5 −5 app/vue/package.json
  26. +5 −5 app/vue3/package.json
  27. +6 −6 app/web-components/package.json
  28. +8 −8 docs/configure/typescript.md
  29. +7 −3 docs/configure/webpack.md
  30. BIN docs/essentials/addon-interactions-installed-registered.png
  31. +65 −0 docs/essentials/interactions.md
  32. +11 −0 docs/snippets/common/storybook-interactions-addon-registration.js.mdx
  33. +27 −0 docs/snippets/common/storybook-interactions-play-function.js.mdx
  34. +2 −2 docs/snippets/react/button-story-with-args.ts.mdx
  35. +1 −1 docs/snippets/react/checkbox-story.mdx.mdx
  36. +2 −2 docs/snippets/react/my-component-story-with-nonstory.js.mdx
  37. +3 −3 docs/snippets/react/page-story-slots.ts.mdx
  38. +1 −1 docs/versions/latest.json
  39. +29 −0 docs/workflows/faq.md
  40. +2 −2 docs/writing-docs/doc-blocks.md
  41. +20 −5 docs/writing-docs/docs-page.md
  42. +13 −13 examples/angular-cli/package.json
  43. +13 −13 examples/cra-kitchen-sink/package.json
  44. +7 −7 examples/cra-react15/package.json
  45. +5 −5 examples/cra-ts-essentials/package.json
  46. +8 −8 examples/cra-ts-kitchen-sink/package.json
  47. +12 −12 examples/ember-cli/package.json
  48. +17 −17 examples/html-kitchen-sink/package.json
  49. +21 −21 examples/official-storybook/package.json
  50. +11 −11 examples/preact-kitchen-sink/package.json
  51. +5 −5 examples/react-ts-webpack4/package.json
  52. +6 −6 examples/react-ts/package.json
  53. +8 −8 examples/server-kitchen-sink/package.json
  54. +2 −2 examples/standalone-preview/package.json
  55. +13 −13 examples/svelte-kitchen-sink/package.json
  56. +6 −6 examples/vue-3-cli/package.json
  57. +5 −5 examples/vue-cli/package.json
  58. +13 −13 examples/vue-kitchen-sink/package.json
  59. +12 −12 examples/web-components-kitchen-sink/package.json
  60. +1 −1 lerna.json
  61. +8 −8 lib/addons/package.json
  62. +7 −7 lib/api/package.json
  63. +1 −1 lib/api/src/version.ts
  64. +15 −15 lib/builder-webpack4/package.json
  65. +14 −14 lib/builder-webpack5/package.json
  66. +5 −5 lib/channel-postmessage/package.json
  67. +3 −3 lib/channel-websocket/package.json
  68. +2 −2 lib/channels/package.json
  69. +3 −3 lib/cli-sb/package.json
  70. +3 −3 lib/cli-storybook/package.json
  71. +5 −5 lib/cli/package.json
  72. +55 −55 lib/cli/src/versions.json
  73. +7 −7 lib/client-api/package.json
  74. +2 −2 lib/client-logger/package.json
  75. +4 −4 lib/codemod/package.json
  76. +4 −4 lib/components/package.json
  77. +8 −8 lib/core-client/package.json
  78. +3 −3 lib/core-common/package.json
  79. +2 −2 lib/core-events/package.json
  80. +12 −12 lib/core-server/package.json
  81. +5 −5 lib/core/package.json
  82. +2 −2 lib/csf-tools/package.json
  83. +8 −8 lib/manager-webpack4/package.json
  84. +8 −8 lib/manager-webpack5/package.json
  85. +2 −2 lib/node-logger/package.json
  86. +2 −2 lib/postinstall/package.json
  87. +3 −3 lib/router/package.json
  88. +4 −4 lib/source-loader/package.json
  89. +3 −3 lib/theming/package.json
  90. +10 −10 lib/ui/package.json
  91. +1 −1 package.json
  92. +0 −24 scripts/build-frontpage.js
  93. +443 −430 yarn.lock
14 changes: 0 additions & 14 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -353,17 +353,6 @@ jobs:
command: |
cd examples/cra-react15
yarn storybook --smoke-test --quiet
frontpage:
executor: sb_node_12_browsers
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
- run:
name: Install dependencies
command: yarn install --immutable
- run:
name: Trigger build
command: ./scripts/build-frontpage.js
lint:
executor:
class: small
@@ -446,6 +435,3 @@ workflows:
- cra-bench:
requires:
- publish
deploy:
jobs:
- frontpage
99 changes: 99 additions & 0 deletions .github/workflows/handle-release-branches.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: Handle Release Branches

on:
push:

jobs:
branch-checks:
runs-on: ubuntu-latest
steps:
- id: get-branch
run: |
BRANCH=($(echo ${{ github.ref }} | sed -E 's/refs\/heads\///'))
echo "branch=$BRANCH" >> $GITHUB_ENV
outputs:
branch: ${{ env.branch }}
is-latest-branch: ${{ env.branch == 'main' }}
is-next-branch: ${{ env.branch == 'next' }}
is-release-branch: ${{ startsWith(env.branch, 'release-') }}
is-actionable-branch: ${{ env.branch == 'main' || env.branch == 'next' || startsWith(env.branch, 'release-') }}

handle-latest:
needs: branch-checks
if: ${{ needs.branch-checks.outputs.is-latest-branch == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- run: curl -X POST "https://api.netlify.com/build_hooks/${{ secrets.FRONTPAGE_HOOK }}"

get-next-release-branch:
needs: branch-checks
if: ${{ needs.branch-checks.outputs.is-next-branch == 'true' || needs.branch-checks.outputs.is-release-branch == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: next
path: next

- id: next-version
uses: notiz-dev/github-action-json-property@release
with:
path: ${{ github.workspace }}/next/package.json
prop_path: version

- run: |
NEXT_RELEASE_BRANCH=($(echo ${{ steps.next-version.outputs.prop }} | sed -E 's/([0-9]+)\.([0-9]+).*/release-\1-\2/'))
echo "next-release-branch=$NEXT_RELEASE_BRANCH" >> $GITHUB_ENV
outputs:
branch: ${{ env.next-release-branch }}

create-next-release-branch:
needs: [branch-checks, get-next-release-branch]
if: ${{ needs.branch-checks.outputs.is-next-branch == 'true' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- run: |
set +e
REMOTE_BRANCH=$(git branch -r | grep origin/${{ needs.get-next-release-branch.outputs.branch }})
if [[ ! -z $REMOTE_BRANCH ]]; then git push origin --delete ${{ needs.get-next-release-branch.outputs.branch }}; fi
echo 'Pushing branch ${{ needs.get-next-release-branch.outputs.branch }}...'
git push -f origin ${{ needs.branch-checks.outputs.branch }}:${{ needs.get-next-release-branch.outputs.branch }}
outputs:
branch: ${{ needs.get-next-release-branch.outputs.branch }}

next-release-branch-check:
if: ${{ always() }}
needs: [branch-checks, get-next-release-branch]
runs-on: ubuntu-latest
steps:
- run: |
IS_NEXT_RELEASE_BRANCH=${{ needs.branch-checks.outputs.branch == needs.get-next-release-branch.outputs.branch }}
echo "is-next-release-branch=$IS_NEXT_RELEASE_BRANCH" >> $GITHUB_ENV
- if: ${{ env.is-next-release-branch == 'true' }}
run: echo "relevant-base-branch=next" >> $GITHUB_ENV

- if: ${{ env.is-next-release-branch == 'true' }}
run: |
echo 'WARNING: Do not push directly to the `${{ needs.branch-checks.outputs.branch }}` branch. This branch is created and force-pushed over after pushing to the `${{ env.relevant-base-branch }}` branch and the changes you just pushed will be lost.'
exit 1
outputs:
check: ${{ env.is-next-release-branch }}

request-create-frontpage-branch:
if: ${{ always() }}
needs: [branch-checks, next-release-branch-check, create-next-release-branch]
runs-on: ubuntu-latest
steps:
- if: ${{ needs.branch-checks.outputs.is-actionable-branch == 'true' && needs.branch-checks.outputs.is-latest-branch == 'false' && needs.next-release-branch-check.outputs.check == 'false' }}
run: |
curl -X POST https://api.github.com/repos/storybookjs/frontpage/dispatches \
-H 'Accept: application/vnd.github.v3+json' \
-u ${{ secrets.FRONTPAGE_ACCESS_TOKEN }} \
--data '{"event_type": "request-create-frontpage-branch", "client_payload": { "branch": "${{ needs.create-next-release-branch.outputs.branch || needs.branch-checks.outputs.branch }}" }}'
30 changes: 0 additions & 30 deletions .teamcity/settings.kts
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,6 @@ project {
buildType(Build)
buildType(E2E)
buildType(SmokeTests)
buildType(Frontpage)
buildType(Test)
buildType(Coverage)

@@ -56,7 +55,6 @@ project {
RelativeId("Build"),
RelativeId("E2E"),
RelativeId("SmokeTests"),
RelativeId("Frontpage"),
RelativeId("Test"),
RelativeId("Coverage")
)
@@ -403,34 +401,6 @@ object SmokeTests : BuildType({
}
})

object Frontpage : BuildType({
name = "Frontpage"
type = Type.DEPLOYMENT

steps {
script {
scriptContent = """
#!/bin/bash
set -e -x
yarn install --immutable
yarn bootstrap --install
node ./scripts/build-frontpage.js
""".trimIndent()
dockerImage = "node:12"
dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
}
}

triggers {
vcs {
quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
triggerRules = "-:.teamcity/**"
branchFilter = "+:main"
}
}
})

object Test : BuildType({
name = "Test"

8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
## 6.3.13 (January 10, 2022)

### Dependency Upgrades

- Bump cli-table3 to fix colors bug ([#17180](https://github.com/storybookjs/storybook/pull/17180))

## 6.3.12 (October 14, 2021)

### Bug Fixes

* CLI: Force `sb upgrade` to use latest version of `npm-check-updates` ([#16336](https://github.com/storybookjs/storybook/pull/16336))
- CLI: Force `sb upgrade` to use latest version of `npm-check-updates` ([#16336](https://github.com/storybookjs/storybook/pull/16336))

## 6.3.11 (October 12, 2021)

20 changes: 10 additions & 10 deletions addons/a11y/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "6.3.12",
"version": "6.3.13",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
@@ -45,14 +45,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.12",
"@storybook/api": "6.3.12",
"@storybook/channels": "6.3.12",
"@storybook/client-api": "6.3.12",
"@storybook/client-logger": "6.3.12",
"@storybook/components": "6.3.12",
"@storybook/core-events": "6.3.12",
"@storybook/theming": "6.3.12",
"@storybook/addons": "6.3.13",
"@storybook/api": "6.3.13",
"@storybook/channels": "6.3.13",
"@storybook/client-api": "6.3.13",
"@storybook/client-logger": "6.3.13",
"@storybook/components": "6.3.13",
"@storybook/core-events": "6.3.13",
"@storybook/theming": "6.3.13",
"axe-core": "^4.2.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
@@ -81,7 +81,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "e99d07a19b2017b1d3d19fb5b514df6aee4868ce",
"gitHead": "0d700fd7700683d911e99aac2779aaa51e698ae9",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
16 changes: 8 additions & 8 deletions addons/actions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "6.3.12",
"version": "6.3.13",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
@@ -41,12 +41,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.12",
"@storybook/api": "6.3.12",
"@storybook/client-api": "6.3.12",
"@storybook/components": "6.3.12",
"@storybook/core-events": "6.3.12",
"@storybook/theming": "6.3.12",
"@storybook/addons": "6.3.13",
"@storybook/api": "6.3.13",
"@storybook/client-api": "6.3.13",
"@storybook/components": "6.3.13",
"@storybook/core-events": "6.3.13",
"@storybook/theming": "6.3.13",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
@@ -78,7 +78,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "e99d07a19b2017b1d3d19fb5b514df6aee4868ce",
"gitHead": "0d700fd7700683d911e99aac2779aaa51e698ae9",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Actions",
16 changes: 8 additions & 8 deletions addons/backgrounds/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "6.3.12",
"version": "6.3.13",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
@@ -45,12 +45,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.12",
"@storybook/api": "6.3.12",
"@storybook/client-logger": "6.3.12",
"@storybook/components": "6.3.12",
"@storybook/core-events": "6.3.12",
"@storybook/theming": "6.3.12",
"@storybook/addons": "6.3.13",
"@storybook/api": "6.3.13",
"@storybook/client-logger": "6.3.13",
"@storybook/components": "6.3.13",
"@storybook/core-events": "6.3.13",
"@storybook/theming": "6.3.13",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
@@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "e99d07a19b2017b1d3d19fb5b514df6aee4868ce",
"gitHead": "0d700fd7700683d911e99aac2779aaa51e698ae9",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Backgrounds",
16 changes: 8 additions & 8 deletions addons/controls/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "6.3.12",
"version": "6.3.13",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
@@ -45,12 +45,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.3.12",
"@storybook/api": "6.3.12",
"@storybook/client-api": "6.3.12",
"@storybook/components": "6.3.12",
"@storybook/node-logger": "6.3.12",
"@storybook/theming": "6.3.12",
"@storybook/addons": "6.3.13",
"@storybook/api": "6.3.13",
"@storybook/client-api": "6.3.13",
"@storybook/components": "6.3.13",
"@storybook/node-logger": "6.3.13",
"@storybook/theming": "6.3.13",
"core-js": "^3.8.2",
"ts-dedent": "^2.0.0"
},
@@ -69,7 +69,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "e99d07a19b2017b1d3d19fb5b514df6aee4868ce",
"gitHead": "0d700fd7700683d911e99aac2779aaa51e698ae9",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Controls",
Loading