-
Notifications
You must be signed in to change notification settings - Fork 142
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into nazim/react-timings
- Loading branch information
Showing
89 changed files
with
1,844 additions
and
1,251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| variables: | ||
| CURRENT_STAGING: staging-42 | ||
| CURRENT_STAGING: staging-47 | ||
| APP: 'browser-sdk' | ||
| CURRENT_CI_IMAGE: 74 | ||
| CURRENT_CI_IMAGE: 75 | ||
| BUILD_STABLE_REGISTRY: 'registry.ddbuild.io' | ||
| CI_IMAGE: '$BUILD_STABLE_REGISTRY/ci/$APP:$CURRENT_CI_IMAGE' | ||
| GIT_REPOSITORY: '[email protected]:DataDog/browser-sdk.git' | ||
| MAIN_BRANCH: 'main' | ||
| NEXT_MAJOR_BRANCH: 'v6' | ||
| CHROME_PACKAGE_VERSION: 130.0.6723.58-1 | ||
| CHROME_PACKAGE_VERSION: 131.0.6778.69-1 | ||
|
|
||
| cache: | ||
| key: | ||
|
|
@@ -85,6 +85,19 @@ stages: | |
| refs: | ||
| - tags | ||
|
|
||
| ########################################################################################################################### | ||
| # Resource allocation | ||
| ########################################################################################################################### | ||
|
|
||
| .resource-allocation-4-cpus: | ||
| variables: | ||
| WORKERS: 2 | ||
| KUBERNETES_CPU_REQUEST: 4 | ||
| KUBERNETES_CPU_LIMIT: 4 | ||
| KUBERNETES_MEMORY_REQUEST: 16Gi | ||
| KUBERNETES_MEMORY_LIMIT: 16Gi | ||
| NODE_OPTIONS: '--max-old-space-size=16000' | ||
|
|
||
| ######################################################################################################################## | ||
| # CI image | ||
| ######################################################################################################################## | ||
|
|
@@ -266,6 +279,7 @@ e2e-bs: | |
| extends: | ||
| - .base-configuration | ||
| - .bs-allowed-branches | ||
| - .resource-allocation-4-cpus | ||
| interruptible: true | ||
| resource_group: browserstack | ||
| timeout: 35 minutes | ||
|
|
||
725 changes: 367 additions & 358 deletions
725
.yarn/releases/yarn-4.5.0.cjs → .yarn/releases/yarn-4.5.1.cjs
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:22.9.0-bookworm-slim | ||
| FROM node:22.11.0-bookworm-slim | ||
|
|
||
| ARG CHROME_PACKAGE_VERSION | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| "npmClient": "yarn", | ||
| "version": "5.28.1" | ||
| "version": "5.31.1" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ | |
| }, | ||
| "devDependencies": { | ||
| "@jsdevtools/coverage-istanbul-loader": "3.0.5", | ||
| "@types/chrome": "0.0.278", | ||
| "@types/chrome": "0.0.283", | ||
| "@types/connect-busboy": "1.0.3", | ||
| "@types/cors": "2.8.17", | ||
| "@types/express": "4.17.21", | ||
|
|
@@ -55,13 +55,13 @@ | |
| "eslint-module-utils": "2.12.0", | ||
| "eslint-plugin-import": "2.31.0", | ||
| "eslint-plugin-jasmine": "4.2.2", | ||
| "eslint-plugin-jsdoc": "50.4.1", | ||
| "eslint-plugin-jsdoc": "50.5.0", | ||
| "eslint-plugin-local-rules": "3.0.2", | ||
| "eslint-plugin-prefer-arrow": "1.2.3", | ||
| "eslint-plugin-unicorn": "56.0.0", | ||
| "express": "4.21.1", | ||
| "glob": "11.0.0", | ||
| "html-webpack-plugin": "5.6.0", | ||
| "html-webpack-plugin": "5.6.3", | ||
| "jasmine-core": "3.99.1", | ||
| "json-schema-to-typescript": "bcaudan/json-schema-to-typescript#bcaudan/add-readonly-support", | ||
| "karma": "6.4.4", | ||
|
|
@@ -73,27 +73,27 @@ | |
| "karma-sourcemap-loader": "0.4.0", | ||
| "karma-spec-reporter": "0.0.36", | ||
| "karma-webpack": "5.0.0", | ||
| "lerna": "8.1.8", | ||
| "lerna": "8.1.9", | ||
| "minimatch": "10.0.1", | ||
| "npm-run-all": "4.1.5", | ||
| "prettier": "3.3.3", | ||
| "puppeteer": "23.5.3", | ||
| "puppeteer": "23.8.0", | ||
| "terser-webpack-plugin": "5.3.10", | ||
| "ts-loader": "9.5.1", | ||
| "ts-node": "10.9.2", | ||
| "tsconfig-paths-webpack-plugin": "4.1.0", | ||
| "tsconfig-paths-webpack-plugin": "4.2.0", | ||
| "typescript": "5.6.3", | ||
| "webdriverio": "8.40.6", | ||
| "webpack": "5.95.0", | ||
| "webpack": "5.96.1", | ||
| "webpack-cli": "5.1.4", | ||
| "webpack-dev-middleware": "7.4.2" | ||
| }, | ||
| "resolutions": { | ||
| "puppeteer-core@npm:21.11.0/ws": "8.17.1" | ||
| }, | ||
| "volta": { | ||
| "node": "22.9.0", | ||
| "node": "22.11.0", | ||
| "yarn": "1.22.22" | ||
| }, | ||
| "packageManager": "[email protected].0" | ||
| "packageManager": "[email protected].1" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.