Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vite: Unpin rollup version #21748

Merged
merged 1 commit into from Mar 28, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/lib/builder-vite/package.json
Expand Up @@ -59,14 +59,14 @@
"glob": "^8.1.0",
"glob-promise": "^6.0.2",
"magic-string": "^0.27.0",
"rollup": "^2.25.0 || >=3.3.0 < 3.20.0",
"rollup": "^2.25.0 || ^3.3.0",
"slash": "^3.0.0"
},
"devDependencies": {
"@storybook/mdx1-csf": ">=1.0.0-next.1",
"@types/express": "^4.17.13",
"@types/node": "^16.0.0",
"rollup": "3.19.1",
"rollup": "^3.20.1",
"typescript": "~4.9.3",
"vite": "^4.0.4"
},
Expand Down
18 changes: 9 additions & 9 deletions code/yarn.lock
Expand Up @@ -5718,7 +5718,7 @@ __metadata:
glob: ^8.1.0
glob-promise: ^6.0.2
magic-string: ^0.27.0
rollup: 3.19.1
rollup: ^3.20.1
slash: ^3.0.0
typescript: ~4.9.3
vite: ^4.0.4
Expand Down Expand Up @@ -26704,31 +26704,31 @@ __metadata:
languageName: node
linkType: hard

"rollup@npm:3.19.1":
version: 3.19.1
resolution: "rollup@npm:3.19.1"
"rollup@npm:^3.18.0":
version: 3.20.0
resolution: "rollup@npm:3.20.0"
dependencies:
fsevents: ~2.3.2
dependenciesMeta:
fsevents:
optional: true
bin:
rollup: dist/bin/rollup
checksum: 1bfb191c2d0d84263f9de9ff7c73d41c65cf74920f3222be4324c88fe11a5a2c87b286cd1791b4977758265ac174d6ba94a0eab3c32ca05a7320ee043a1bc3e9
checksum: 18977cb98a79cb933860bb750aeba4f6c30731c8b1ffc933b0ec20f90e91b9c24c3b6c0a495db20c02b14425761767ae9b2e4e74c34ed5952b4a278fbf8ab2ab
languageName: node
linkType: hard

"rollup@npm:^3.18.0":
version: 3.20.0
resolution: "rollup@npm:3.20.0"
"rollup@npm:^3.20.1":
version: 3.20.1
resolution: "rollup@npm:3.20.1"
dependencies:
fsevents: ~2.3.2
dependenciesMeta:
fsevents:
optional: true
bin:
rollup: dist/bin/rollup
checksum: 18977cb98a79cb933860bb750aeba4f6c30731c8b1ffc933b0ec20f90e91b9c24c3b6c0a495db20c02b14425761767ae9b2e4e74c34ed5952b4a278fbf8ab2ab
checksum: 0202e1f44dd8159cdb8ce9d1888994aad6f729bf656d67759ebd4437cc350b557c235cb4000c00a19d97895bf121965b401700d85e4e2e8808839d0a24712eb2
languageName: node
linkType: hard

Expand Down
1 change: 0 additions & 1 deletion scripts/utils/yarn.ts
Expand Up @@ -23,7 +23,6 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => {
packageJson.resolutions = {
...storybookVersions,
'enhanced-resolve': '~5.10.0', // TODO, remove this
rollup: '3.19.1',
// this is for our CI test, ensure we use the same version as docker image, it should match version specified in `./code/package.json` and `.circleci/config.yml`
'@playwright/test': '1.31.1',
playwright: '1.31.1',
Expand Down