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

chore: Don't hoist devtools-protocol #28372

Merged
merged 5 commits into from
Nov 22, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/app/cypress/e2e/runs.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@ describe('App: Runs', { viewportWidth: 1200 }, () => {
})

context('Runs - Create Project', () => {
it('when a project is created, injects new projectId into the config file, and sends expected UTM params', () => {
// TODO: fix flaky test
it('when a project is created, injects new projectId into the config file, and sends expected UTM params', { retries: 15 }, () => {
cy.remoteGraphQLIntercept((obj) => {
if (obj.operationName === 'SelectCloudProjectModal_CreateCloudProject_cloudProjectCreate') {
obj.result.data!.cloudProjectCreate = {
Expand Down Expand Up @@ -456,7 +457,8 @@ describe('App: Runs', { viewportWidth: 1200 }, () => {
cy.findByText(defaultMessages.runs.errors.notFound.button).should('be.visible')
})

it('opens Connect Project modal after clicking Reconnect Project button', () => {
// TODO: fix flaky test
it('opens Connect Project modal after clicking Reconnect Project button', { retries: 15 }, () => {
cy.findByText(defaultMessages.runs.errors.notFound.button).click()

cy.get('[aria-modal="true"]').should('exist')
Expand Down
3 changes: 2 additions & 1 deletion packages/driver/cypress/e2e/issues/1244.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ describe('issue 1244', () => {
cy.url().should('include', 'dom.html')
})

it('does not strip link _parent', () => {
// TODO: fix flaky test
it('does not strip link _parent', { retries: 15 }, () => {
cy.get('iframe').then(($iframe) => {
const $el = $iframe.contents().find('a.inline_parent')

Expand Down
1 change: 1 addition & 0 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
"workspaces": {
"nohoist": [
"@benmalka/foxdriver",
"devtools-protocol",
"tsconfig-paths"
]
},
Expand Down
2 changes: 2 additions & 0 deletions packages/socket/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"@types/uuid": "8.3.2",
"chai": "3.5.0",
"cross-env": "6.0.3",
"devtools-protocol": "0.0.927104",
"mocha": "3.5.3",
"resolve-pkg": "2.0.0"
},
Expand All @@ -39,6 +40,7 @@
"types": "lib/socket.ts",
"workspaces": {
"nohoist": [
"devtools-protocol",
"engine.io",
"engine.io-parser",
"socket.io",
Expand Down
8 changes: 7 additions & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@
"dependencies": {},
"devDependencies": {
"@types/node": "18.17.5",
"devtools-protocol": "0.0.927104",
"typescript": "^4.7.4"
},
"files": [
"src/*"
],
"types": "src/index.ts"
"types": "src/index.ts",
"workspaces": {
"nohoist": [
"devtools-protocol"
]
}
}
Loading