Skip to content

Commit 39038bd

Browse files
authored
Merge branch 'main' into congyao/RUM-10415-add-privacy-allowlist-support
2 parents 5196475 + ec025eb commit 39038bd

File tree

87 files changed

+1540
-384
lines changed

Some content is hidden

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

87 files changed

+1540
-384
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ specs.log
99
/test-report/
1010
browserstack.err
1111
package.tgz
12+
docs/
1213

1314
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
1415
.pnp.*

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ rum-events-format
77
developer-extension/dist
88
test/**/dist
99
yarn.lock
10+
docs.json

CHANGELOG.md

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

21+
## v6.14.0
22+
23+
**Public Changes:**
24+
25+
-[RUM-10145] collect errors on module evaluation ([#3622](https://github.com/DataDog/browser-sdk/pull/3622)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
26+
- ✨ don't write lock to cookie for read only operation ([#3652](https://github.com/DataDog/browser-sdk/pull/3652)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
27+
-[RUM-10223] Add locale and timezone data to view event ([#3598](https://github.com/DataDog/browser-sdk/pull/3598)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
28+
- 🐛 Allow service and version to be modifiable for long_task and vital events ([#3691](https://github.com/DataDog/browser-sdk/pull/3691)) [RUM] [RUM-REACT] [RUM-SLIM]
29+
- 🐛 [PANA-3447] Don't send customer data telemetry for any batch with no RUM events ([#3689](https://github.com/DataDog/browser-sdk/pull/3689)) [RUM] [RUM-REACT] [RUM-SLIM]
30+
- 🏷️ add ap2 site to TypeScript types ([#3672](https://github.com/DataDog/browser-sdk/pull/3672)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
31+
32+
**Internal Changes:**
33+
34+
- 👷 simplify test apps build ([#3702](https://github.com/DataDog/browser-sdk/pull/3702))
35+
- 👷 use SIGKILL instead of SIGTERM to kill child jobs ([#3699](https://github.com/DataDog/browser-sdk/pull/3699))
36+
- 👷 use our own `deepClone` method instead of `structuredClone` ([#3700](https://github.com/DataDog/browser-sdk/pull/3700)) [RUM]
37+
- 👷 Add cookie options to telemetry debug ([#3693](https://github.com/DataDog/browser-sdk/pull/3693)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
38+
- 👷 Update all non-major dependencies ([#3673](https://github.com/DataDog/browser-sdk/pull/3673)) [FLAGGING] [WORKER]
39+
- 👷 Lock file maintenance ([#3675](https://github.com/DataDog/browser-sdk/pull/3675))
40+
- 👷 fix `yarn test` and `yarn test:unit:watch` commands ([#3684](https://github.com/DataDog/browser-sdk/pull/3684))
41+
- 👷 fix `yarn test` and `yarn test:unit:watch` commands ([#3683](https://github.com/DataDog/browser-sdk/pull/3683))
42+
- 👷 Update Node.js to v24 ([#3522](https://github.com/DataDog/browser-sdk/pull/3522)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
43+
- 👷‍♀️ [devx] Add cursor rules to improve testing experience ([#3662](https://github.com/DataDog/browser-sdk/pull/3662))
44+
- 👷 add `--spec` option to `yarn test:unit` ([#3678](https://github.com/DataDog/browser-sdk/pull/3678))
45+
- 👷 add `step-7_` prefix to `create-github-release` ci job ([#3668](https://github.com/DataDog/browser-sdk/pull/3668))
46+
- 👷 ignore @playwright/test updates ([#3666](https://github.com/DataDog/browser-sdk/pull/3666))
47+
- ♻️ [Remote config] use types from JSON schema ([#3694](https://github.com/DataDog/browser-sdk/pull/3694)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
48+
- Bump device version in unit tests ([#3703](https://github.com/DataDog/browser-sdk/pull/3703))
49+
- [RUM Profiler] fix unit test, remove RegExp lookbehind ([#3701](https://github.com/DataDog/browser-sdk/pull/3701)) [RUM] [RUM-REACT] [RUM-SLIM]
50+
- ♻️ [RUM-10900] Introduce assemble telemetry hook ([#3685](https://github.com/DataDog/browser-sdk/pull/3685)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
51+
- ♻️ Enforce using interface over type ([#3686](https://github.com/DataDog/browser-sdk/pull/3686)) [FLAGGING] [LOGS] [RUM] [RUM-REACT] [RUM-SLIM] [WORKER]
52+
- [RUM Profiler] add default view names to profiles ([#3669](https://github.com/DataDog/browser-sdk/pull/3669)) [RUM]
53+
2154
## v6.13.0
2255

2356
**Public Changes:**

LICENSE-3rdparty.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ prod,@tabler/icons-react,MIT,Copyright (c) 2020-2023 Paweł Kuna
1010
prod,clsx,MIT,Copyright (c) Luke Edwards <[email protected]> (lukeed.com)
1111
prod,react,MIT,Copyright (c) Facebook, Inc. and its affiliates.
1212
prod,react-dom,MIT,Copyright (c) Facebook, Inc. and its affiliates.
13+
dev,typedoc,Apache-2.0,TypeStrong
1314
dev,@eslint/js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
1415
dev,@jsdevtools/coverage-istanbul-loader,MIT,Copyright (c) 2015 James Messinger
1516
dev,@playwright/test,Apache-2.0,Copyright Microsoft Corporation

developer-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@datadog/browser-sdk-developer-extension",
3-
"version": "6.13.0",
3+
"version": "6.14.0",
44
"private": true,
55
"scripts": {
66
"build": "rm -rf dist && webpack --mode production",

eslint-local-rules/disallowProtectedDirectoryImport.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ module.exports = {
2626
],
2727
},
2828
/**
29+
* Create an ESLint rule to disallow importing modules from protected directories.
30+
*
2931
* @returns {Record<string, Function>}
3032
*/
3133
create(context) {

eslint-local-rules/enforceProdDepsImports.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ module.exports = {
2323
schema: [],
2424
},
2525
/**
26+
* Create an ESLint rule to enforce that only prod dependencies are imported in prod files.
27+
*
2628
* @returns {Record<string, Function>}
2729
*/
2830
create(context) {
@@ -47,8 +49,10 @@ module.exports = {
4749
* Parses the package name from an import source, in particular removes a potential entry path.
4850
*
4951
* @example
52+
* ```ts
5053
* parsePackageName('foo/bar') // 'foo'
5154
* parsePackageName('@foo/bar/baz') // '@foo/bar'
55+
* ```
5256
*/
5357
function parsePackageName(importSource) {
5458
return importSource.split('/', importSource.startsWith('@') ? 2 : 1).join('/')

eslint.config.mjs

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export default tseslint.config(
1919
tseslint.configs.recommendedTypeChecked,
2020
importPlugin.flatConfigs.recommended,
2121
importPlugin.flatConfigs.typescript,
22-
2322
{
2423
ignores: [
2524
'packages/*/bundle',
@@ -227,9 +226,40 @@ export default tseslint.config(
227226
'import/order': 'error',
228227

229228
'jasmine/no-focused-tests': 'error',
230-
231229
'jsdoc/check-alignment': 'error',
232230
'jsdoc/check-indentation': 'error',
231+
'jsdoc/no-blank-blocks': 'error',
232+
'jsdoc/sort-tags': [
233+
'error',
234+
{
235+
tagSequence: [
236+
{
237+
linesBetween: 0,
238+
tags: [
239+
'category',
240+
'packageDocumentation',
241+
'internal',
242+
'deprecated',
243+
'experimental',
244+
'defaultValue',
245+
'param',
246+
'return',
247+
'returns',
248+
'see',
249+
'example',
250+
],
251+
},
252+
],
253+
},
254+
],
255+
'jsdoc/require-description': 'error',
256+
'jsdoc/require-param-description': 'error',
257+
'jsdoc/require-hyphen-before-param-description': 'error',
258+
'jsdoc/tag-lines': ['error', 'any', { startLines: 1 }],
259+
'jsdoc/require-property-description': 'error',
260+
'jsdoc/require-property-name': 'error',
261+
'jsdoc/check-param-names': 'error',
262+
'jsdoc/multiline-blocks': 'error',
233263

234264
'local-rules/disallow-test-import-export-from-src': 'error',
235265
'local-rules/disallow-generic-utils': 'error',
@@ -286,7 +316,7 @@ export default tseslint.config(
286316

287317
{
288318
// JS files. Allow weaker typings since TS can't infer types as accurately as TS files.
289-
files: ['**/*.js'],
319+
files: ['**/*.js', '**/*.mjs'],
290320
rules: {
291321
'@typescript-eslint/no-unsafe-call': 'off',
292322
'@typescript-eslint/no-unsafe-return': 'off',
@@ -344,6 +374,7 @@ export default tseslint.config(
344374
files: ['packages/**/*.ts'],
345375
rules: {
346376
'local-rules/disallow-spec-import': 'error',
377+
'jsdoc/no-types': 'error',
347378
},
348379
},
349380

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"npmClient": "yarn",
3-
"version": "6.13.0"
3+
"version": "6.14.0"
44
}

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
"build": "lerna run build --stream",
1313
"build:bundle": "lerna run build:bundle --stream",
1414
"build:apps": "node scripts/build/build-test-apps.mjs",
15+
"build:docs:json": "npx typedoc --logLevel Verbose --json ./docs.json",
16+
"build:docs:html": "npx typedoc --out ./docs",
1517
"format": "prettier --check .",
1618
"lint": "scripts/cli lint .",
1719
"typecheck": "scripts/cli typecheck . && scripts/cli typecheck developer-extension",
@@ -83,6 +85,7 @@
8385
"ts-loader": "9.5.2",
8486
"ts-node": "10.9.2",
8587
"tsconfig-paths-webpack-plugin": "4.2.0",
88+
"typedoc": "0.28.7",
8689
"typescript": "5.8.3",
8790
"typescript-eslint": "8.36.0",
8891
"webpack": "5.100.1",

0 commit comments

Comments
 (0)