Skip to content

Commit d8ff7d8

Browse files
authored
Merge pull request #24992 from storybookjs/version-non-patch-from-7.6.0-beta.2
Release: Minor 7.6.0
2 parents dc82000 + e1eae5b commit d8ff7d8

File tree

1,175 files changed

+25095
-19767
lines changed

Some content is hidden

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

1,175 files changed

+25095
-19767
lines changed

.circleci/config.yml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,23 @@ commands:
8484
jobs:
8585
pretty-docs:
8686
executor:
87-
class: small
87+
class: medium
8888
name: sb_node_16_classic
8989
steps:
9090
- git-shallow-clone/checkout_advanced:
9191
clone_options: '--depth 1 --verbose'
9292
- restore_cache:
9393
name: Restore Yarn cache
9494
keys:
95-
- prettydocs-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
95+
- prettydocs-yarn-2-cache-v7--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
9696
- run:
9797
name: Install
9898
command: |
9999
cd scripts
100100
yarn install
101101
- save_cache:
102102
name: Save Yarn cache
103-
key: prettydocs-yarn-2-cache-v4--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
103+
key: prettydocs-yarn-2-cache-v7--{{ checksum "code/yarn.lock" }}--{{ checksum "scripts/yarn.lock" }}
104104
paths:
105105
- ~/.yarn/berry/cache
106106
- run:
@@ -322,15 +322,20 @@ jobs:
322322
at: .
323323
- run:
324324
name: Starting Event Collector
325-
command: yarn ts-node ./event-log-collector.ts
325+
command: node --loader esbuild-register/loader -r esbuild-register ./event-log-collector.ts
326326
working_directory: scripts
327327
background: true
328328
- run:
329329
name: Building Sandboxes
330330
command: yarn task --task build --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build) --no-link --start-from=never --junit
331331
- run:
332332
name: Verifying Telemetry
333-
command: yarn ts-node ./event-log-checker build $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
333+
command: |
334+
TEMPLATE=$(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
335+
if [[ $TEMPLATE != bench/* ]]
336+
then
337+
node --loader esbuild-register/loader -r esbuild-register ./event-log-checker build $TEMPLATE
338+
fi
334339
working_directory: scripts
335340
- report-workflow-on-failure:
336341
template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
@@ -499,15 +504,15 @@ workflows:
499504
requires:
500505
- unit-tests
501506
- create-sandboxes:
502-
parallelism: 12
507+
parallelism: 14
503508
requires:
504509
- build
505510
- build-sandboxes:
506-
parallelism: 12
511+
parallelism: 14
507512
requires:
508513
- create-sandboxes
509514
- chromatic-sandboxes:
510-
parallelism: 9
515+
parallelism: 11
511516
requires:
512517
- build-sandboxes
513518
- e2e-production:
@@ -523,7 +528,7 @@ workflows:
523528
requires:
524529
- build-sandboxes
525530
- bench:
526-
parallelism: 3
531+
parallelism: 5
527532
requires:
528533
- build-sandboxes
529534
# TODO: reenable once we find out the source of flakyness
@@ -555,15 +560,15 @@ workflows:
555560
requires:
556561
- unit-tests
557562
- create-sandboxes:
558-
parallelism: 21
563+
parallelism: 23
559564
requires:
560565
- build
561566
- build-sandboxes:
562-
parallelism: 21
567+
parallelism: 23
563568
requires:
564569
- create-sandboxes
565570
- chromatic-sandboxes:
566-
parallelism: 18
571+
parallelism: 20
567572
requires:
568573
- build-sandboxes
569574
- e2e-production:
@@ -579,7 +584,7 @@ workflows:
579584
requires:
580585
- build-sandboxes
581586
- bench:
582-
parallelism: 3
587+
parallelism: 5
583588
requires:
584589
- build-sandboxes
585590
# TODO: reenable once we find out the source of flakyness
@@ -609,18 +614,18 @@ workflows:
609614
requires:
610615
- build
611616
- create-sandboxes:
612-
parallelism: 36
617+
parallelism: 38
613618
requires:
614619
- build
615620
# - smoke-test-sandboxes: # disabled for now
616621
# requires:
617622
# - create-sandboxes
618623
- build-sandboxes:
619-
parallelism: 36
624+
parallelism: 38
620625
requires:
621626
- create-sandboxes
622627
- chromatic-sandboxes:
623-
parallelism: 33
628+
parallelism: 35
624629
requires:
625630
- build-sandboxes
626631
- e2e-production:

.github/DISCUSSION_TEMPLATE/help.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
body:
2+
- type: markdown
3+
id: intro
4+
attributes:
5+
value: |
6+
Thanks for taking the time to start a new discussion!
7+
8+
### Before you post
9+
Check if someone has already asked/answered your question in a previous discussion.
10+
11+
### When you're ready to post
12+
Add labels to your discussion (e.g. React, Vue, Vite) to make it clearer for other users.
13+
14+
- type: textarea
15+
id: summary
16+
attributes:
17+
label: Summary
18+
description: How can we help?
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
id: additional-info
24+
attributes:
25+
label: Additional information
26+
description: |
27+
Share Your Storybook configuration (`main.js` or `main.ts`), your Storybook version number, any error messages, and any relevant dependencies. These help us get a clearer understanding of what might be going wrong.
28+
29+
P.S. Please [share code as text](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks) rather than as a screenshot! It makes debugging much easier and faster.
30+
validations:
31+
required: false
32+
33+
- type: input
34+
id: reproduction
35+
attributes:
36+
label: Create a reproduction
37+
description: |
38+
Help us debug by creating a minimal reproduction with [https://storybook.new](https://storybook.new). Learn more about creating a reproduction [here](https://storybook.js.org/docs/react/contribute/how-to-reproduce).
39+
validations:
40+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ contact_links:
33
- name: View documentation 📚
44
url: https://storybook.js.org/docs/
55
about: Check out the official docs for answers to common questions.
6-
- name: Feature Requests 💡
6+
- name: Feature requests 💡
77
url: https://github.com/storybookjs/storybook/discussions/new?category=ideas
88
about: Suggest a feature idea for this project.
99
- name: Open an RFC 🦄
1010
url: https://github.com/storybookjs/storybook/discussions/new?category=rfc
1111
about: Do you want to propose a more involved change to Storybook? Open an RFC (Request for Comments) to start a discussion.
12-
- name: Questions & discussions 🤔
12+
- name: Questions 💭
13+
url: https://github.com/storybookjs/storybook/discussions/new?category=help
14+
about: Need support with a Storybook problem? Open up a help request.
15+
- name: Discussions 🙌
1316
url: https://github.com/storybookjs/storybook/discussions
14-
about: Ask questions, show off your Storybook, etc.
15-
- name: Community Discord 💬
17+
about: Show off your Storybook or discuss the project.
18+
- name: Community Discord 🎉
1619
url: https://discord.gg/storybook
17-
about: Community discussions, interactive support, contributor help
20+
about: Meet other community members and get contributor help.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ Closes #
44

55
<!--
66
7-
Thank you for contributing to Storybook! Please submit all PRs to the `next` branch unless they are specific to the current release. Storybook maintainers cherry-pick bug and documentation fixes into the `main` branch as part of the release process, so you shouldn't need to worry about this. For additional guidance: https://storybook.js.org/docs/react/contribute/how-to-contribute
7+
Thank you for contributing to Storybook! Please submit all PRs to the `next` branch unless they are specific to the current release. Storybook maintainers cherry-pick bug and documentation fixes into the `main` branch as part of the release process, so you shouldn't need to worry about this. For additional guidance: https://storybook.js.org/docs/contribute
88
99
-->
1010

11-
1211
## What I did
1312

1413
<!-- Briefly describe what your PR does -->

.github/workflows/generate-sandboxes-main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ jobs:
3030
git config --global user.name "Storybook Bot"
3131
git config --global user.email "[email protected]"
3232
- name: Install dependencies
33-
run: node ./scripts/check-dependencies.js
33+
run: |
34+
cd ./scripts
35+
node --experimental-modules ./check-dependencies.js
36+
cd ..
3437
- name: Compile Storybook libraries
3538
run: yarn task --task compile --start-from=auto --no-link
3639
- name: Publishing to local registry

.github/workflows/generate-sandboxes-next.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ jobs:
3030
git config --global user.name "Storybook Bot"
3131
git config --global user.email "[email protected]"
3232
- name: Install dependencies
33-
run: node ./scripts/check-dependencies.js
33+
run: |
34+
cd ./scripts
35+
node --experimental-modules ./check-dependencies.js
36+
cd ..
3437
- name: Compile Storybook libraries
3538
run: yarn task --task compile --start-from=auto --no-link
3639
- name: Publishing to local registry

.github/workflows/prepare-non-patch-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ jobs:
144144
git checkout --ours .
145145
git add .
146146
git commit --no-verify -m "Merge latest-release into version-non-patch-from-${{ steps.bump-version.outputs.current-version }} with conflicts resolved to ours [skip ci]"
147+
git push origin version-non-patch-from-${{ steps.bump-version.outputs.current-version }}
147148
148149
- name: Generate PR description
149150
id: description

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
yarn release:ensure-next-ahead --main-version "${{ steps.version.outputs.current-version }}"
164164
165165
git add ..
166-
git commit -m "Bump next to be one minor ahead of main [skip ci]"
166+
git diff --staged --quiet || git commit -m "Bump next to be one minor ahead of main [skip ci]"
167167
git push origin next
168168
169169
- name: Sync CHANGELOG.md from `main` to `next`

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ test-results
2121
!/**/.yarn/plugins
2222
!/**/.yarn/sdks
2323
!/**/.yarn/versions
24+
!/**/.yarn/patches
2425
/**/.pnp.*
2526
!/node_modules
2627

0 commit comments

Comments
 (0)