Skip to content

Commit

Permalink
Merge branch 'next' into kasper/whatsnew
Browse files Browse the repository at this point in the history
  • Loading branch information
kasperpeulen committed Jul 4, 2023
2 parents c62d08b + d4a3a23 commit a963daf
Show file tree
Hide file tree
Showing 110 changed files with 1,392 additions and 1,188 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ jobs:
- name: Sync CHANGELOG.md from `main` to `next`
if: github.ref_name == 'latest-release'
working-directory: .
run: |
git fetch origin next
git checkout next
Expand All @@ -130,6 +131,18 @@ jobs:
git commit -m "Update CHANGELOG.md for v${{ steps.version.outputs.current-version }}"
git push origin next
- name: Sync versions/next.json from `next` to `main`
if: github.ref_name == 'next-release'
working-directory: .
run: |
git fetch origin main
git checkout main
git pull
git checkout origin/next ./docs/versions/next.json
git add ./docs/versions/next.json
git commit -m "Update versions/next.json for v${{ steps.version.outputs.current-version }}"
git push origin main
# Force push from next to main if it is not a prerelease, and this release is from next-release
# This happens when eg. next has been tracking 7.1.0-alpha.X, and now we want to release 7.1.0
# This will keep release-next, next and main all tracking v7.1.0
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.prerelease.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 7.1.0-alpha.43

- Addons: Remove deprecated addPanel use and misc improvements - [#23284](https://github.com/storybookjs/storybook/pull/23284), thanks [@ndelangen](https://github.com/ndelangen)!
- CSF-tools: Allow type checking in story title - [#22791](https://github.com/storybookjs/storybook/pull/22791), thanks [@honzahruby](https://github.com/honzahruby)!

## 7.1.0-alpha.42

- CLI: Fix pnp paths logic in storybook metadata - [#23259](https://github.com/storybookjs/storybook/pull/23259), thanks [@yannbf](https://github.com/yannbf)!
Expand Down
20 changes: 10 additions & 10 deletions code/addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -63,16 +63,16 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/addon-highlight": "7.1.0-alpha.42",
"@storybook/channels": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/addon-highlight": "7.1.0-alpha.43",
"@storybook/channels": "7.1.0-alpha.43",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"axe-core": "^4.2.0",
"lodash": "^4.17.21",
"react-resize-detector": "^7.1.2"
Expand Down
16 changes: 8 additions & 8 deletions code/addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -80,14 +80,14 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"dequal": "^2.0.2",
"lodash": "^4.17.21",
"polished": "^4.2.2",
Expand Down
16 changes: 8 additions & 8 deletions code/addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -76,14 +76,14 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"memoizerific": "^1.11.3",
"ts-dedent": "^2.0.0"
},
Expand Down
20 changes: 10 additions & 10 deletions code/addons/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -68,15 +68,15 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/blocks": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/core-common": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/node-logger": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/blocks": "7.1.0-alpha.43",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/core-common": "7.1.0-alpha.43",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/node-logger": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
},
Expand Down
24 changes: 12 additions & 12 deletions code/addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -99,19 +99,19 @@
"dependencies": {
"@jest/transform": "^29.3.1",
"@mdx-js/react": "^2.1.5",
"@storybook/blocks": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/csf-plugin": "7.1.0-alpha.42",
"@storybook/csf-tools": "7.1.0-alpha.42",
"@storybook/blocks": "7.1.0-alpha.43",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/csf-plugin": "7.1.0-alpha.43",
"@storybook/csf-tools": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/mdx2-csf": "^1.0.0",
"@storybook/node-logger": "7.1.0-alpha.42",
"@storybook/postinstall": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/react-dom-shim": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/node-logger": "7.1.0-alpha.43",
"@storybook/postinstall": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/react-dom-shim": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"fs-extra": "^11.1.0",
"remark-external-links": "^8.0.0",
"remark-slug": "^6.0.0",
Expand Down
30 changes: 15 additions & 15 deletions code/addons/essentials/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Curated addons to bring out the best of Storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -119,23 +119,23 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/addon-actions": "7.1.0-alpha.42",
"@storybook/addon-backgrounds": "7.1.0-alpha.42",
"@storybook/addon-controls": "7.1.0-alpha.42",
"@storybook/addon-docs": "7.1.0-alpha.42",
"@storybook/addon-highlight": "7.1.0-alpha.42",
"@storybook/addon-measure": "7.1.0-alpha.42",
"@storybook/addon-outline": "7.1.0-alpha.42",
"@storybook/addon-toolbars": "7.1.0-alpha.42",
"@storybook/addon-viewport": "7.1.0-alpha.42",
"@storybook/core-common": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/node-logger": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/addon-actions": "7.1.0-alpha.43",
"@storybook/addon-backgrounds": "7.1.0-alpha.43",
"@storybook/addon-controls": "7.1.0-alpha.43",
"@storybook/addon-docs": "7.1.0-alpha.43",
"@storybook/addon-highlight": "7.1.0-alpha.43",
"@storybook/addon-measure": "7.1.0-alpha.43",
"@storybook/addon-outline": "7.1.0-alpha.43",
"@storybook/addon-toolbars": "7.1.0-alpha.43",
"@storybook/addon-viewport": "7.1.0-alpha.43",
"@storybook/core-common": "7.1.0-alpha.43",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/node-logger": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@storybook/vue": "7.1.0-alpha.42",
"@storybook/vue": "7.1.0-alpha.43",
"typescript": "^4.9.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/addons/gfm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-mdx-gfm",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "GitHub Flavored Markdown in Storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -51,7 +51,7 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/node-logger": "7.1.0-alpha.42",
"@storybook/node-logger": "7.1.0-alpha.43",
"remark-gfm": "^3.0.1",
"ts-dedent": "^2.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions code/addons/highlight/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-highlight",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Highlight DOM nodes within your stories",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -61,9 +61,9 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/preview-api": "7.1.0-alpha.42"
"@storybook/preview-api": "7.1.0-alpha.43"
},
"devDependencies": {
"@types/webpack-env": "^1.16.0",
Expand Down
20 changes: 10 additions & 10 deletions code/addons/interactions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-interactions",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Automate, test and debug user interactions",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -72,16 +72,16 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/core-common": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/core-common": "7.1.0-alpha.43",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/instrumenter": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/instrumenter": "7.1.0-alpha.43",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"jest-mock": "^29.5.0",
"polished": "^4.2.2",
"ts-dedent": "^2.2.0"
Expand Down
14 changes: 7 additions & 7 deletions code/addons/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-jest",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand Down Expand Up @@ -70,13 +70,13 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/components": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/components": "7.1.0-alpha.43",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/theming": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/theming": "7.1.0-alpha.43",
"react-resize-detector": "^7.1.2",
"tiny-invariant": "^1.3.1",
"upath": "^2.0.1"
Expand Down
14 changes: 7 additions & 7 deletions code/addons/links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-links",
"version": "7.1.0-alpha.42",
"version": "7.1.0-alpha.43",
"description": "Link stories together to build demos and prototypes with your UI components",
"keywords": [
"addon",
Expand Down Expand Up @@ -80,14 +80,14 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.42",
"@storybook/core-events": "7.1.0-alpha.42",
"@storybook/client-logger": "7.1.0-alpha.43",
"@storybook/core-events": "7.1.0-alpha.43",
"@storybook/csf": "^0.1.0",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.42",
"@storybook/preview-api": "7.1.0-alpha.42",
"@storybook/router": "7.1.0-alpha.42",
"@storybook/types": "7.1.0-alpha.42",
"@storybook/manager-api": "7.1.0-alpha.43",
"@storybook/preview-api": "7.1.0-alpha.43",
"@storybook/router": "7.1.0-alpha.43",
"@storybook/types": "7.1.0-alpha.43",
"prop-types": "^15.7.2",
"ts-dedent": "^2.0.0"
},
Expand Down
Loading

0 comments on commit a963daf

Please sign in to comment.