Skip to content

Commit c7de38c

Browse files
authored
Merge pull request #34237 from storybookjs/version-patch-from-10.3.1
Release: Patch 10.3.2
2 parents 24c2c2c + 1d33cb1 commit c7de38c

File tree

8 files changed

+93
-96
lines changed

8 files changed

+93
-96
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 10.3.2
2+
3+
- CLI: Shorten CTA link messages - [#34236](https://github.com/storybookjs/storybook/pull/34236), thanks @shilman!
4+
- React Native Web: Fix vite8 support by bumping vite-plugin-rnw - [#34231](https://github.com/storybookjs/storybook/pull/34231), thanks @dannyhw!
5+
16
## 10.3.1
27

38
- CLI: Use npm info to fetch versions in repro command - [#34214](https://github.com/storybookjs/storybook/pull/34214), thanks @yannbf!

code/frameworks/react-native-web-vite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
"@storybook/builder-vite": "workspace:*",
5555
"@storybook/react": "workspace:*",
5656
"@storybook/react-vite": "workspace:*",
57-
"vite-plugin-rnw": "^0.0.10",
58-
"vite-tsconfig-paths": "^5.1.4"
57+
"vite-plugin-rnw": "^0.0.11",
58+
"vite-tsconfig-paths": "^6.1.1"
5959
},
6060
"devDependencies": {
6161
"@types/node": "^22.19.1",

code/lib/create-storybook/src/commands/FinalizationCommand.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ export class FinalizationCommand {
8888
}
8989

9090
logger.log(dedent`
91-
Wanna know more about Storybook? Check out ${CLI_COLORS.cta('https://storybook.js.org/')}
92-
Having trouble or want to chat? Join us at ${CLI_COLORS.cta('https://discord.gg/storybook/')}
91+
Want to learn more about Storybook? ${CLI_COLORS.cta('https://storybook.js.org/')}
92+
Having trouble or want to chat? ${CLI_COLORS.cta('https://discord.gg/storybook/')}
9393
`);
9494
}
9595
}

code/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,5 +209,6 @@
209209
"Dependency Upgrades"
210210
]
211211
]
212-
}
212+
},
213+
"deferredNextVersion": "10.3.2"
213214
}

docs/versions/latest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"10.3.1","info":{"plain":"- CLI: Use npm info to fetch versions in repro command - [#34214](https://github.com/storybookjs/storybook/pull/34214), thanks @yannbf!\n- Core: Prevent story-local viewport from persisting in URL - [#34153](https://github.com/storybookjs/storybook/pull/34153), thanks @ghengeveld!"}}
1+
{"version":"10.3.2","info":{"plain":"- CLI: Shorten CTA link messages - [#34236](https://github.com/storybookjs/storybook/pull/34236), thanks @shilman!\n- React Native Web: Fix vite8 support by bumping vite-plugin-rnw - [#34231](https://github.com/storybookjs/storybook/pull/34231), thanks @dannyhw!"}}

scripts/dangerfile.js

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ const { labels } = danger.github.issue;
4242
const prLogConfig = pkg['pr-log'];
4343

4444
const branchVersion = Versions.MINOR;
45+
const targetBranch = danger.github.pr.base.ref;
46+
const isReleasePr = ['latest-release', 'next-release'].includes(targetBranch);
4547

4648
/** @param {string[]} labels */
4749
const checkRequiredLabels = (labels) => {
@@ -66,18 +68,29 @@ const checkRequiredLabels = (labels) => {
6668
);
6769
}
6870

69-
const foundRequiredLabels = intersection(requiredLabels, labels);
70-
if (foundRequiredLabels.length === 0) {
71-
fail(`PR is not labeled with one of: ${JSON.stringify(requiredLabels)}`);
72-
} else if (foundRequiredLabels.length > 1) {
73-
fail(`Please choose only one of these labels: ${JSON.stringify(foundRequiredLabels)}`);
74-
}
75-
76-
const foundCILabels = intersection(ciLabels, labels);
77-
if (foundCILabels.length === 0) {
78-
fail(`PR is not labeled with one of: ${JSON.stringify(ciLabels)}`);
79-
} else if (foundCILabels.length > 1) {
80-
fail(`Please choose only one of these labels: ${JSON.stringify(foundCILabels)}`);
71+
if (isReleasePr) {
72+
// Release PRs only need `ci:daily`.
73+
if (!labels.includes('ci:daily')) {
74+
fail(
75+
'Release PRs targeting latest-release or next-release must include the "ci:daily" label.'
76+
);
77+
}
78+
return;
79+
} else {
80+
// All other PRs to `next` to a qualifying change type and one of several applicable CI labels.
81+
const foundRequiredLabels = intersection(requiredLabels, labels);
82+
if (foundRequiredLabels.length === 0) {
83+
fail(`PR is not labeled with one of: ${JSON.stringify(requiredLabels)}`);
84+
} else if (foundRequiredLabels.length > 1) {
85+
fail(`Please choose only one of these labels: ${JSON.stringify(foundRequiredLabels)}`);
86+
}
87+
88+
const foundCILabels = intersection(ciLabels, labels);
89+
if (foundCILabels.length === 0) {
90+
fail(`PR is not labeled with one of: ${JSON.stringify(ciLabels)}`);
91+
} else if (foundCILabels.length > 1) {
92+
fail(`Please choose only one of these labels: ${JSON.stringify(foundCILabels)}`);
93+
}
8194
}
8295
};
8396

scripts/utils/yarn.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,6 @@ export const addWorkaroundResolutions = async ({
125125
};
126126
}
127127

128-
if (key === 'react-native-web-vite/expo-ts') {
129-
additionalResolutions = {
130-
...additionalResolutions,
131-
// The expo sandbox started to break in beta 5, yet to investigate the root cause
132-
// in the meantime, we downgrade to the version where things worked.
133-
vite: '8.0.0-beta.4',
134-
};
135-
}
136-
137128
packageJson.resolutions = {
138129
...packageJson.resolutions,
139130
'@testing-library/dom': '^9.3.4',

yarn.lock

Lines changed: 56 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,16 +2111,6 @@ __metadata:
21112111
languageName: node
21122112
linkType: hard
21132113

2114-
"@bunchtogether/vite-plugin-flow@npm:^1.0.2":
2115-
version: 1.0.2
2116-
resolution: "@bunchtogether/vite-plugin-flow@npm:1.0.2"
2117-
dependencies:
2118-
flow-remove-types: "npm:^2.158.0"
2119-
rollup-pluginutils: "npm:^2.8.2"
2120-
checksum: 10c0/84faf014977196470bbeae686b4e167de2805777389f8a0da88647484df7cf39db3da91907d75ea810ea77175c0cdd40a9a3ad92b7c7c44681b0cd1f4156c7b8
2121-
languageName: node
2122-
linkType: hard
2123-
21242114
"@chromatic-com/storybook@npm:^5.0.0":
21252115
version: 5.0.0
21262116
resolution: "@chromatic-com/storybook@npm:5.0.0"
@@ -7336,17 +7326,10 @@ __metadata:
73367326
languageName: node
73377327
linkType: hard
73387328

7339-
"@rolldown/pluginutils@npm:1.0.0-beta.46":
7340-
version: 1.0.0-beta.46
7341-
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.46"
7342-
checksum: 10c0/45664c89b2e24262b103457ca14e1aa0b7f658f5ace4eb4f10f327d88810cad908ec3150d8fc646fe285b96eb66b25defce97aa6eb0a45fe23a8a2dbcda0040c
7343-
languageName: node
7344-
linkType: hard
7345-
7346-
"@rolldown/pluginutils@npm:1.0.0-beta.47":
7347-
version: 1.0.0-beta.47
7348-
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.47"
7349-
checksum: 10c0/eb0cfa7334d66f090c47eaac612174936b05f26e789352428cb6e03575b590f355de30d26b42576ea4e613d8887b587119d19b2e4b3a8909ceb232ca1cf746c8
7329+
"@rolldown/pluginutils@npm:1.0.0-rc.3":
7330+
version: 1.0.0-rc.3
7331+
resolution: "@rolldown/pluginutils@npm:1.0.0-rc.3"
7332+
checksum: 10c0/3928b6282a30f307d1b075d2f217180ae173ea9e00638ce46ab65f089bd5f7a0b2c488ae1ce530f509387793c656a2910337c4cd68fa9d37d7e439365989e699
73507333
languageName: node
73517334
linkType: hard
73527335

@@ -7357,6 +7340,13 @@ __metadata:
73577340
languageName: node
73587341
linkType: hard
73597342

7343+
"@rolldown/pluginutils@npm:^1.0.0-rc.9":
7344+
version: 1.0.0-rc.10
7345+
resolution: "@rolldown/pluginutils@npm:1.0.0-rc.10"
7346+
checksum: 10c0/7478f982d2705fef5f844e714aa264571d30368ef90883642fdc9eb869613c0c3060e8a8f69255e37a6fb600cbe4be35ce273d1f808fa6fe2a4b4e72116caf29
7347+
languageName: node
7348+
linkType: hard
7349+
73607350
"@rollup/pluginutils@npm:^5.0.2":
73617351
version: 5.3.0
73627352
resolution: "@rollup/pluginutils@npm:5.3.0"
@@ -8511,8 +8501,8 @@ __metadata:
85118501
"@storybook/react-vite": "workspace:*"
85128502
"@types/node": "npm:^22.19.1"
85138503
typescript: "npm:^5.9.3"
8514-
vite-plugin-rnw: "npm:^0.0.10"
8515-
vite-tsconfig-paths: "npm:^5.1.4"
8504+
vite-plugin-rnw: "npm:^0.0.11"
8505+
vite-tsconfig-paths: "npm:^6.1.1"
85168506
peerDependencies:
85178507
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
85188508
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -10777,19 +10767,19 @@ __metadata:
1077710767
languageName: node
1077810768
linkType: hard
1077910769

10780-
"@vitejs/plugin-react@npm:^5.1.0":
10781-
version: 5.1.1
10782-
resolution: "@vitejs/plugin-react@npm:5.1.1"
10770+
"@vitejs/plugin-react@npm:^5.2.0":
10771+
version: 5.2.0
10772+
resolution: "@vitejs/plugin-react@npm:5.2.0"
1078310773
dependencies:
10784-
"@babel/core": "npm:^7.28.5"
10774+
"@babel/core": "npm:^7.29.0"
1078510775
"@babel/plugin-transform-react-jsx-self": "npm:^7.27.1"
1078610776
"@babel/plugin-transform-react-jsx-source": "npm:^7.27.1"
10787-
"@rolldown/pluginutils": "npm:1.0.0-beta.47"
10777+
"@rolldown/pluginutils": "npm:1.0.0-rc.3"
1078810778
"@types/babel__core": "npm:^7.20.5"
1078910779
react-refresh: "npm:^0.18.0"
1079010780
peerDependencies:
10791-
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
10792-
checksum: 10c0/e590efaea1eabfbb1beb6e8c9fac0742fd299808e3368e63b2825ce24740adb8a28fcb2668b14b7ca1bdb42890cfefe94d02dd358dcbbf8a27ddf377b9a82abf
10781+
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
10782+
checksum: 10c0/bac0a409e71eee954a05bc41580411c369bd5f9ef0586a1f9743fba76ad6603c437d93d407d230780015361f93d1592c55e53314813cded6369c36d3c1e8edbf
1079310783
languageName: node
1079410784
linkType: hard
1079510785

@@ -16924,13 +16914,6 @@ __metadata:
1692416914
languageName: node
1692516915
linkType: hard
1692616916

16927-
"estree-walker@npm:^0.6.1":
16928-
version: 0.6.1
16929-
resolution: "estree-walker@npm:0.6.1"
16930-
checksum: 10c0/6dabc855faa04a1ffb17b6a9121b6008ba75ab5a163ad9dc3d7fca05cfda374c5f5e91418d783496620ca75e99a73c40874d8b75f23b4117508cc8bde78e7b41
16931-
languageName: node
16932-
linkType: hard
16933-
1693416917
"estree-walker@npm:^2.0.2":
1693516918
version: 2.0.2
1693616919
resolution: "estree-walker@npm:2.0.2"
@@ -17691,17 +17674,17 @@ __metadata:
1769117674
languageName: node
1769217675
linkType: hard
1769317676

17694-
"flow-remove-types@npm:^2.158.0":
17695-
version: 2.291.0
17696-
resolution: "flow-remove-types@npm:2.291.0"
17677+
"flow-remove-types@npm:^2.305.0":
17678+
version: 2.306.0
17679+
resolution: "flow-remove-types@npm:2.306.0"
1769717680
dependencies:
17698-
hermes-parser: "npm:0.32.0"
17681+
hermes-parser: "npm:0.34.0"
1769917682
pirates: "npm:^3.0.2"
1770017683
vlq: "npm:^0.2.1"
1770117684
bin:
1770217685
flow-node: flow-node
1770317686
flow-remove-types: flow-remove-types
17704-
checksum: 10c0/b074977261f44955103552f854418979926a92b09b740cb613852c9044b21056a1f70ac8b783ca3d74321d23907cc30c31332a5faca28e2340b8b83622b58f2a
17687+
checksum: 10c0/2b965f5aa70e7d0b4d6ae6ef115f655fdb8ddd6e21563a2efda5644dc9b64dec1490f45b6658f2cf0ad11299bc199aeb78d589428e46ae0b5dba84a8dc09f92a
1770517688
languageName: node
1770617689
linkType: hard
1770717690

@@ -18932,19 +18915,19 @@ __metadata:
1893218915
languageName: node
1893318916
linkType: hard
1893418917

18935-
"hermes-estree@npm:0.32.0":
18936-
version: 0.32.0
18937-
resolution: "hermes-estree@npm:0.32.0"
18938-
checksum: 10c0/3b67d1fe44336240ef7f9c40ecbf363279ba263d51efe120570c3862cc109e652fc09aebddfe6b73d0f0246610bee130e4064c359f1f4cbf002bdb1d99717ef2
18918+
"hermes-estree@npm:0.34.0":
18919+
version: 0.34.0
18920+
resolution: "hermes-estree@npm:0.34.0"
18921+
checksum: 10c0/bd4ad520838c69aa79887230a2030fe1e07d0826389112e2c23a8b18494f9f2fa6b1639f413ad978f3468daea66903869188481f9500aaa1fb79ed6266afb744
1893918922
languageName: node
1894018923
linkType: hard
1894118924

18942-
"hermes-parser@npm:0.32.0":
18943-
version: 0.32.0
18944-
resolution: "hermes-parser@npm:0.32.0"
18925+
"hermes-parser@npm:0.34.0":
18926+
version: 0.34.0
18927+
resolution: "hermes-parser@npm:0.34.0"
1894518928
dependencies:
18946-
hermes-estree: "npm:0.32.0"
18947-
checksum: 10c0/5902d2c5d347c0629fba07a47eaad5569590ac69bc8bfb2e454e08d2dfbe1ebd989d88518dca2cba64061689b5eac5960ae6bd15a4a66600bbf377498a3234b7
18929+
hermes-estree: "npm:0.34.0"
18930+
checksum: 10c0/e20657a21ebc3187f53780f5f2c5dd7434f4371979d05b016ff06306b6db63f9d2575ee60c63e9e7d831dd0f592542193a50a6e8397678d4a312fc5373bbe382
1894818931
languageName: node
1894918932
linkType: hard
1895018933

@@ -27220,15 +27203,6 @@ __metadata:
2722027203
languageName: node
2722127204
linkType: hard
2722227205

27223-
"rollup-pluginutils@npm:^2.8.2":
27224-
version: 2.8.2
27225-
resolution: "rollup-pluginutils@npm:2.8.2"
27226-
dependencies:
27227-
estree-walker: "npm:^0.6.1"
27228-
checksum: 10c0/20947bec5a5dd68b5c5c8423911e6e7c0ad834c451f1a929b1f4e2bc08836ad3f1a722ef2bfcbeca921870a0a283f13f064a317dc7a6768496e98c9a641ba290
27229-
languageName: node
27230-
linkType: hard
27231-
2723227206
"rollup@npm:4.34.8":
2723327207
version: 4.34.8
2723427208
resolution: "rollup@npm:4.34.8"
@@ -30983,20 +30957,20 @@ __metadata:
3098330957
languageName: node
3098430958
linkType: hard
3098530959

30986-
"vite-plugin-rnw@npm:^0.0.10":
30987-
version: 0.0.10
30988-
resolution: "vite-plugin-rnw@npm:0.0.10"
30960+
"vite-plugin-rnw@npm:^0.0.11":
30961+
version: 0.0.11
30962+
resolution: "vite-plugin-rnw@npm:0.0.11"
3098930963
dependencies:
30990-
"@bunchtogether/vite-plugin-flow": "npm:^1.0.2"
30991-
"@rolldown/pluginutils": "npm:1.0.0-beta.46"
30992-
"@vitejs/plugin-react": "npm:^5.1.0"
30993-
magic-string: "npm:^0.30.11"
30964+
"@rolldown/pluginutils": "npm:^1.0.0-rc.9"
30965+
"@vitejs/plugin-react": "npm:^5.2.0"
30966+
flow-remove-types: "npm:^2.305.0"
30967+
magic-string: "npm:^0.30.21"
3099430968
vite-plugin-commonjs: "npm:^0.10.4"
3099530969
peerDependencies:
3099630970
react-native-web: "*"
3099730971
typescript: ^5
30998-
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
30999-
checksum: 10c0/a8d97b0475f7de5977f959d029a9a51fd534c6785a800c5aa733abbac8a635e7cbab831a4221b6e5bbc00d03d81c4046199ed3ff33cbe0f7eead6d93c205bed4
30972+
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
30973+
checksum: 10c0/28553936d25c1f47a1ea24d8b8dd9574d3f2d3a4cf7d65cfc58670dd7e7e6e075e6248762793fadb73ae754e2ad3fb80fd28e10be56c48a507d5ae7bd34b64e4
3100030974
languageName: node
3100130975
linkType: hard
3100230976

@@ -31034,6 +31008,19 @@ __metadata:
3103431008
languageName: node
3103531009
linkType: hard
3103631010

31011+
"vite-tsconfig-paths@npm:^6.1.1":
31012+
version: 6.1.1
31013+
resolution: "vite-tsconfig-paths@npm:6.1.1"
31014+
dependencies:
31015+
debug: "npm:^4.1.1"
31016+
globrex: "npm:^0.1.2"
31017+
tsconfck: "npm:^3.0.3"
31018+
peerDependencies:
31019+
vite: "*"
31020+
checksum: 10c0/5e61080991418fefa08c5b98995cdcada4931ae01ac97ef9e2ee941051f61b76890a6e7ba48bed3b2a229ec06fef33a06621bba4ce457b3f4233ad31dc0c1d1b
31021+
languageName: node
31022+
linkType: hard
31023+
3103731024
"vite@npm:6.4.1":
3103831025
version: 6.4.1
3103931026
resolution: "vite@npm:6.4.1"

0 commit comments

Comments
 (0)