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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
CURRENT_STAGING: staging-26
APP: 'browser-sdk'
CURRENT_CI_IMAGE: 113
CURRENT_CI_IMAGE: 114
BUILD_STABLE_REGISTRY: 'registry.ddbuild.io'
CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE'
GIT_REPOSITORY: 'git@github.com:DataDog/browser-sdk.git'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@eslint/js": "10.0.1",
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
"@microsoft/api-extractor": "7.58.9",
"@playwright/test": "1.60.0",
"@playwright/test": "1.61.0",
"@swc/core": "1.15.41",
"@types/busboy": "1.5.4",
"@types/chrome": "0.1.43",
Expand Down
13 changes: 11 additions & 2 deletions test/e2e/scripts/pinnedProxy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// WebSocket translation proxy that lets a recent @playwright/test client (1.60) drive an
// WebSocket translation proxy that lets a recent @playwright/test client (1.61) drive an
// older `playwright run-server` (1.40). Two layers of translation:
//
// 1) HTTP upgrade — the 1.40 server's User-Agent version check rejects mismatched clients
Expand All @@ -10,7 +10,7 @@
//
// Patches were derived from a diff of the JSON-RPC protocol schema in packages/protocol/src
// (`protocol.yml` up to v1.59.1, `channels.d.ts` from v1.60.0 onward — `protocol.yml` was
// removed in 1.60) between v1.40.1 and v1.60.0 — only the divergences exercised by this
// removed in 1.60) between v1.40.1 and v1.61.0 — only the divergences exercised by this
// repo's e2e tests are translated.
//
// Usage: node pinnedProxy.ts --listen 5400 --upstream 127.0.0.1:5401
Expand Down Expand Up @@ -269,6 +269,15 @@ function rewriteClientToServer(
if (typeof msg.method !== 'string') {
return text
}

// __waitInfo__ is a fire-and-forget instrumentation message added in 1.61 (replacing the
// old EventTargetChannel.waitForEventInfo pattern). The client never registers a callback
// for it, so if the 1.40 server receives it and sends back an error response, the client
// throws "Cannot find command to respond: <id>". Drop it instead of forwarding.
if (msg.method === '__waitInfo__') {
return null
}

const type = msg.guid ? guidTypes.get(msg.guid) : undefined
const params = msg.params || {}

Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1837,14 +1837,14 @@ __metadata:
languageName: node
linkType: hard

"@playwright/test@npm:1.60.0":
version: 1.60.0
resolution: "@playwright/test@npm:1.60.0"
"@playwright/test@npm:1.61.0":
version: 1.61.0
resolution: "@playwright/test@npm:1.61.0"
dependencies:
playwright: "npm:1.60.0"
playwright: "npm:1.61.0"
bin:
playwright: cli.js
checksum: 10c0/86b06e6437933e741c7cd43f362024e857e7bc28a55fcbb0553ef55e01a2a403c64f4786868de8af86a6e303fe99e98a18a42ba19489f43ae122e457f9e2d189
checksum: 10c0/993f5e30878f50c92c058f7a37f15bca456b794f2818a8c0b75bf09bc947657d56fee836ff4ebee83a869a3471663f0d61ca4eaaae31dd1bcf8bf4342344be35
languageName: node
linkType: hard

Expand Down Expand Up @@ -3923,7 +3923,7 @@ __metadata:
"@eslint/js": "npm:10.0.1"
"@jsdevtools/coverage-istanbul-loader": "npm:3.0.5"
"@microsoft/api-extractor": "npm:7.58.9"
"@playwright/test": "npm:1.60.0"
"@playwright/test": "npm:1.61.0"
"@swc/core": "npm:1.15.41"
"@types/busboy": "npm:1.5.4"
"@types/chrome": "npm:0.1.43"
Expand Down Expand Up @@ -8774,27 +8774,27 @@ __metadata:
languageName: node
linkType: hard

"playwright-core@npm:1.60.0":
version: 1.60.0
resolution: "playwright-core@npm:1.60.0"
"playwright-core@npm:1.61.0":
version: 1.61.0
resolution: "playwright-core@npm:1.61.0"
bin:
playwright-core: cli.js
checksum: 10c0/99ccd43923b6e9355e0723b7fe221e6326efd4687f8dafff951313662aea11db51f542a9c2122c704c445fb9baae1c9ec9fa6f895126bbddd9fe92313f6942c9
checksum: 10c0/64cbf5e9f4ad81cbb005d59417e96435e324a6e3801f1c79b36850ad99f6bb90853c4b569a32c49b9eca1e07925bbb2a5a864babdba2178c3c395e0c589d5941
languageName: node
linkType: hard

"playwright@npm:1.60.0":
version: 1.60.0
resolution: "playwright@npm:1.60.0"
"playwright@npm:1.61.0":
version: 1.61.0
resolution: "playwright@npm:1.61.0"
dependencies:
fsevents: "npm:2.3.2"
playwright-core: "npm:1.60.0"
playwright-core: "npm:1.61.0"
dependenciesMeta:
fsevents:
optional: true
bin:
playwright: cli.js
checksum: 10c0/714ad76d85b4865d7e43c0012f9039800c1485373388973ed39d79339cee5ad467052d1e2f1eaeca107a1cb6e65342186a8578a4c3504853d84c3a691250d5db
checksum: 10c0/079dceebe8b745fa6062a3af928024d0c508177fbf15d61dba09ba173f277465ad3746fdc1b31788ade65428f4d3f92fc8083b44c07381b088721eaa2ea06513
languageName: node
linkType: hard

Expand Down
Loading