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

Bump version on next: prerelease from 7.1.0-alpha.35 to 7.1.0-alpha.36 #23091

Merged
merged 50 commits into from
Jun 15, 2023
Merged

Bump version on next: prerelease from 7.1.0-alpha.35 to 7.1.0-alpha.36 #23091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
4154066
Add support for "@yarnpkg/fslib" and "@yarnpkg/libzip", and implement…
valentinpalkovic May 16, 2023
9c57628
Remove Angular 12 automigration
valentinpalkovic May 16, 2023
ed7813d
Read proper installed package version
valentinpalkovic May 19, 2023
6c06430
Fix lint
valentinpalkovic May 19, 2023
f3bc515
Remove unused import
valentinpalkovic May 19, 2023
ff9caf8
Take backslash paths into account
valentinpalkovic May 22, 2023
4fc7e9d
Await project type detection
valentinpalkovic May 22, 2023
32cce05
Await language detection
valentinpalkovic May 23, 2023
79c9724
Pass packageManager instead of packageJSON to detectLanguage
valentinpalkovic May 23, 2023
82d4e7a
Fix pnp/workspace related issues and read exact installed versions fr…
valentinpalkovic May 31, 2023
c226dcd
Get proper installed Storybook version
valentinpalkovic May 31, 2023
82f819e
Fix eslint plugin setup
valentinpalkovic May 31, 2023
5e2a357
Fix isNxProject function by returning boolean instead of number
valentinpalkovic May 31, 2023
f07c4c0
Fix error log
valentinpalkovic Jun 1, 2023
6aca79c
Fix test
valentinpalkovic Jun 1, 2023
a67383a
Fix return value of detectPnp
valentinpalkovic Jun 1, 2023
ec27b9b
Fix types
valentinpalkovic Jun 2, 2023
cf68d65
Remove comment
valentinpalkovic Jun 2, 2023
8f557f7
Add todo comment
valentinpalkovic Jun 2, 2023
e18f0dd
Merge branch 'next' into valentin/invalid-version-null
valentinpalkovic Jun 6, 2023
3789a2e
Merge branch 'next' into valentin/invalid-version-null
yannbf Jun 9, 2023
e3a4b9a
prebundle boxen
ndelangen Jun 15, 2023
e724228
Merge branch 'next' into valentin/invalid-version-null
yannbf Jun 15, 2023
408e8b8
Release: Fix frozen for patch PRs
kasperpeulen Jun 15, 2023
5d254f0
Release: Change naming of patch PR to shilmans suggestions
kasperpeulen Jun 15, 2023
84698c5
Release: Improved the PR description for both patch and prelease PRs
kasperpeulen Jun 15, 2023
0a88f95
await removeDependencies
yannbf Jun 15, 2023
1243877
Fix snapshot test
kasperpeulen Jun 15, 2023
b105011
Fix labeling PRs for patch step
kasperpeulen Jun 15, 2023
ecd7adf
Remove release tasks workflow
kasperpeulen Jun 15, 2023
be2b6d7
Sort changelog by importance
kasperpeulen Jun 15, 2023
908fe1b
Update CHANGELOG.md for v7.0.21
kasperpeulen Jun 15, 2023
d5b2ab2
Sync CHANGELOG.md from main to next in publish workflow
kasperpeulen Jun 15, 2023
5018b14
Ignore "Update changelog.md" commits
kasperpeulen Jun 15, 2023
0058f25
Fix tests
kasperpeulen Jun 15, 2023
f786b0f
fix async logic in removeDependencies
yannbf Jun 15, 2023
bd00ccd
Merge branch 'next' into valentin/invalid-version-null
yannbf Jun 15, 2023
9bd6e8a
Fix tests
kasperpeulen Jun 15, 2023
c33d131
Merge pull request #23083 from storybookjs/kasper/imrpove-release-title
kasperpeulen Jun 15, 2023
a884dcd
account for correct cwd in package proxies
yannbf Jun 15, 2023
33f8cc2
pass sandbox directory when adding stories
yannbf Jun 15, 2023
7d91a00
Merge branch 'next' into valentin/invalid-version-null
yannbf Jun 15, 2023
56b77e4
Merge pull request #23080 from storybookjs/norbert/boxen-prebundled
shilman Jun 15, 2023
2c3be33
prebundle boxen
yannbf Jun 15, 2023
9637c28
Telemetry: Count onboarding stories
shilman Jun 15, 2023
f00b9e0
Merge branch 'next' into valentin/invalid-version-null
yannbf Jun 15, 2023
8a424a0
Improve based on PR feedback
shilman Jun 15, 2023
88ea97b
Merge pull request #22642 from storybookjs/valentin/invalid-version-null
yannbf Jun 15, 2023
9f151fc
Merge pull request #23092 from storybookjs/shilman/count-onboarding-s…
shilman Jun 15, 2023
3c95cf1
Bump version from 7.1.0-alpha.35 to 7.1.0-alpha.36
github-actions[bot] Jun 15, 2023
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
19 changes: 0 additions & 19 deletions .github/workflows/check-release-tasks.yml
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions .github/workflows/prepare-patch-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
id: check-frozen
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: yarn release:is-pr-frozen
run: yarn release:is-pr-frozen --patch

- name: Cancel when frozen
if: steps.check-frozen.outputs.frozen == 'true' && github.event_name != 'workflow_dispatch'
Expand Down Expand Up @@ -138,13 +138,14 @@ jobs:
if PR_STATE=$(gh pr view --json state --jq .state 2>/dev/null) && [[ -n "$PR_STATE" && "$PR_STATE" == *"OPEN"* ]]; then
gh pr edit \
--repo "${{github.repository }}" \
--title "Bump version on \`main\`: patch from ${{ steps.versions.outputs.current }} to ${{ steps.versions.outputs.next }}" \
--title "Release: Patch ${{ steps.versions.outputs.next }}" \
--body "${{ steps.description.outputs.description }}"
else
gh pr create \
--repo "${{github.repository }}" \
--title "Bump version on \`main\`: patch from ${{ steps.versions.outputs.current }} to ${{ steps.versions.outputs.next }}" \
--title "Release: Patch ${{ steps.versions.outputs.next }}" \
--base latest-release \
--label "maintenance"
--head version-patch-from-${{ steps.versions.outputs.current }} \
--body "${{ steps.description.outputs.description }}"
fi
Expand All @@ -157,13 +158,14 @@ jobs:
if PR_STATE=$(gh pr view --json state --jq .state 2>/dev/null) && [[ -n "$PR_STATE" && "$PR_STATE" == *"OPEN"* ]]; then
gh pr edit \
--repo "${{github.repository }}"\
--title "Merge patches to \`main\`" \
--title "Release: Merge patches to \`main\` (without version bump)" \
--body "${{ steps.description.outputs.description }}"
else
gh pr create \
--repo "${{github.repository }}"\
--title "Merge patches to \`main\`" \
--title "Release: Merge patches to \`main\` (without version bump)" \
--base latest-release \
--label "build" \
--head version-patch-from-${{ steps.versions.outputs.current }} \
--body "${{ steps.description.outputs.description }}"
fi
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ jobs:

# tags are needed to get list of patches to label as picked
- name: Fetch git tags
if: github.ref_name == 'main-release'
if: github.ref_name == 'latest-release'
run: git fetch --tags origin

- name: Label patch PRs as picked
if: github.ref_name == 'main-release'
if: github.ref_name == 'latest-release'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: yarn release:label-patches
Expand All @@ -119,6 +119,17 @@ jobs:
git merge ${{ github.ref_name }}
git push origin ${{ steps.target.outputs.target }}

- name: Sync CHANGELOG.md from `main` to `next`
if: github.ref_name == 'latest-release'
run: |
git fetch origin next
git checkout next
git pull
git checkout origin/main ./CHANGELOG.md
git add ./CHANGELOG.md
git commit -m "Update CHANGELOG.md for v${{ steps.version.outputs.current-version }}"
git push origin next

# 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
388 changes: 106 additions & 282 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions CHANGELOG.prerelease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 7.1.0-alpha.36

- CLI: Fix "Invalid version null" issues by improved version detection - [#22642](https://github.com/storybookjs/storybook/pull/22642), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- CLI: Prebundle boxen to resolve a ESM/CJS incompatibility - [#23080](https://github.com/storybookjs/storybook/pull/23080), thanks [@ndelangen](https://github.com/ndelangen)!
- Telemetry: Count onboarding stories - [#23092](https://github.com/storybookjs/storybook/pull/23092), thanks [@shilman](https://github.com/shilman)!

## 7.1.0-alpha.35

- CLI: Skip builder selection for react native - [#23042](https://github.com/storybookjs/storybook/pull/23042), thanks [@dannyhw](https://github.com/dannyhw)!
Expand Down
20 changes: 10 additions & 10 deletions code/addons/a11y/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/channels": "7.1.0-alpha.35",
"@storybook/client-logger": "7.1.0-alpha.35",
"@storybook/components": "7.1.0-alpha.35",
"@storybook/core-events": "7.1.0-alpha.35",
"@storybook/addon-highlight": "7.1.0-alpha.36",
"@storybook/channels": "7.1.0-alpha.36",
"@storybook/client-logger": "7.1.0-alpha.36",
"@storybook/components": "7.1.0-alpha.36",
"@storybook/core-events": "7.1.0-alpha.36",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/theming": "7.1.0-alpha.35",
"@storybook/types": "7.1.0-alpha.35",
"@storybook/manager-api": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"@storybook/theming": "7.1.0-alpha.36",
"@storybook/types": "7.1.0-alpha.36",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/components": "7.1.0-alpha.35",
"@storybook/core-events": "7.1.0-alpha.35",
"@storybook/client-logger": "7.1.0-alpha.36",
"@storybook/components": "7.1.0-alpha.36",
"@storybook/core-events": "7.1.0-alpha.36",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/theming": "7.1.0-alpha.35",
"@storybook/types": "7.1.0-alpha.35",
"@storybook/manager-api": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"@storybook/theming": "7.1.0-alpha.36",
"@storybook/types": "7.1.0-alpha.36",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/components": "7.1.0-alpha.35",
"@storybook/core-events": "7.1.0-alpha.35",
"@storybook/client-logger": "7.1.0-alpha.36",
"@storybook/components": "7.1.0-alpha.36",
"@storybook/core-events": "7.1.0-alpha.36",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/theming": "7.1.0-alpha.35",
"@storybook/types": "7.1.0-alpha.35",
"@storybook/manager-api": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"@storybook/theming": "7.1.0-alpha.36",
"@storybook/types": "7.1.0-alpha.36",
"memoizerific": "^1.11.3",
"ts-dedent": "^2.0.0"
},
Expand Down
20 changes: 10 additions & 10 deletions code/addons/controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/client-logger": "7.1.0-alpha.35",
"@storybook/components": "7.1.0-alpha.35",
"@storybook/core-common": "7.1.0-alpha.35",
"@storybook/manager-api": "7.1.0-alpha.35",
"@storybook/node-logger": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/theming": "7.1.0-alpha.35",
"@storybook/types": "7.1.0-alpha.35",
"@storybook/blocks": "7.1.0-alpha.36",
"@storybook/client-logger": "7.1.0-alpha.36",
"@storybook/components": "7.1.0-alpha.36",
"@storybook/core-common": "7.1.0-alpha.36",
"@storybook/manager-api": "7.1.0-alpha.36",
"@storybook/node-logger": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"@storybook/theming": "7.1.0-alpha.36",
"@storybook/types": "7.1.0-alpha.36",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
},
Expand Down
24 changes: 12 additions & 12 deletions code/addons/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/client-logger": "7.1.0-alpha.35",
"@storybook/components": "7.1.0-alpha.35",
"@storybook/csf-plugin": "7.1.0-alpha.35",
"@storybook/csf-tools": "7.1.0-alpha.35",
"@storybook/blocks": "7.1.0-alpha.36",
"@storybook/client-logger": "7.1.0-alpha.36",
"@storybook/components": "7.1.0-alpha.36",
"@storybook/csf-plugin": "7.1.0-alpha.36",
"@storybook/csf-tools": "7.1.0-alpha.36",
"@storybook/global": "^5.0.0",
"@storybook/mdx2-csf": "^1.0.0",
"@storybook/node-logger": "7.1.0-alpha.35",
"@storybook/postinstall": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/react-dom-shim": "7.1.0-alpha.35",
"@storybook/theming": "7.1.0-alpha.35",
"@storybook/types": "7.1.0-alpha.35",
"@storybook/node-logger": "7.1.0-alpha.36",
"@storybook/postinstall": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"@storybook/react-dom-shim": "7.1.0-alpha.36",
"@storybook/theming": "7.1.0-alpha.36",
"@storybook/types": "7.1.0-alpha.36",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/addon-backgrounds": "7.1.0-alpha.35",
"@storybook/addon-controls": "7.1.0-alpha.35",
"@storybook/addon-docs": "7.1.0-alpha.35",
"@storybook/addon-highlight": "7.1.0-alpha.35",
"@storybook/addon-measure": "7.1.0-alpha.35",
"@storybook/addon-outline": "7.1.0-alpha.35",
"@storybook/addon-toolbars": "7.1.0-alpha.35",
"@storybook/addon-viewport": "7.1.0-alpha.35",
"@storybook/core-common": "7.1.0-alpha.35",
"@storybook/manager-api": "7.1.0-alpha.35",
"@storybook/node-logger": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/addon-actions": "7.1.0-alpha.36",
"@storybook/addon-backgrounds": "7.1.0-alpha.36",
"@storybook/addon-controls": "7.1.0-alpha.36",
"@storybook/addon-docs": "7.1.0-alpha.36",
"@storybook/addon-highlight": "7.1.0-alpha.36",
"@storybook/addon-measure": "7.1.0-alpha.36",
"@storybook/addon-outline": "7.1.0-alpha.36",
"@storybook/addon-toolbars": "7.1.0-alpha.36",
"@storybook/addon-viewport": "7.1.0-alpha.36",
"@storybook/core-common": "7.1.0-alpha.36",
"@storybook/manager-api": "7.1.0-alpha.36",
"@storybook/node-logger": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@storybook/vue": "7.1.0-alpha.35",
"@storybook/vue": "7.1.0-alpha.36",
"typescript": "^4.9.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/addons/gfm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-mdx-gfm",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/node-logger": "7.1.0-alpha.36",
"remark-gfm": "^3.0.1",
"ts-dedent": "^2.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions code/addons/highlight/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-highlight",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/core-events": "7.1.0-alpha.36",
"@storybook/global": "^5.0.0",
"@storybook/preview-api": "7.1.0-alpha.35"
"@storybook/preview-api": "7.1.0-alpha.36"
},
"devDependencies": {
"@types/webpack-env": "^1.16.0",
Expand Down
20 changes: 10 additions & 10 deletions code/addons/interactions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-interactions",
"version": "7.1.0-alpha.35",
"version": "7.1.0-alpha.36",
"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.35",
"@storybook/components": "7.1.0-alpha.35",
"@storybook/core-common": "7.1.0-alpha.35",
"@storybook/core-events": "7.1.0-alpha.35",
"@storybook/client-logger": "7.1.0-alpha.36",
"@storybook/components": "7.1.0-alpha.36",
"@storybook/core-common": "7.1.0-alpha.36",
"@storybook/core-events": "7.1.0-alpha.36",
"@storybook/global": "^5.0.0",
"@storybook/instrumenter": "7.1.0-alpha.35",
"@storybook/manager-api": "7.1.0-alpha.35",
"@storybook/preview-api": "7.1.0-alpha.35",
"@storybook/theming": "7.1.0-alpha.35",
"@storybook/types": "7.1.0-alpha.35",
"@storybook/instrumenter": "7.1.0-alpha.36",
"@storybook/manager-api": "7.1.0-alpha.36",
"@storybook/preview-api": "7.1.0-alpha.36",
"@storybook/theming": "7.1.0-alpha.36",
"@storybook/types": "7.1.0-alpha.36",
"jest-mock": "^29.5.0",
"polished": "^4.2.2",
"ts-dedent": "^2.2.0"
Expand Down
Loading