Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 10.3.2

- CLI: Shorten CTA link messages - [#34236](https://github.com/storybookjs/storybook/pull/34236), thanks @shilman!
- React Native Web: Fix vite8 support by bumping vite-plugin-rnw - [#34231](https://github.com/storybookjs/storybook/pull/34231), thanks @dannyhw!

## 10.3.1

- CLI: Use npm info to fetch versions in repro command - [#34214](https://github.com/storybookjs/storybook/pull/34214), thanks @yannbf!
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/react-native-web-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@storybook/builder-vite": "workspace:*",
"@storybook/react": "workspace:*",
"@storybook/react-vite": "workspace:*",
"vite-plugin-rnw": "^0.0.10",
"vite-tsconfig-paths": "^5.1.4"
"vite-plugin-rnw": "^0.0.11",
"vite-tsconfig-paths": "^6.1.1"
},
"devDependencies": {
"@types/node": "^22.19.1",
Expand Down
4 changes: 2 additions & 2 deletions code/lib/create-storybook/src/commands/FinalizationCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ export class FinalizationCommand {
}

logger.log(dedent`
Wanna know more about Storybook? Check out ${CLI_COLORS.cta('https://storybook.js.org/')}
Having trouble or want to chat? Join us at ${CLI_COLORS.cta('https://discord.gg/storybook/')}
Want to learn more about Storybook? ${CLI_COLORS.cta('https://storybook.js.org/')}
Having trouble or want to chat? ${CLI_COLORS.cta('https://discord.gg/storybook/')}
`);
}
}
Expand Down
3 changes: 2 additions & 1 deletion code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,6 @@
"Dependency Upgrades"
]
]
}
},
"deferredNextVersion": "10.3.2"
}
2 changes: 1 addition & 1 deletion docs/versions/latest.json
Original file line number Diff line number Diff line change
@@ -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!"}}
{"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!"}}
37 changes: 25 additions & 12 deletions scripts/dangerfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ const { labels } = danger.github.issue;
const prLogConfig = pkg['pr-log'];

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

/** @param {string[]} labels */
const checkRequiredLabels = (labels) => {
Expand All @@ -66,18 +68,29 @@ const checkRequiredLabels = (labels) => {
);
}

const foundRequiredLabels = intersection(requiredLabels, labels);
if (foundRequiredLabels.length === 0) {
fail(`PR is not labeled with one of: ${JSON.stringify(requiredLabels)}`);
} else if (foundRequiredLabels.length > 1) {
fail(`Please choose only one of these labels: ${JSON.stringify(foundRequiredLabels)}`);
}

const foundCILabels = intersection(ciLabels, labels);
if (foundCILabels.length === 0) {
fail(`PR is not labeled with one of: ${JSON.stringify(ciLabels)}`);
} else if (foundCILabels.length > 1) {
fail(`Please choose only one of these labels: ${JSON.stringify(foundCILabels)}`);
if (isReleasePr) {
// Release PRs only need `ci:daily`.
if (!labels.includes('ci:daily')) {
fail(
'Release PRs targeting latest-release or next-release must include the "ci:daily" label.'
);
}
return;
} else {
// All other PRs to `next` to a qualifying change type and one of several applicable CI labels.
const foundRequiredLabels = intersection(requiredLabels, labels);
if (foundRequiredLabels.length === 0) {
fail(`PR is not labeled with one of: ${JSON.stringify(requiredLabels)}`);
} else if (foundRequiredLabels.length > 1) {
fail(`Please choose only one of these labels: ${JSON.stringify(foundRequiredLabels)}`);
}

const foundCILabels = intersection(ciLabels, labels);
if (foundCILabels.length === 0) {
fail(`PR is not labeled with one of: ${JSON.stringify(ciLabels)}`);
} else if (foundCILabels.length > 1) {
fail(`Please choose only one of these labels: ${JSON.stringify(foundCILabels)}`);
}
}
};

Expand Down
9 changes: 0 additions & 9 deletions scripts/utils/yarn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,6 @@ export const addWorkaroundResolutions = async ({
};
}

if (key === 'react-native-web-vite/expo-ts') {
additionalResolutions = {
...additionalResolutions,
// The expo sandbox started to break in beta 5, yet to investigate the root cause
// in the meantime, we downgrade to the version where things worked.
vite: '8.0.0-beta.4',
};
}

packageJson.resolutions = {
...packageJson.resolutions,
'@testing-library/dom': '^9.3.4',
Expand Down
125 changes: 56 additions & 69 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2111,16 +2111,6 @@ __metadata:
languageName: node
linkType: hard

"@bunchtogether/vite-plugin-flow@npm:^1.0.2":
version: 1.0.2
resolution: "@bunchtogether/vite-plugin-flow@npm:1.0.2"
dependencies:
flow-remove-types: "npm:^2.158.0"
rollup-pluginutils: "npm:^2.8.2"
checksum: 10c0/84faf014977196470bbeae686b4e167de2805777389f8a0da88647484df7cf39db3da91907d75ea810ea77175c0cdd40a9a3ad92b7c7c44681b0cd1f4156c7b8
languageName: node
linkType: hard

"@chromatic-com/storybook@npm:^5.0.0":
version: 5.0.0
resolution: "@chromatic-com/storybook@npm:5.0.0"
Expand Down Expand Up @@ -7336,17 +7326,10 @@ __metadata:
languageName: node
linkType: hard

"@rolldown/pluginutils@npm:1.0.0-beta.46":
version: 1.0.0-beta.46
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.46"
checksum: 10c0/45664c89b2e24262b103457ca14e1aa0b7f658f5ace4eb4f10f327d88810cad908ec3150d8fc646fe285b96eb66b25defce97aa6eb0a45fe23a8a2dbcda0040c
languageName: node
linkType: hard

"@rolldown/pluginutils@npm:1.0.0-beta.47":
version: 1.0.0-beta.47
resolution: "@rolldown/pluginutils@npm:1.0.0-beta.47"
checksum: 10c0/eb0cfa7334d66f090c47eaac612174936b05f26e789352428cb6e03575b590f355de30d26b42576ea4e613d8887b587119d19b2e4b3a8909ceb232ca1cf746c8
"@rolldown/pluginutils@npm:1.0.0-rc.3":
version: 1.0.0-rc.3
resolution: "@rolldown/pluginutils@npm:1.0.0-rc.3"
checksum: 10c0/3928b6282a30f307d1b075d2f217180ae173ea9e00638ce46ab65f089bd5f7a0b2c488ae1ce530f509387793c656a2910337c4cd68fa9d37d7e439365989e699
languageName: node
linkType: hard

Expand All @@ -7357,6 +7340,13 @@ __metadata:
languageName: node
linkType: hard

"@rolldown/pluginutils@npm:^1.0.0-rc.9":
version: 1.0.0-rc.10
resolution: "@rolldown/pluginutils@npm:1.0.0-rc.10"
checksum: 10c0/7478f982d2705fef5f844e714aa264571d30368ef90883642fdc9eb869613c0c3060e8a8f69255e37a6fb600cbe4be35ce273d1f808fa6fe2a4b4e72116caf29
languageName: node
linkType: hard

"@rollup/pluginutils@npm:^5.0.2":
version: 5.3.0
resolution: "@rollup/pluginutils@npm:5.3.0"
Expand Down Expand Up @@ -8511,8 +8501,8 @@ __metadata:
"@storybook/react-vite": "workspace:*"
"@types/node": "npm:^22.19.1"
typescript: "npm:^5.9.3"
vite-plugin-rnw: "npm:^0.0.10"
vite-tsconfig-paths: "npm:^5.1.4"
vite-plugin-rnw: "npm:^0.0.11"
vite-tsconfig-paths: "npm:^6.1.1"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
Expand Down Expand Up @@ -10777,19 +10767,19 @@ __metadata:
languageName: node
linkType: hard

"@vitejs/plugin-react@npm:^5.1.0":
version: 5.1.1
resolution: "@vitejs/plugin-react@npm:5.1.1"
"@vitejs/plugin-react@npm:^5.2.0":
version: 5.2.0
resolution: "@vitejs/plugin-react@npm:5.2.0"
dependencies:
"@babel/core": "npm:^7.28.5"
"@babel/core": "npm:^7.29.0"
"@babel/plugin-transform-react-jsx-self": "npm:^7.27.1"
"@babel/plugin-transform-react-jsx-source": "npm:^7.27.1"
"@rolldown/pluginutils": "npm:1.0.0-beta.47"
"@rolldown/pluginutils": "npm:1.0.0-rc.3"
"@types/babel__core": "npm:^7.20.5"
react-refresh: "npm:^0.18.0"
peerDependencies:
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
checksum: 10c0/e590efaea1eabfbb1beb6e8c9fac0742fd299808e3368e63b2825ce24740adb8a28fcb2668b14b7ca1bdb42890cfefe94d02dd358dcbbf8a27ddf377b9a82abf
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 10c0/bac0a409e71eee954a05bc41580411c369bd5f9ef0586a1f9743fba76ad6603c437d93d407d230780015361f93d1592c55e53314813cded6369c36d3c1e8edbf
languageName: node
linkType: hard

Expand Down Expand Up @@ -16924,13 +16914,6 @@ __metadata:
languageName: node
linkType: hard

"estree-walker@npm:^0.6.1":
version: 0.6.1
resolution: "estree-walker@npm:0.6.1"
checksum: 10c0/6dabc855faa04a1ffb17b6a9121b6008ba75ab5a163ad9dc3d7fca05cfda374c5f5e91418d783496620ca75e99a73c40874d8b75f23b4117508cc8bde78e7b41
languageName: node
linkType: hard

"estree-walker@npm:^2.0.2":
version: 2.0.2
resolution: "estree-walker@npm:2.0.2"
Expand Down Expand Up @@ -17691,17 +17674,17 @@ __metadata:
languageName: node
linkType: hard

"flow-remove-types@npm:^2.158.0":
version: 2.291.0
resolution: "flow-remove-types@npm:2.291.0"
"flow-remove-types@npm:^2.305.0":
version: 2.306.0
resolution: "flow-remove-types@npm:2.306.0"
dependencies:
hermes-parser: "npm:0.32.0"
hermes-parser: "npm:0.34.0"
pirates: "npm:^3.0.2"
vlq: "npm:^0.2.1"
bin:
flow-node: flow-node
flow-remove-types: flow-remove-types
checksum: 10c0/b074977261f44955103552f854418979926a92b09b740cb613852c9044b21056a1f70ac8b783ca3d74321d23907cc30c31332a5faca28e2340b8b83622b58f2a
checksum: 10c0/2b965f5aa70e7d0b4d6ae6ef115f655fdb8ddd6e21563a2efda5644dc9b64dec1490f45b6658f2cf0ad11299bc199aeb78d589428e46ae0b5dba84a8dc09f92a
languageName: node
linkType: hard

Expand Down Expand Up @@ -18932,19 +18915,19 @@ __metadata:
languageName: node
linkType: hard

"hermes-estree@npm:0.32.0":
version: 0.32.0
resolution: "hermes-estree@npm:0.32.0"
checksum: 10c0/3b67d1fe44336240ef7f9c40ecbf363279ba263d51efe120570c3862cc109e652fc09aebddfe6b73d0f0246610bee130e4064c359f1f4cbf002bdb1d99717ef2
"hermes-estree@npm:0.34.0":
version: 0.34.0
resolution: "hermes-estree@npm:0.34.0"
checksum: 10c0/bd4ad520838c69aa79887230a2030fe1e07d0826389112e2c23a8b18494f9f2fa6b1639f413ad978f3468daea66903869188481f9500aaa1fb79ed6266afb744
languageName: node
linkType: hard

"hermes-parser@npm:0.32.0":
version: 0.32.0
resolution: "hermes-parser@npm:0.32.0"
"hermes-parser@npm:0.34.0":
version: 0.34.0
resolution: "hermes-parser@npm:0.34.0"
dependencies:
hermes-estree: "npm:0.32.0"
checksum: 10c0/5902d2c5d347c0629fba07a47eaad5569590ac69bc8bfb2e454e08d2dfbe1ebd989d88518dca2cba64061689b5eac5960ae6bd15a4a66600bbf377498a3234b7
hermes-estree: "npm:0.34.0"
checksum: 10c0/e20657a21ebc3187f53780f5f2c5dd7434f4371979d05b016ff06306b6db63f9d2575ee60c63e9e7d831dd0f592542193a50a6e8397678d4a312fc5373bbe382
languageName: node
linkType: hard

Expand Down Expand Up @@ -27220,15 +27203,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-pluginutils@npm:^2.8.2":
version: 2.8.2
resolution: "rollup-pluginutils@npm:2.8.2"
dependencies:
estree-walker: "npm:^0.6.1"
checksum: 10c0/20947bec5a5dd68b5c5c8423911e6e7c0ad834c451f1a929b1f4e2bc08836ad3f1a722ef2bfcbeca921870a0a283f13f064a317dc7a6768496e98c9a641ba290
languageName: node
linkType: hard

"rollup@npm:4.34.8":
version: 4.34.8
resolution: "rollup@npm:4.34.8"
Expand Down Expand Up @@ -30983,20 +30957,20 @@ __metadata:
languageName: node
linkType: hard

"vite-plugin-rnw@npm:^0.0.10":
version: 0.0.10
resolution: "vite-plugin-rnw@npm:0.0.10"
"vite-plugin-rnw@npm:^0.0.11":
version: 0.0.11
resolution: "vite-plugin-rnw@npm:0.0.11"
dependencies:
"@bunchtogether/vite-plugin-flow": "npm:^1.0.2"
"@rolldown/pluginutils": "npm:1.0.0-beta.46"
"@vitejs/plugin-react": "npm:^5.1.0"
magic-string: "npm:^0.30.11"
"@rolldown/pluginutils": "npm:^1.0.0-rc.9"
"@vitejs/plugin-react": "npm:^5.2.0"
flow-remove-types: "npm:^2.305.0"
magic-string: "npm:^0.30.21"
vite-plugin-commonjs: "npm:^0.10.4"
peerDependencies:
react-native-web: "*"
typescript: ^5
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
checksum: 10c0/a8d97b0475f7de5977f959d029a9a51fd534c6785a800c5aa733abbac8a635e7cbab831a4221b6e5bbc00d03d81c4046199ed3ff33cbe0f7eead6d93c205bed4
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 10c0/28553936d25c1f47a1ea24d8b8dd9574d3f2d3a4cf7d65cfc58670dd7e7e6e075e6248762793fadb73ae754e2ad3fb80fd28e10be56c48a507d5ae7bd34b64e4
languageName: node
linkType: hard

Expand Down Expand Up @@ -31034,6 +31008,19 @@ __metadata:
languageName: node
linkType: hard

"vite-tsconfig-paths@npm:^6.1.1":
version: 6.1.1
resolution: "vite-tsconfig-paths@npm:6.1.1"
dependencies:
debug: "npm:^4.1.1"
globrex: "npm:^0.1.2"
tsconfck: "npm:^3.0.3"
peerDependencies:
vite: "*"
checksum: 10c0/5e61080991418fefa08c5b98995cdcada4931ae01ac97ef9e2ee941051f61b76890a6e7ba48bed3b2a229ec06fef33a06621bba4ce457b3f4233ad31dc0c1d1b
languageName: node
linkType: hard

"vite@npm:6.4.1":
version: 6.4.1
resolution: "vite@npm:6.4.1"
Expand Down
Loading