Skip to content

Commit 3df655d

Browse files
committed
Merge branch 'main' into thomas.lebeau/electron
2 parents f6dc907 + 86976f2 commit 3df655d

File tree

182 files changed

+64965
-1105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+64965
-1105
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

2222
- name: Initialize CodeQL
23-
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
23+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
2424
with:
2525
languages: javascript
2626
config-file: .github/codeql-config.yml
2727

2828
- name: Perform CodeQL Analysis
29-
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
29+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2

.gitlab-ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
2-
CURRENT_STAGING: staging-46
2+
CURRENT_STAGING: staging-47
33
APP: 'browser-sdk'
4-
CURRENT_CI_IMAGE: 92
4+
CURRENT_CI_IMAGE: 93
55
BUILD_STABLE_REGISTRY: 'registry.ddbuild.io'
66
CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE'
77
GIT_REPOSITORY: '[email protected]:DataDog/browser-sdk.git'
@@ -587,6 +587,20 @@ bump-chrome-version-scheduled-failure:
587587
dependencies:
588588
- bump-chrome-version-scheduled
589589

590+
########################################################################################################################
591+
# Performance benchmark
592+
########################################################################################################################
593+
594+
performance-benchmark:
595+
stage: task
596+
extends: .base-configuration
597+
only:
598+
variables:
599+
- $TARGET_TASK_NAME == "performance-benchmark-scheduled"
600+
script:
601+
- yarn
602+
- yarn test:performance
603+
590604
########################################################################################################################
591605
# Check expired telemetry
592606
########################################################################################################################

.yarn/releases/yarn-4.10.3.cjs renamed to .yarn/releases/yarn-4.11.0.cjs

Lines changed: 300 additions & 300 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
yarnPath: .yarn/releases/yarn-4.10.3.cjs
1+
yarnPath: .yarn/releases/yarn-4.11.0.cjs
22
defaultSemverRangePrefix: ''
33
nodeLinker: node-modules
44

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,29 @@
1818
1919
---
2020

21+
## v6.24.0
22+
23+
**Public Changes:**
24+
25+
-[RUM-12672] Allow graphql variables field to be modifiable in beforeSend ([#3949](https://github.com/DataDog/browser-sdk/pull/3949)) [RUM] [RUM-REACT] [RUM-SLIM]
26+
-[RUM-12133] Track GraphQl Response ([#3921](https://github.com/DataDog/browser-sdk/pull/3921)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
27+
- 📝 [DOCS-12292] Improve Vital API documentation ([#3945](https://github.com/DataDog/browser-sdk/pull/3945)) [RUM] [RUM-REACT] [RUM-SLIM]
28+
29+
**Internal Changes:**
30+
31+
- 👷 reduce build boilerplate ([#3938](https://github.com/DataDog/browser-sdk/pull/3938)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
32+
- 👷 remove glob dependency in favor of native glob from node:fs ([#3950](https://github.com/DataDog/browser-sdk/pull/3950))
33+
- 👷 Lock file maintenance ([#3942](https://github.com/DataDog/browser-sdk/pull/3942))
34+
- 👷 fix MODULE_TYPELESS_PACKAGE_JSON warning ([#3906](https://github.com/DataDog/browser-sdk/pull/3906)) [FLAGGING] [LOGS] [RUM-SLIM] [RUM] [WORKER]
35+
- 👷 Update all non-major dependencies ([#3908](https://github.com/DataDog/browser-sdk/pull/3908)) [FLAGGING] [RUM-REACT] [WORKER]
36+
- 🔧 factorize typedoc category order ([#3947](https://github.com/DataDog/browser-sdk/pull/3947)) [LOGS] [RUM-REACT] [RUM-SLIM] [RUM]
37+
- 🔧 Improve manual deploy job ([#3934](https://github.com/DataDog/browser-sdk/pull/3934))
38+
- 🔧 Bump chrome-webstore-upload from 4.0.0 to 4.0.3 ([#3933](https://github.com/DataDog/browser-sdk/pull/3933))
39+
- ⚗️ Add beta feature for encoding cookie options ([#3951](https://github.com/DataDog/browser-sdk/pull/3951)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
40+
- 🧹 Refactor Puppeteer imports to use named import 'launch' . ([#3953](https://github.com/DataDog/browser-sdk/pull/3953))
41+
- fix telemetry errors ([#3952](https://github.com/DataDog/browser-sdk/pull/3952)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
42+
- Added 'import/enforce-node-protocol-usage' ([#3943](https://github.com/DataDog/browser-sdk/pull/3943))
43+
2144
## v6.23.0
2245

2346
**Public Changes:**

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24.10.0-bookworm-slim
1+
FROM node:24.11.0-bookworm-slim
22

33
ARG CHROME_PACKAGE_VERSION
44

LICENSE-3rdparty.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ dev,@types/node-forge,MIT,Copyright Microsoft Corporation
2424
dev,@types/pako,MIT,Copyright Microsoft Corporation
2525
dev,@types/react,MIT,Copyright Microsoft Corporation
2626
dev,@types/react-dom,MIT,Copyright Microsoft Corporation
27+
dev,@types/react-window,MIT,Copyright Microsoft Corporation
28+
dev,@vitejs/plugin-react,MIT,Copyright (c) 2019-present Evan You & Vite Contributors
2729
dev,@webextension-toolbox/webpack-webextension-plugin,MIT,Copyright 2018 Henrik Wenz ([email protected])
2830
dev,ajv,MIT,Copyright 2015-2017 Evgeny Poberezkin
2931
dev,browserstack-local,MIT,Copyright 2016 BrowserStack
@@ -60,13 +62,16 @@ dev,pako,MIT,(C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
6062
dev,prettier,MIT,Copyright James Long and contributors
6163
dev,puppeteer,Apache-2.0,Copyright 2017 Google Inc.
6264
dev,react-router-dom,MIT,Copyright (c) React Training LLC 2015-2019 Copyright (c) Remix Software Inc. 2020-2021 Copyright (c) Shopify Inc. 2022-2023
65+
dev,react-window,MIT,Copyright (c) 2018 Brian Vaughn
66+
dev,recharts,MIT,Copyright (c) 2015-present recharts
6367
dev,style-loader,MIT,Copyright JS Foundation and other contributors
6468
dev,terser-webpack-plugin,MIT,Copyright JS Foundation and other contributors
6569
dev,ts-loader,MIT,Copyright 2015 TypeStrong
6670
dev,ts-node,MIT,Copyright 2014 Blake Embrey
6771
dev,tsconfig-paths-webpack-plugin,MIT,Copyright 2016 Jonas Kello
6872
dev,typescript,Apache-2.0,Copyright Microsoft Corporation
6973
dev,typescript-eslint,MIT,Copyright (c) 2019 typescript-eslint and other contributors
74+
dev,vite,MIT,Copyright (c) 2019-present, VoidZero Inc. and Vite contributors
7075
dev,webpack,MIT,Copyright JS Foundation and other contributors
7176
dev,webpack-cli,MIT,Copyright JS Foundation and other contributors
7277
dev,webpack-dev-middleware,MIT,Copyright JS Foundation and other contributors

developer-extension/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@datadog/browser-sdk-developer-extension",
3-
"version": "6.23.0",
3+
"version": "6.24.0",
44
"private": true,
55
"scripts": {
66
"build": "rm -rf dist && webpack --disable-interpret --mode production",
77
"dev": "rm -rf dist && webpack --disable-interpret --mode development && webpack serve --disable-interpret --mode development --config-name=panel --hot"
88
},
99
"devDependencies": {
1010
"@pmmmwh/react-refresh-webpack-plugin": "^0.6.0",
11-
"@types/chrome": "0.1.24",
11+
"@types/chrome": "0.1.27",
1212
"@types/react": "19.2.2",
1313
"@types/react-dom": "19.2.2",
1414
"@types/webpack-env": "^1.18.4",
@@ -28,8 +28,8 @@
2828
"@datadog/browser-core": "workspace:*",
2929
"@datadog/browser-logs": "workspace:*",
3030
"@datadog/browser-rum": "workspace:*",
31-
"@mantine/core": "8.3.5",
32-
"@mantine/hooks": "8.3.5",
31+
"@mantine/core": "8.3.7",
32+
"@mantine/hooks": "8.3.7",
3333
"@tabler/icons-react": "3.35.0",
3434
"clsx": "2.1.1",
3535
"react": "19.2.0",

eslint-local-rules/disallowSideEffects.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ function reportPotentialSideEffect(context, node) {
118118
reportPotentialSideEffect(context, node.object)
119119
reportPotentialSideEffect(context, node.property)
120120
return
121+
case 'ConditionalExpression':
121122
case 'FunctionExpression':
122123
case 'ArrowFunctionExpression':
123124
case 'FunctionDeclaration':

eslint.config.mjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ export default tseslint.config(
2626
'packages/*/esm',
2727
'developer-extension/dist',
2828
'test/**/dist',
29+
'test/apps/react-heavy-spa',
30+
'test/apps/react-shopist-like',
2931
'sandbox',
3032
'coverage',
3133
'rum-events-format',
@@ -50,6 +52,7 @@ export default tseslint.config(
5052
'./tsconfig.scripts.json',
5153
'./developer-extension/tsconfig.webpack.json',
5254
'./test/e2e/tsconfig.json',
55+
'./test/performance/tsconfig.json',
5356
'./performances/tsconfig.json',
5457

5558
'./test/apps/**/tsconfig.json',
@@ -465,7 +468,7 @@ export default tseslint.config(
465468
},
466469

467470
{
468-
files: ['test/e2e/**/*.ts'],
471+
files: ['test/e2e/**/*.ts', 'test/performance/**/*.ts'],
469472
rules: {
470473
// E2E codebase is importing @datadog/browser-* packages referenced by tsconfig.
471474
'import/no-extraneous-dependencies': 'off',

0 commit comments

Comments
 (0)