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

VIDCS-3205: Fix deps security issues with resolutions #7

Merged
merged 2 commits into from
Jan 15, 2025
Merged

VIDCS-3205: Fix deps security issues with resolutions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1d981
Fix deps security issues with resolutions
maikthomas Dec 17, 2024
22e66d1
Add wait in failing integration test
maikthomas Jan 14, 2025
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
2 changes: 1 addition & 1 deletion backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"body-parser": "^1.20.3",
"cors": "^2.8.5",
"dotenv": "^16.0.3",
"express": "^4.21.0",
"express": "^4.21.2",
"form-data": "^4.0.1",
"opentok": "^2.16.0"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
"resize-observer-polyfill": "^1.5.1",
"tailwindcss": "^3.4.14",
"typedoc": "^0.26.10",
"vite": "^5.4"
"vite": "^5.4.6"
}
}
1 change: 1 addition & 0 deletions integration-tests/tests/multiparty.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ test.describe('display name for screenshare', () => {
});

await pageOne.waitForSelector('.publisher', { state: 'visible' });
await pageTwo.waitForSelector('.subscriber', { state: 'visible' });
const screenshareButton = await pageOne.getByTestId('ScreenShareIcon');
Comment on lines 135 to 137
Copy link
Contributor Author

@maikthomas maikthomas Jan 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was failing sometimes because we weren't connected so the screenshare button wasn't available yet.
For now this fix waits until a subscriber is visible for tab 2 which means we're obviously already connected and publishing & subscribing - then starts screensharing from page one

await screenshareButton.click();

Expand Down
12 changes: 8 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,13 @@
"typescript": "^5.4.5"
},
"resolutions": {
"wrap-ansi": "7.0.0"
},
"dependencies": {
"rollup": "^4.22.4"
"wrap-ansi": "7.0.0",
"path-to-regexp": "^0.1.12",
"express": "^4.21.2",
"axios": "^1.7.4",
"cross-spawn": "^7.0.5",
"rollup": "^4.22.4",
"vite": "^5.4.11",
"nanoid": "^3.3.8"
Comment on lines +74 to +81
Copy link
Contributor Author

@maikthomas maikthomas Jan 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately we have dependencies that do not have a compatible version which updates these internal dependencies so we have to use yarn resolutions to override those versions instead.

}
}
Loading
Loading