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

Release: Patch 7.0.26 #23285

Merged
merged 17 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ca612f1
sync GH workflows from next to main
JReinhold Jul 4, 2023
190a7e5
sync release scripts from next to main
JReinhold Jul 4, 2023
2470c06
Update versions/next.json for v7.1.0-alpha.44
github-actions[bot] Jul 4, 2023
a049a44
Update versions/next.json for v7.1.0-beta.0
github-actions[bot] Jul 4, 2023
c13b812
Merge pull request #23246 from storybookjs/chore_docs_addon_changes
jonniebigodes Jul 3, 2023
d30805d
Merge pull request #23235 from storybookjs/23000-bug-new-release-flow…
shilman Jul 4, 2023
3633b71
Merge pull request #23299 from storybookjs/fix-version-json
JReinhold Jul 4, 2023
ef2c02e
Merge pull request #23306 from storybookjs/valentin/remove-ubuntu-mac…
valentinpalkovic Jul 4, 2023
0f8218d
Merge pull request #23303 from storybookjs/valentin/apply-storybook-n…
valentinpalkovic Jul 4, 2023
d015fb3
Merge pull request #23305 from storybookjs/valentin/fix-windows-tests
valentinpalkovic Jul 4, 2023
19f91cd
Bump version from 7.0.25 to 7.0.26
github-actions[bot] Jul 4, 2023
40f4981
tMerge pull request #23296 from storybookjs/valentin/fix-next-images-…
valentinpalkovic Jun 19, 2023
533bc69
Merge pull request #21909 from martinnabhan/next-image-disable-lazy-l…
valentinpalkovic Apr 25, 2023
f57d66e
Update 7.0.26 changelog
shilman Jul 4, 2023
b4f47c5
Merge pull request #23296 from storybookjs/valentin/fix-next-images-i…
valentinpalkovic Jul 4, 2023
3e2e88a
Fix types for Next.js
valentinpalkovic May 30, 2023
8a5b568
Skip flaky nextjs test
valentinpalkovic May 3, 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
15 changes: 14 additions & 1 deletion .github/workflows/danger-js.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
on:
pull_request:
types: [opened, synchronize, reopened, labeled, unlabeled, edited]
types:
- opened
- synchronize
- reopened
- labeled
- unlabeled
- edited
branches:
- main
- next

concurrency:
group: ${{ github.workflow }}-${{ github.event.number }}
cancel-in-progress: true

name: Danger JS
jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ jobs:
gh pr create \
--repo "${{github.repository }}" \
--title "Release: Patch ${{ steps.versions.outputs.next }}" \
--label "release" \
--base latest-release \
--label "maintenance"
--head version-patch-from-${{ steps.versions.outputs.current }} \
--body "${{ steps.description.outputs.description }}"
fi
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/prepare-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,18 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
RELEASE_TYPE=${{ inputs.release-type || 'prerelease' }}
CAPITALIZED_RELEASE_TYPE=${RELEASE_TYPE^}
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 \`next\`: ${{ inputs.release-type || 'prerelease' }} ${{ inputs.pre-id && format('({0})', inputs.pre-id) }} from ${{ steps.bump-version.outputs.current-version }} to ${{ steps.bump-version.outputs.next-version }}" \
--title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \
--body "${{ steps.description.outputs.description }}"
else
gh pr create \
--repo "${{github.repository }}"\
--title "Bump version on \`next\`: ${{ inputs.release-type || 'prerelease' }} ${{ inputs.pre-id && format('({0})', inputs.pre-id) }} from ${{ steps.bump-version.outputs.current-version }} to ${{ steps.bump-version.outputs.next-version }}" \
--title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \
--label "release" \
--base next-release \
--head version-prerelease-from-${{ steps.bump-version.outputs.current-version }} \
--body "${{ steps.description.outputs.description }}"
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,30 @@ 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'
working-directory: .
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

- 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
7 changes: 1 addition & 6 deletions .github/workflows/tests-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [windows-latest]
node_version: [16]
include:
- os: macos-latest
node_version: 16
- os: windows-latest
node_version: 16
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 7.0.26

- Next.js: Fix next/image usage in latest Next.js release - [#23296](https://github.com/storybookjs/storybook/pull/23296), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- NextJS: Fix `useParams` support - [#22946](https://github.com/storybookjs/storybook/pull/22946), thanks [@gitstart-storybook](https://github.com/gitstart-storybook)!
- NextJS: Allow disabling next/image lazy loading - [#21909](https://github.com/storybookjs/storybook/pull/21909), thanks [@martinnabhan](https://github.com/martinnabhan)

## 7.0.25

- 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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/channels": "7.0.25",
"@storybook/client-logger": "7.0.25",
"@storybook/components": "7.0.25",
"@storybook/core-events": "7.0.25",
"@storybook/addon-highlight": "7.0.26",
"@storybook/channels": "7.0.26",
"@storybook/client-logger": "7.0.26",
"@storybook/components": "7.0.26",
"@storybook/core-events": "7.0.26",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/theming": "7.0.25",
"@storybook/types": "7.0.25",
"@storybook/manager-api": "7.0.26",
"@storybook/preview-api": "7.0.26",
"@storybook/theming": "7.0.26",
"@storybook/types": "7.0.26",
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/components": "7.0.25",
"@storybook/core-events": "7.0.25",
"@storybook/client-logger": "7.0.26",
"@storybook/components": "7.0.26",
"@storybook/core-events": "7.0.26",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/theming": "7.0.25",
"@storybook/types": "7.0.25",
"@storybook/manager-api": "7.0.26",
"@storybook/preview-api": "7.0.26",
"@storybook/theming": "7.0.26",
"@storybook/types": "7.0.26",
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/components": "7.0.25",
"@storybook/core-events": "7.0.25",
"@storybook/client-logger": "7.0.26",
"@storybook/components": "7.0.26",
"@storybook/core-events": "7.0.26",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/theming": "7.0.25",
"@storybook/types": "7.0.25",
"@storybook/manager-api": "7.0.26",
"@storybook/preview-api": "7.0.26",
"@storybook/theming": "7.0.26",
"@storybook/types": "7.0.26",
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/client-logger": "7.0.25",
"@storybook/components": "7.0.25",
"@storybook/core-common": "7.0.25",
"@storybook/manager-api": "7.0.25",
"@storybook/node-logger": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/theming": "7.0.25",
"@storybook/types": "7.0.25",
"@storybook/blocks": "7.0.26",
"@storybook/client-logger": "7.0.26",
"@storybook/components": "7.0.26",
"@storybook/core-common": "7.0.26",
"@storybook/manager-api": "7.0.26",
"@storybook/node-logger": "7.0.26",
"@storybook/preview-api": "7.0.26",
"@storybook/theming": "7.0.26",
"@storybook/types": "7.0.26",
"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.0.25",
"version": "7.0.26",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -101,19 +101,19 @@
"@babel/plugin-transform-react-jsx": "^7.19.0",
"@jest/transform": "^29.3.1",
"@mdx-js/react": "^2.1.5",
"@storybook/blocks": "7.0.25",
"@storybook/client-logger": "7.0.25",
"@storybook/components": "7.0.25",
"@storybook/csf-plugin": "7.0.25",
"@storybook/csf-tools": "7.0.25",
"@storybook/blocks": "7.0.26",
"@storybook/client-logger": "7.0.26",
"@storybook/components": "7.0.26",
"@storybook/csf-plugin": "7.0.26",
"@storybook/csf-tools": "7.0.26",
"@storybook/global": "^5.0.0",
"@storybook/mdx2-csf": "^1.0.0",
"@storybook/node-logger": "7.0.25",
"@storybook/postinstall": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/react-dom-shim": "7.0.25",
"@storybook/theming": "7.0.25",
"@storybook/types": "7.0.25",
"@storybook/node-logger": "7.0.26",
"@storybook/postinstall": "7.0.26",
"@storybook/preview-api": "7.0.26",
"@storybook/react-dom-shim": "7.0.26",
"@storybook/theming": "7.0.26",
"@storybook/types": "7.0.26",
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/addon-backgrounds": "7.0.25",
"@storybook/addon-controls": "7.0.25",
"@storybook/addon-docs": "7.0.25",
"@storybook/addon-highlight": "7.0.25",
"@storybook/addon-measure": "7.0.25",
"@storybook/addon-outline": "7.0.25",
"@storybook/addon-toolbars": "7.0.25",
"@storybook/addon-viewport": "7.0.25",
"@storybook/core-common": "7.0.25",
"@storybook/manager-api": "7.0.25",
"@storybook/node-logger": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/addon-actions": "7.0.26",
"@storybook/addon-backgrounds": "7.0.26",
"@storybook/addon-controls": "7.0.26",
"@storybook/addon-docs": "7.0.26",
"@storybook/addon-highlight": "7.0.26",
"@storybook/addon-measure": "7.0.26",
"@storybook/addon-outline": "7.0.26",
"@storybook/addon-toolbars": "7.0.26",
"@storybook/addon-viewport": "7.0.26",
"@storybook/core-common": "7.0.26",
"@storybook/manager-api": "7.0.26",
"@storybook/node-logger": "7.0.26",
"@storybook/preview-api": "7.0.26",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@storybook/vue": "7.0.25",
"@storybook/vue": "7.0.26",
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/node-logger": "7.0.26",
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/core-events": "7.0.26",
"@storybook/global": "^5.0.0",
"@storybook/preview-api": "7.0.25"
"@storybook/preview-api": "7.0.26"
},
"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.0.25",
"version": "7.0.26",
"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.0.25",
"@storybook/components": "7.0.25",
"@storybook/core-common": "7.0.25",
"@storybook/core-events": "7.0.25",
"@storybook/client-logger": "7.0.26",
"@storybook/components": "7.0.26",
"@storybook/core-common": "7.0.26",
"@storybook/core-events": "7.0.26",
"@storybook/global": "^5.0.0",
"@storybook/instrumenter": "7.0.25",
"@storybook/manager-api": "7.0.25",
"@storybook/preview-api": "7.0.25",
"@storybook/theming": "7.0.25",
"@storybook/types": "7.0.25",
"@storybook/instrumenter": "7.0.26",
"@storybook/manager-api": "7.0.26",
"@storybook/preview-api": "7.0.26",
"@storybook/theming": "7.0.26",
"@storybook/types": "7.0.26",
"jest-mock": "^27.0.6",
"polished": "^4.2.2",
"ts-dedent": "^2.2.0"
Expand Down
Loading