Skip to content

Commit

Permalink
Merge pull request #23403 from storybookjs/version-prerelease-from-7.…
Browse files Browse the repository at this point in the history
…1.0-rc.0

Release: Prerelease 7.1.0-rc.1
  • Loading branch information
shilman authored Jul 11, 2023
2 parents ccdbb0f + c6b9dd9 commit 5b32421
Show file tree
Hide file tree
Showing 119 changed files with 1,195 additions and 1,102 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -593,27 +593,27 @@ workflows:
requires:
- unit-tests
- create-sandboxes:
parallelism: 19
parallelism: 20
requires:
- build
- build-sandboxes:
parallelism: 19
parallelism: 20
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 17
parallelism: 18
requires:
- build-sandboxes
- e2e-production:
parallelism: 17
parallelism: 18
requires:
- build-sandboxes
- e2e-dev:
parallelism: 4
requires:
- create-sandboxes
- test-runner-production:
parallelism: 17
parallelism: 18
requires:
- build-sandboxes
- bench:
Expand Down Expand Up @@ -647,30 +647,30 @@ workflows:
requires:
- build
- create-sandboxes:
parallelism: 33
parallelism: 34
requires:
- build
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
parallelism: 33
parallelism: 34
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 31
parallelism: 32
requires:
- build-sandboxes
- e2e-production:
parallelism: 31
parallelism: 32
requires:
- build-sandboxes
- e2e-dev:
parallelism: 4
requires:
- create-sandboxes
- test-runner-production:
parallelism: 31
parallelism: 32
requires:
- build-sandboxes
# TODO: reenable once we find out the source of flakyness
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.prerelease.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 7.1.0-rc.1

- Angular: Enable prod mode when Storybook is built - [#23404](https://github.com/storybookjs/storybook/pull/23404), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- Angular: Fix esm issue in combination with rxjs v6 - [#23405](https://github.com/storybookjs/storybook/pull/23405), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- CLI: Fix chevron icon on Configure.mdx page - [#23397](https://github.com/storybookjs/storybook/pull/23397), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- Settings: Fix dark mode for what's new page - [#23398](https://github.com/storybookjs/storybook/pull/23398), thanks [@kasperpeulen](https://github.com/kasperpeulen)!

## 7.1.0-rc.0

Promote beta to rc without any changes. 🎉
Expand Down
14 changes: 11 additions & 3 deletions CONTRIBUTING/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ Done! 🚀

Things can fail, code can break, and bugs can exist. When automation is broken, there may be a need for an emergency escape hatch to release new fixes. In such a situation, it's valid to run the whole release process locally instead of relying on pull requests and workflows. You don't need to create pull requests or split preparation and publishing; you can do it all at once, but make sure you still follow the correct branching strategy.

You need a token to the npm registry to publish (set as `YARN_NPM_AUTH_TOKEN`), which you can get from @shilman or @ndelangen.
You can either prepare the release locally and use the automatic workflow for publishing it or you can do the whole release workflow locally. If you choose the latter approach, you need a token to the npm registry to publish (set as `YARN_NPM_AUTH_TOKEN`), which you can get from @shilman or @ndelangen.

You can inspect the workflows to see what they are running and copy that, but here is a general sequence of steps to mimic the automated workflow. Feel free to deviate from this as needed.

Expand Down Expand Up @@ -355,15 +355,23 @@ Before you start you should make sure that your working tree is clean and the re
16. Manually create a GitHub Release with a tag that is the new version and the target being `latest-release` or `next-release`.
17. Merge to core branch:
1. `git checkout <"next"|"main">`
2. `git merge <"next-release"|"latest-release">`
3. `git push origin`
2. `git pull`
3. `git merge <"next-release"|"latest-release">`
4. `git push origin`
18. (If patch release) Sync `CHANGELOG.md` to `next` with:
1. `git checkout next`
2. `git pull`
3. `git checkout origin/main ./CHANGELOG.md`
4. `git add ./CHANGELOG.md`
5. `git commit -m "Update CHANGELOG.md for v<NEXT_VERSION>"`
6. `git push origin`
19. (If prerelease) Sync `versions/next.json` from `next` to `main`
1. `git checkout main`
2. `git pull`
3. `git checkout origin/next ./docs/versions/next.json`
4. `git add ./docs/versions/next.json`
5. `git commit -m "Update versions/next.json for v<NEXT_VERSION_FROM_PREVIOUS_STEP>"`
6. `git push origin main`

## Canary Releases

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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/channels": "7.1.0-rc.0",
"@storybook/client-logger": "7.1.0-rc.0",
"@storybook/components": "7.1.0-rc.0",
"@storybook/core-events": "7.1.0-rc.0",
"@storybook/addon-highlight": "7.1.0-rc.1",
"@storybook/channels": "7.1.0-rc.1",
"@storybook/client-logger": "7.1.0-rc.1",
"@storybook/components": "7.1.0-rc.1",
"@storybook/core-events": "7.1.0-rc.1",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/theming": "7.1.0-rc.0",
"@storybook/types": "7.1.0-rc.0",
"@storybook/manager-api": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"@storybook/theming": "7.1.0-rc.1",
"@storybook/types": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/components": "7.1.0-rc.0",
"@storybook/core-events": "7.1.0-rc.0",
"@storybook/client-logger": "7.1.0-rc.1",
"@storybook/components": "7.1.0-rc.1",
"@storybook/core-events": "7.1.0-rc.1",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/theming": "7.1.0-rc.0",
"@storybook/types": "7.1.0-rc.0",
"@storybook/manager-api": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"@storybook/theming": "7.1.0-rc.1",
"@storybook/types": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/components": "7.1.0-rc.0",
"@storybook/core-events": "7.1.0-rc.0",
"@storybook/client-logger": "7.1.0-rc.1",
"@storybook/components": "7.1.0-rc.1",
"@storybook/core-events": "7.1.0-rc.1",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/theming": "7.1.0-rc.0",
"@storybook/types": "7.1.0-rc.0",
"@storybook/manager-api": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"@storybook/theming": "7.1.0-rc.1",
"@storybook/types": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/client-logger": "7.1.0-rc.0",
"@storybook/components": "7.1.0-rc.0",
"@storybook/core-common": "7.1.0-rc.0",
"@storybook/manager-api": "7.1.0-rc.0",
"@storybook/node-logger": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/theming": "7.1.0-rc.0",
"@storybook/types": "7.1.0-rc.0",
"@storybook/blocks": "7.1.0-rc.1",
"@storybook/client-logger": "7.1.0-rc.1",
"@storybook/components": "7.1.0-rc.1",
"@storybook/core-common": "7.1.0-rc.1",
"@storybook/manager-api": "7.1.0-rc.1",
"@storybook/node-logger": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"@storybook/theming": "7.1.0-rc.1",
"@storybook/types": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/client-logger": "7.1.0-rc.0",
"@storybook/components": "7.1.0-rc.0",
"@storybook/csf-plugin": "7.1.0-rc.0",
"@storybook/csf-tools": "7.1.0-rc.0",
"@storybook/blocks": "7.1.0-rc.1",
"@storybook/client-logger": "7.1.0-rc.1",
"@storybook/components": "7.1.0-rc.1",
"@storybook/csf-plugin": "7.1.0-rc.1",
"@storybook/csf-tools": "7.1.0-rc.1",
"@storybook/global": "^5.0.0",
"@storybook/mdx2-csf": "^1.0.0",
"@storybook/node-logger": "7.1.0-rc.0",
"@storybook/postinstall": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/react-dom-shim": "7.1.0-rc.0",
"@storybook/theming": "7.1.0-rc.0",
"@storybook/types": "7.1.0-rc.0",
"@storybook/node-logger": "7.1.0-rc.1",
"@storybook/postinstall": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"@storybook/react-dom-shim": "7.1.0-rc.1",
"@storybook/theming": "7.1.0-rc.1",
"@storybook/types": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/addon-backgrounds": "7.1.0-rc.0",
"@storybook/addon-controls": "7.1.0-rc.0",
"@storybook/addon-docs": "7.1.0-rc.0",
"@storybook/addon-highlight": "7.1.0-rc.0",
"@storybook/addon-measure": "7.1.0-rc.0",
"@storybook/addon-outline": "7.1.0-rc.0",
"@storybook/addon-toolbars": "7.1.0-rc.0",
"@storybook/addon-viewport": "7.1.0-rc.0",
"@storybook/core-common": "7.1.0-rc.0",
"@storybook/manager-api": "7.1.0-rc.0",
"@storybook/node-logger": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/addon-actions": "7.1.0-rc.1",
"@storybook/addon-backgrounds": "7.1.0-rc.1",
"@storybook/addon-controls": "7.1.0-rc.1",
"@storybook/addon-docs": "7.1.0-rc.1",
"@storybook/addon-highlight": "7.1.0-rc.1",
"@storybook/addon-measure": "7.1.0-rc.1",
"@storybook/addon-outline": "7.1.0-rc.1",
"@storybook/addon-toolbars": "7.1.0-rc.1",
"@storybook/addon-viewport": "7.1.0-rc.1",
"@storybook/core-common": "7.1.0-rc.1",
"@storybook/manager-api": "7.1.0-rc.1",
"@storybook/node-logger": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@storybook/vue": "7.1.0-rc.0",
"@storybook/vue": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/node-logger": "7.1.0-rc.1",
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/core-events": "7.1.0-rc.1",
"@storybook/global": "^5.0.0",
"@storybook/preview-api": "7.1.0-rc.0"
"@storybook/preview-api": "7.1.0-rc.1"
},
"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-rc.0",
"version": "7.1.0-rc.1",
"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-rc.0",
"@storybook/components": "7.1.0-rc.0",
"@storybook/core-common": "7.1.0-rc.0",
"@storybook/core-events": "7.1.0-rc.0",
"@storybook/client-logger": "7.1.0-rc.1",
"@storybook/components": "7.1.0-rc.1",
"@storybook/core-common": "7.1.0-rc.1",
"@storybook/core-events": "7.1.0-rc.1",
"@storybook/global": "^5.0.0",
"@storybook/instrumenter": "7.1.0-rc.0",
"@storybook/manager-api": "7.1.0-rc.0",
"@storybook/preview-api": "7.1.0-rc.0",
"@storybook/theming": "7.1.0-rc.0",
"@storybook/types": "7.1.0-rc.0",
"@storybook/instrumenter": "7.1.0-rc.1",
"@storybook/manager-api": "7.1.0-rc.1",
"@storybook/preview-api": "7.1.0-rc.1",
"@storybook/theming": "7.1.0-rc.1",
"@storybook/types": "7.1.0-rc.1",
"jest-mock": "^29.5.0",
"polished": "^4.2.2",
"ts-dedent": "^2.2.0"
Expand Down
Loading

0 comments on commit 5b32421

Please sign in to comment.