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
5 changes: 4 additions & 1 deletion integration-tests/cypress/cypress.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ moduleTypes.forEach(({

// cypress-fail-fast is required as an incompatible plugin.
// typescript is required to compile .cy.ts spec files in the pre-compiled JS tests.
useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript'], true)
// typescript@5 is pinned because typescript@6 emits "use strict" on line 1 for
// non-module files, shifting compiled line numbers and breaking source map resolution.
// TODO: Update tests files accordingly and test with different TS versions
useSandbox([`cypress@${version}`, 'cypress-fail-fast@7.1.0', 'typescript@5'], true)

before(async function () {
// Note: Cypress binary is already installed during useSandbox() via the postinstall script
Expand Down
3 changes: 2 additions & 1 deletion integration-tests/playwright/playwright.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ versions.forEach((version) => {
this.retries(2)
this.timeout(80000)

useSandbox([`@playwright/test@${version}`, '@types/node', 'typescript'], true)
// TODO: Update tests files accordingly and test with different TS versions
useSandbox([`@playwright/test@${version}`, '@types/node', 'typescript@5'], true)

before(function (done) {
// Increase timeout for this hook specifically to account for slow chromium installation in CI
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
"semver": "^7.7.2",
"sinon": "^21.0.3",
"tiktoken": "^1.0.21",
"typescript": "^5.9.2",
"typescript": "^6.0.2",
"workerpool": "^10.0.0",
"yaml": "^2.8.3",
"yarn-deduplicate": "^6.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ describe('esm', () => {
' --target ES2023' +
' --module ESNext' +
' --strict true' +
' --moduleResolution node' +
' --moduleResolution bundler' +
' --esModuleInterop true'
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const testVersions = [
'^3',
'^4',
'^5',
'^6',
]

const testCases = [
Expand Down Expand Up @@ -100,7 +101,7 @@ describe('typescript', () => {

// compile typescript
execSync(
`tsc --target ES6 --experimentalDecorators --module commonjs --sourceMap ${file}.ts`,
`tsc --target ES6 --experimentalDecorators --module commonjs --sourceMap --types node ${file}.ts`,
{ cwd, stdio: 'inherit' }
)

Expand Down
2 changes: 1 addition & 1 deletion packages/dd-trace/test/plugins/versions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"stripe": "20.1.0",
"tedious": "19.2.0",
"tinypool": "2.1.0",
"typescript": "5.9.3",
"typescript": "6.0.2",
"undici": "7.18.2",
"vitest": "4.1.0",
"when": "3.7.8",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4372,10 +4372,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

typescript@^5.9.2:
version "5.9.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
typescript@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.2.tgz#0b1bfb15f68c64b97032f3d78abbf98bdbba501f"
integrity sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==

unbox-primitive@^1.1.0:
version "1.1.0"
Expand Down
Loading