Skip to content

Commit 40e5dda

Browse files
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/time
1 parent ca5c958 commit 40e5dda

85 files changed

Lines changed: 3653 additions & 4523 deletions

File tree

Some content is hidden

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

.github/workflows/changelog-to-confluence.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
13+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1414

1515
- name: Prepare Only Changelog
1616
run: |

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2121

2222
- name: Initialize CodeQL
23-
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
23+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.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@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
29+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

.github/workflows/deploy-generated-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Check out code at tag
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2929
with:
3030
fetch-depth: 0
3131

.github/workflows/lint-pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.event.pull_request.user.type != 'Bot'
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
15+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1616

1717
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1818
with:

.gitlab-ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
CURRENT_STAGING: staging-25
33
APP: 'browser-sdk'
4-
CURRENT_CI_IMAGE: 112
4+
CURRENT_CI_IMAGE: 113
55
BUILD_STABLE_REGISTRY: 'registry.ddbuild.io'
66
CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE'
77
GIT_REPOSITORY: 'git@github.com:DataDog/browser-sdk.git'
@@ -611,6 +611,8 @@ performance-benchmark:
611611
- $TARGET_TASK_NAME == "performance-benchmark-scheduled"
612612
script:
613613
- yarn
614+
- yarn build
615+
- yarn build:apps
614616
- yarn test:performance
615617

616618
api-performance-benchmark:

.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ bundle
22
cjs
33
esm
44
coverage
5-
rum-events-format
65
.yarn
76
test/**/dist
87
test/**/.next

.yarn/releases/yarn-4.15.0.cjs

Lines changed: 0 additions & 940 deletions
This file was deleted.

.yarn/releases/yarn-4.16.0.cjs

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

.yarnrc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
yarnPath: .yarn/releases/yarn-4.15.0.cjs
1+
yarnPath: .yarn/releases/yarn-4.16.0.cjs
22
defaultSemverRangePrefix: ''
33
nodeLinker: node-modules
44
approvedGitRepositories:
55
- 'https://github.com/bcaudan/json-schema-to-typescript.git'
6+
- 'https://github.com/DataDog/rum-events-format.git'
67

78
# Gitlab artifacts are only supported folders relative to the repository. Disable global cache so yarn will store the cache in .yarn/cache.
89
# See https://docs.gitlab.com/ee/ci/jobs/job_artifacts.html#create-job-artifacts

0 commit comments

Comments
 (0)