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.

Sign up for GitHub

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

Jump to bottom

Pin rollup version to 3.19.1 #21723

Merged
merged 3 commits into from
Mar 22, 2023
Merged

Pin rollup version to 3.19.1 #21723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6737e57
Pin rollup version to 3.19.1
IanVS Mar 22, 2023
61e398a
Reset yarn.lock file to previous state and only add rollup related ch…
valentinpalkovic Mar 22, 2023
80acee2
Remove unused ts-expect-error comment
valentinpalkovic Mar 22, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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",
"rollup": "^2.25.0 || >=3.3.0 < 3.20.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.0.0",
"rollup": "3.19.1",
"typescript": "~4.9.3",
"vite": "^4.0.4"
},
Expand Down
18 changes: 16 additions & 2 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5719,7 +5719,7 @@ __metadata:
glob: ^8.1.0
glob-promise: ^6.0.2
magic-string: ^0.27.0
rollup: ^3.0.0
rollup: 3.19.1
slash: ^3.0.0
typescript: ~4.9.3
vite: ^4.0.4
Expand Down Expand Up @@ -26596,7 +26596,21 @@ __metadata:
languageName: node
linkType: hard

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

"rollup@npm:^3.18.0":
version: 3.20.0
resolution: "rollup@npm:3.20.0"
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils/yarn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => {
packageJson.resolutions = {
...storybookVersions,
'enhanced-resolve': '~5.10.0', // TODO, remove this
vite: '4.1.4',
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