Commit 40e5dda
committed
🔀 Merge main: resolve conflicts from rum-events-format migration and Hook API changes
- package.json: re-added vitest deps/scripts/resolutions on top of main's changes
- allJsonSchemas.ts: updated glob path from submodule to node_modules/@datadog/rum-events-format
- profiler.spec.ts: took main's removal of findTrackedSessionSpy, converted toBeTrue
- tsconfig.default.json: removed jasmine types, added vitest.bs.config.ts exclusion
- vitest configs: updated js-core/time alias to src/entries/time1 parent ca5c958 commit 40e5dda
85 files changed
Lines changed: 3653 additions & 4523 deletions
File tree
- .github/workflows
- .yarn/releases
- developer-extension
- src/panel/components/tabs/eventsTab
- docs
- packages
- browser-core
- src/domain/telemetry
- browser-debugger
- browser-logs
- src/domain
- browser-rum-angular
- browser-rum-core
- src/domain/action
- test
- browser-rum-nextjs
- browser-rum-nuxt
- browser-rum-react
- internal
- react-router-v6
- react-router-v7
- tanstack-router
- browser-rum-slim
- browser-rum-vue
- vue-router-v4
- browser-rum
- internal-synthetics
- internal
- src/domain/profiling
- browser-worker
- js-core
- src/entries
- time
- scripts
- build
- lib
- test
- apps
- angular-app
- base-extension
- instrumentation-overhead
- microfrontend
- nextjs
- react-heavy-spa
- react-router-app
- react-shopist-like
- tanstack-router-app
- vue-router-app
- e2e
- lib/helpers
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
611 | 611 | | |
612 | 612 | | |
613 | 613 | | |
| 614 | + | |
| 615 | + | |
614 | 616 | | |
615 | 617 | | |
616 | 618 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
This file was deleted.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
0 commit comments