Skip to content

Commit a8e1c7c

Browse files
merge main branch
2 parents adfe4ec + 86976f2 commit a8e1c7c

File tree

151 files changed

+64374
-849
lines changed

Some content is hidden

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

151 files changed

+64374
-849
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

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
@@ -25,6 +25,8 @@ dev,@types/pako,MIT,Copyright Microsoft Corporation
2525
dev,@types/react,MIT,Copyright Microsoft Corporation
2626
dev,@types/react-dom,MIT,Copyright Microsoft Corporation
2727
dev,@wxt-dev/module-react,MIT,Copyright (c) 2023 Aaron
28+
dev,@types/react-window,MIT,Copyright Microsoft Corporation
29+
dev,@vitejs/plugin-react,MIT,Copyright (c) 2019-present Evan You & Vite Contributors
2830
dev,ajv,MIT,Copyright 2015-2017 Evgeny Poberezkin
2931
dev,browserstack-local,MIT,Copyright 2016 BrowserStack
3032
dev,chrome-webstore-upload,MIT,Copyright Federico Brigante <[email protected]> (https://fregante.com), 2020 Andrew Levine
@@ -58,12 +60,15 @@ dev,pako,MIT,(C) 2014-2017 Vitaly Puzrin and Andrey Tupitsin
5860
dev,prettier,MIT,Copyright James Long and contributors
5961
dev,puppeteer,Apache-2.0,Copyright 2017 Google Inc.
6062
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
63+
dev,react-window,MIT,Copyright (c) 2018 Brian Vaughn
64+
dev,recharts,MIT,Copyright (c) 2015-present recharts
6165
dev,terser-webpack-plugin,MIT,Copyright JS Foundation and other contributors
6266
dev,ts-loader,MIT,Copyright 2015 TypeStrong
6367
dev,ts-node,MIT,Copyright 2014 Blake Embrey
6468
dev,tsconfig-paths-webpack-plugin,MIT,Copyright 2016 Jonas Kello
6569
dev,typescript,Apache-2.0,Copyright Microsoft Corporation
6670
dev,typescript-eslint,MIT,Copyright (c) 2019 typescript-eslint and other contributors
71+
dev,vite,MIT,Copyright (c) 2019-present, VoidZero Inc. and Vite contributors
6772
dev,webpack,MIT,Copyright JS Foundation and other contributors
6873
dev,webpack-cli,MIT,Copyright JS Foundation and other contributors
6974
dev,webpack-dev-middleware,MIT,Copyright JS Foundation and other contributors

developer-extension/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dev": "wxt"
88
},
99
"devDependencies": {
10-
"@types/chrome": "0.1.24",
10+
"@types/chrome": "0.1.27",
1111
"@types/react": "19.2.2",
1212
"@types/react-dom": "19.2.2",
1313
"@wxt-dev/module-react": "1.1.5",
@@ -17,8 +17,8 @@
1717
"@datadog/browser-core": "workspace:*",
1818
"@datadog/browser-logs": "workspace:*",
1919
"@datadog/browser-rum": "workspace:*",
20-
"@mantine/core": "8.3.5",
21-
"@mantine/hooks": "8.3.5",
20+
"@mantine/core": "8.3.7",
21+
"@mantine/hooks": "8.3.7",
2222
"@tabler/icons-react": "3.35.0",
2323
"clsx": "2.1.1",
2424
"react": "19.2.0",

eslint-local-rules/disallowSideEffects.js

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

eslint.config.mjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ export default tseslint.config(
2525
'packages/*/cjs',
2626
'packages/*/esm',
2727
'test/**/dist',
28+
'test/apps/react-heavy-spa',
29+
'test/apps/react-shopist-like',
2830
'sandbox',
2931
'coverage',
3032
'rum-events-format',
@@ -51,6 +53,7 @@ export default tseslint.config(
5153
'./tsconfig.scripts.json',
5254
'./developer-extension/tsconfig.json',
5355
'./test/e2e/tsconfig.json',
56+
'./test/performance/tsconfig.json',
5457
'./performances/tsconfig.json',
5558

5659
'./test/apps/**/tsconfig.json',
@@ -454,7 +457,7 @@ export default tseslint.config(
454457
},
455458

456459
{
457-
files: ['test/e2e/**/*.ts'],
460+
files: ['test/e2e/**/*.ts', 'test/performance/**/*.ts'],
458461
rules: {
459462
// E2E codebase is importing @datadog/browser-* packages referenced by tsconfig.
460463
'import/no-extraneous-dependencies': 'off',

package.json

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"packages/*",
77
"developer-extension",
88
"performances",
9-
"test/e2e"
9+
"test/e2e",
10+
"test/performance"
1011
],
1112
"type": "module",
1213
"scripts": {
@@ -35,37 +36,40 @@
3536
"test:e2e:ci:bs": "yarn build && yarn build:apps && yarn test:e2e:bs",
3637
"test:compat:tsc": "node scripts/check-typescript-compatibility.ts",
3738
"test:compat:ssr": "scripts/cli check_server_side_rendering_compatibility",
39+
"test:performance": "yarn test:e2e:init && playwright test --config test/performance/playwright.config.ts",
40+
"test:performance:debug": "playwright test --config test/performance/playwright.config.ts --debug",
41+
"test:performance:ui": "playwright test --config test/performance/playwright.config.ts --ui",
3842
"json-schemas:sync": "scripts/cli update_submodule && yarn json-schemas:generate",
3943
"json-schemas:generate": "scripts/cli build_json2type && node scripts/generate-schema-types.ts",
4044
"size": "node scripts/show-bundle-size.ts",
4145
"woke": "scripts/cli woke",
4246
"docs:serve": "typedoc && npx http-server ./docs -p 8080 -o"
4347
},
4448
"devDependencies": {
45-
"@eslint/js": "9.38.0",
49+
"@eslint/js": "9.39.1",
4650
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
47-
"@playwright/test": "1.55.1",
48-
"@swc/core": "1.13.20",
49-
"@types/chrome": "0.1.24",
51+
"@playwright/test": "1.56.1",
52+
"@swc/core": "1.15.1",
53+
"@types/chrome": "0.1.27",
5054
"@types/connect-busboy": "1.0.3",
5155
"@types/cors": "2.8.19",
52-
"@types/express": "5.0.3",
56+
"@types/express": "5.0.5",
5357
"@types/jasmine": "3.10.18",
54-
"@types/node": "24.9.1",
58+
"@types/node": "24.10.0",
5559
"ajv": "8.17.1",
5660
"browserstack-local": "1.5.8",
5761
"chrome-webstore-upload": "4.0.3",
5862
"connect-busboy": "1.0.0",
5963
"cors": "2.8.5",
6064
"emoji-name-map": "2.0.3",
61-
"eslint": "9.38.0",
65+
"eslint": "9.39.1",
6266
"eslint-module-utils": "2.12.1",
6367
"eslint-plugin-import": "2.32.0",
6468
"eslint-plugin-jasmine": "4.2.2",
65-
"eslint-plugin-jsdoc": "61.1.5",
66-
"eslint-plugin-unicorn": "61.0.2",
69+
"eslint-plugin-jsdoc": "61.1.12",
70+
"eslint-plugin-unicorn": "62.0.0",
6771
"express": "5.1.0",
68-
"globals": "16.4.0",
72+
"globals": "16.5.0",
6973
"html-webpack-plugin": "5.6.4",
7074
"http-server": "14.1.1",
7175
"jasmine-core": "3.99.1",
@@ -80,17 +84,17 @@
8084
"karma-spec-reporter": "0.0.36",
8185
"karma-webpack": "5.0.0",
8286
"lerna": "9.0.0",
83-
"minimatch": "10.0.3",
87+
"minimatch": "10.1.1",
8488
"prettier": "3.6.2",
85-
"puppeteer": "24.26.0",
89+
"puppeteer": "24.29.1",
8690
"swc-loader": "0.2.6",
8791
"terser-webpack-plugin": "5.3.14",
8892
"ts-loader": "9.5.4",
8993
"ts-node": "10.9.2",
9094
"tsconfig-paths-webpack-plugin": "4.2.0",
9195
"typedoc": "0.28.14",
9296
"typescript": "5.9.3",
93-
"typescript-eslint": "8.46.2",
97+
"typescript-eslint": "8.46.3",
9498
"webpack": "5.102.1",
9599
"webpack-cli": "6.0.1",
96100
"webpack-dev-middleware": "7.4.5"
@@ -99,8 +103,8 @@
99103
"puppeteer-core@npm:21.11.0/ws": "8.17.1"
100104
},
101105
"volta": {
102-
"node": "24.10.0",
103-
"yarn": "4.10.3"
106+
"node": "24.11.0",
107+
"yarn": "4.11.0"
104108
},
105-
"packageManager": "yarn@4.10.3"
109+
"packageManager": "yarn@4.11.0"
106110
}

0 commit comments

Comments
 (0)