From fe5a0123690f9b56e5da2bddd25422fb656afb86 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Jul 2025 08:14:03 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=91=B7=20Update=20Node.js=20to=20v24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- package.json | 2 +- performances/package.json | 2 +- yarn.lock | 28 ++++++---------------------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6bf94cb0f..37fad36171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:23.11.1-bookworm-slim +FROM node:24.3.0-bookworm-slim ARG CHROME_PACKAGE_VERSION diff --git a/package.json b/package.json index 15199e0c49..0c6e2f9860 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@types/cors": "2.8.19", "@types/express": "5.0.3", "@types/jasmine": "3.10.18", - "@types/node": "22.15.34", + "@types/node": "24.0.10", "ajv": "8.17.1", "browserstack-local": "1.5.7", "chrome-webstore-upload": "3.1.4", diff --git a/performances/package.json b/performances/package.json index 1a33725d08..ce772d233b 100644 --- a/performances/package.json +++ b/performances/package.json @@ -6,7 +6,7 @@ "start": "ts-node ./src/main.ts" }, "dependencies": { - "@types/node": "22.15.34", + "@types/node": "24.0.10", "@types/node-forge": "1.3.11", "node-forge": "1.3.1", "puppeteer": "24.11.1", diff --git a/yarn.lock b/yarn.lock index bc04ac227f..6ce64a9b83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1937,21 +1937,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=10.0.0": - version: 24.0.7 - resolution: "@types/node@npm:24.0.7" +"@types/node@npm:*, @types/node@npm:24.0.10, @types/node@npm:>=10.0.0": + version: 24.0.10 + resolution: "@types/node@npm:24.0.10" dependencies: undici-types: "npm:~7.8.0" - checksum: 10c0/be3849816dafc54ec79e6be6dafcf60bdb6466beaf0081b941142d260e2b2864855210dfe5b4395c59b276468528695aefcf4f060ac95cc433b2968e80a311f9 - languageName: node - linkType: hard - -"@types/node@npm:22.15.34": - version: 22.15.34 - resolution: "@types/node@npm:22.15.34" - dependencies: - undici-types: "npm:~6.21.0" - checksum: 10c0/fb6a6b36daaa1b484aaba3d33b4d1e7b37ea993e29f20b7a676affa76ed6ff6acd2ded4d5003469bc8dbc815b3d224533b4560896037ef6d5b5d552721ab7d57 + checksum: 10c0/11dbd869d3e12ee7b7818113588950e538783e45d227122174c763cb05977defbd1e01b44b5ccd4b8997e42c3df7f7b83c6ee05cfa43d924c8882886bc5f6582 languageName: node linkType: hard @@ -3088,7 +3079,7 @@ __metadata: "@types/cors": "npm:2.8.19" "@types/express": "npm:5.0.3" "@types/jasmine": "npm:3.10.18" - "@types/node": "npm:22.15.34" + "@types/node": "npm:24.0.10" ajv: "npm:8.17.1" browserstack-local: "npm:1.5.7" chrome-webstore-upload: "npm:3.1.4" @@ -9308,7 +9299,7 @@ __metadata: version: 0.0.0-use.local resolution: "performances@workspace:performances" dependencies: - "@types/node": "npm:22.15.34" + "@types/node": "npm:24.0.10" "@types/node-forge": "npm:1.3.11" node-forge: "npm:1.3.1" puppeteer: "npm:24.11.1" @@ -11791,13 +11782,6 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~6.21.0": - version: 6.21.0 - resolution: "undici-types@npm:6.21.0" - checksum: 10c0/c01ed51829b10aa72fc3ce64b747f8e74ae9b60eafa19a7b46ef624403508a54c526ffab06a14a26b3120d055e1104d7abe7c9017e83ced038ea5cf52f8d5e04 - languageName: node - linkType: hard - "undici-types@npm:~7.8.0": version: 7.8.0 resolution: "undici-types@npm:7.8.0" From e86408f522c3995e62bd65d276c4e03cb7a70c70 Mon Sep 17 00:00:00 2001 From: Bastien Caudan Date: Wed, 2 Jul 2025 10:18:46 +0200 Subject: [PATCH 2/5] bump volta node version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c6e2f9860..1333e98807 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "puppeteer-core@npm:21.11.0/ws": "8.17.1" }, "volta": { - "node": "23.11.1", + "node": "24.3.0", "yarn": "4.9.2" }, "packageManager": "yarn@4.9.2" From de2b517adca252c89cc68dca7ec9762ef12cac1c Mon Sep 17 00:00:00 2001 From: Bastien Caudan Date: Wed, 2 Jul 2025 10:19:30 +0200 Subject: [PATCH 3/5] bump ci image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b31e14ba70..074d3e0527 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: CURRENT_STAGING: staging-27 APP: 'browser-sdk' - CURRENT_CI_IMAGE: 81 + CURRENT_CI_IMAGE: 82 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' From f2aa47a8c424478b78336341c9a847f296bc0fe4 Mon Sep 17 00:00:00 2001 From: Bastien Caudan Date: Wed, 2 Jul 2025 17:21:48 +0200 Subject: [PATCH 4/5] fix existing eslint warnings --- .../src/panel/components/tabs/eventsTab/eventRow.tsx | 2 +- .../src/panel/components/tabs/eventsTab/rowButton.tsx | 2 +- packages/core/src/tools/stackTrace/computeStackTrace.spec.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/developer-extension/src/panel/components/tabs/eventsTab/eventRow.tsx b/developer-extension/src/panel/components/tabs/eventsTab/eventRow.tsx index 0849d8caf2..64be78d6bb 100644 --- a/developer-extension/src/panel/components/tabs/eventsTab/eventRow.tsx +++ b/developer-extension/src/panel/components/tabs/eventsTab/eventRow.tsx @@ -2,7 +2,7 @@ import { Table, Badge, Menu } from '@mantine/core' import { IconCopy, IconDotsVertical, IconColumnInsertRight } from '@tabler/icons-react' import type { ComponentPropsWithoutRef, ReactNode } from 'react' import React, { useRef, useState } from 'react' -import clsx from 'clsx' +import { default as clsx } from 'clsx' import type { TelemetryEvent } from '../../../../../../packages/core/src/domain/telemetry' import type { LogsEvent } from '../../../../../../packages/logs/src/logsEvent.types' import type { diff --git a/developer-extension/src/panel/components/tabs/eventsTab/rowButton.tsx b/developer-extension/src/panel/components/tabs/eventsTab/rowButton.tsx index ec109f0abb..75db3ac854 100644 --- a/developer-extension/src/panel/components/tabs/eventsTab/rowButton.tsx +++ b/developer-extension/src/panel/components/tabs/eventsTab/rowButton.tsx @@ -1,7 +1,7 @@ import type { ActionIconProps } from '@mantine/core' import { ActionIcon } from '@mantine/core' import type { PolymorphicComponentProps } from '@mantine/core/lib/core/factory/create-polymorphic-component' -import clsx from 'clsx' +import { default as clsx } from 'clsx' import type { JSXElementConstructor } from 'react' import React, { forwardRef } from 'react' import * as classes from './rowButton.module.css' diff --git a/packages/core/src/tools/stackTrace/computeStackTrace.spec.ts b/packages/core/src/tools/stackTrace/computeStackTrace.spec.ts index 63f14a764b..6184bbbe87 100644 --- a/packages/core/src/tools/stackTrace/computeStackTrace.spec.ts +++ b/packages/core/src/tools/stackTrace/computeStackTrace.spec.ts @@ -960,7 +960,6 @@ Error: foo }) it('should normalize non native errors stacktraces across browsers', () => { - /* eslint-disable no-restricted-syntax */ class DatadogTestCustomError extends Error { constructor() { super() From 0d1fc3cecdc2468e2b20da735296851fd3dff681 Mon Sep 17 00:00:00 2001 From: Bastien Caudan Date: Wed, 2 Jul 2025 17:24:12 +0200 Subject: [PATCH 5/5] fix eslint errors Unsafe call of a(n) `error` type typed value eslint suggestion was to upgrade to es2022 or later --- test/e2e/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/tsconfig.json b/test/e2e/tsconfig.json index 7c1527a9a8..86b0313340 100644 --- a/test/e2e/tsconfig.json +++ b/test/e2e/tsconfig.json @@ -7,7 +7,7 @@ "esModuleInterop": true, "moduleResolution": "node", "resolveJsonModule": true, - "target": "ES2018", + "target": "ES2022", "module": "ES2020", "types": ["node", "ajv"], "allowJs": true,