Skip to content

Commit 5300bf3

Browse files
Merge pull request #1033 from storybookjs/next
Create a new pull request by comparing changes across two branches
2 parents 1e52965 + 6f0f798 commit 5300bf3

File tree

262 files changed

+9548
-1699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+9548
-1699
lines changed

.circleci/config.yml

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,19 +220,45 @@ jobs:
220220
clone_options: "--depth 1 --verbose"
221221
- attach_workspace:
222222
at: .
223-
- run:
224-
name: Benchmarking Packages
225-
working_directory: scripts
226-
command: |
227-
yarn local-registry --open &
228-
until curl -s http://localhost:6001 > /dev/null; do
229-
echo 'Waiting for local registry to be available...'
230-
sleep 2
231-
done
232-
yarn bench-packages --baseBranch << pipeline.parameters.ghBaseBranch >> --pull-request << pipeline.parameters.ghPrNumber >> --upload
233-
- store_artifacts:
223+
# if there is a base branch AND a PR number in parameters, benchmark packages against those
224+
# this happens when run against a PR
225+
- when:
226+
condition:
227+
and:
228+
- << pipeline.parameters.ghBaseBranch >>
229+
- << pipeline.parameters.ghPrNumber >>
230+
steps:
231+
- run:
232+
name: Benchmarking packages against base branch
233+
working_directory: scripts
234+
command: |
235+
yarn local-registry --open &
236+
until curl -s http://localhost:6001 > /dev/null; do
237+
echo 'Waiting for local registry to be available...'
238+
sleep 2
239+
done
240+
yarn bench-packages --base-branch << pipeline.parameters.ghBaseBranch >> --pull-request << pipeline.parameters.ghPrNumber >> --upload
241+
# if there is a NOT a base branch OR NOT a PR number in parameters, just upload benchmarks for the branch
242+
# this happens when runned directly on branches, like next or main
243+
- when:
244+
condition:
245+
or:
246+
- not: << pipeline.parameters.ghBaseBranch >>
247+
- not: << pipeline.parameters.ghPrNumber >>
248+
steps:
249+
- run:
250+
name: Uploading package benchmarks for branch
251+
working_directory: scripts
252+
command: |
253+
yarn local-registry --open &
254+
until curl -s http://localhost:6001 > /dev/null; do
255+
echo 'Waiting for local registry to be available...'
256+
sleep 2
257+
done
258+
yarn bench-packages --upload
259+
- store_artifacts:
234260
path: bench/packages/results.json
235-
- store_artifacts:
261+
- store_artifacts:
236262
path: bench/packages/compare-with-<< pipeline.parameters.ghBaseBranch >>.json
237263
- report-workflow-on-failure
238264
- cancel-workflow-on-failure
@@ -954,30 +980,30 @@ workflows:
954980
requires:
955981
- build
956982
- create-sandboxes:
957-
parallelism: 38
983+
parallelism: 37
958984
requires:
959985
- build
960986
# - smoke-test-sandboxes: # disabled for now
961987
# requires:
962988
# - create-sandboxes
963989
- build-sandboxes:
964-
parallelism: 38
990+
parallelism: 37
965991
requires:
966992
- create-sandboxes
967993
- chromatic-sandboxes:
968-
parallelism: 35
994+
parallelism: 34
969995
requires:
970996
- build-sandboxes
971997
- e2e-production:
972-
parallelism: 33
998+
parallelism: 32
973999
requires:
9741000
- build-sandboxes
9751001
- e2e-dev:
9761002
parallelism: 2
9771003
requires:
9781004
- create-sandboxes
9791005
- test-runner-production:
980-
parallelism: 33
1006+
parallelism: 32
9811007
requires:
9821008
- build-sandboxes
9831009
- vitest-integration:

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 8.4.4
2+
3+
- Addon Test: Only optimize react deps if applicable in vitest-plugin - [#29617](https://github.com/storybookjs/storybook/pull/29617), thanks @yannbf!
4+
5+
## 8.4.3
6+
7+
- Addon Test: Optimize internal dependencies - [#29595](https://github.com/storybookjs/storybook/pull/29595), thanks @yannbf!
8+
- Next.js: Add support for Next 15 - [#29587](https://github.com/storybookjs/storybook/pull/29587), thanks @yannbf!
9+
110
## 8.4.2
211

312
- Addon Test: Fix post-install logic for Next.js Vite framework support - [#29524](https://github.com/storybookjs/storybook/pull/29524), thanks @valentinpalkovic!

CHANGELOG.prerelease.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 8.5.0-alpha.5
2+
3+
- Addon Test: Only optimize react deps if applicable in vitest-plugin - [#29617](https://github.com/storybookjs/storybook/pull/29617), thanks @yannbf!
4+
- Addon Test: Optimize internal dependencies - [#29595](https://github.com/storybookjs/storybook/pull/29595), thanks @yannbf!
5+
- CLI: Fix init help for `storybook` command - [#29480](https://github.com/storybookjs/storybook/pull/29480), thanks @toothlessdev!
6+
- Composition: Fix composed story search - [#29453](https://github.com/storybookjs/storybook/pull/29453), thanks @jsingh0026!
7+
8+
## 8.5.0-alpha.4
9+
10+
- Next.js: Add support for Next 15 - [#29587](https://github.com/storybookjs/storybook/pull/29587), thanks @yannbf!
11+
- UI: Add Yarn to About Section - [#29225](https://github.com/storybookjs/storybook/pull/29225), thanks @grantwforsythe!
12+
113
## 8.5.0-alpha.3
214

315
- Addon Test: Fix post-install logic for Next.js Vite framework support - [#29524](https://github.com/storybookjs/storybook/pull/29524), thanks @valentinpalkovic!

code/addons/a11y/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-a11y",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "Test component compliance with web accessibility standards",
55
"keywords": [
66
"a11y",

code/addons/actions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-actions",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "Get UI feedback when an action is performed on an interactive element",
55
"keywords": [
66
"storybook",

code/addons/backgrounds/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-backgrounds",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "Switch backgrounds to view components in different settings",
55
"keywords": [
66
"addon",

code/addons/controls/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-controls",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "Interact with component inputs dynamically in the Storybook UI",
55
"keywords": [
66
"addon",

code/addons/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-docs",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "Document component usage and properties in Markdown",
55
"keywords": [
66
"addon",

code/addons/essentials/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-essentials",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "Curated addons to bring out the best of Storybook",
55
"keywords": [
66
"addon",

code/addons/gfm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-mdx-gfm",
3-
"version": "8.5.0-alpha.3",
3+
"version": "8.5.0-alpha.5",
44
"description": "GitHub Flavored Markdown in Storybook",
55
"keywords": [
66
"addon",

0 commit comments

Comments
 (0)