Skip to content

Commit 9a43383

Browse files
narsaynorathnarsaynorath
authored
Merge branch 'develop' into nar/feat/replace-sentence-style-browser-span-keys-with-snake-case
2 parents 80ee8f8 + 2b27989 commit 9a43383

File tree

56 files changed

+153
-29729
lines changed

Some content is hidden

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

56 files changed

+153
-29729
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ jobs:
770770
ref: ${{ env.HEAD_COMMIT }}
771771
- uses: pnpm/action-setup@v2
772772
with:
773-
version: 7
773+
version: 8.3.1
774774
- name: Set up Node
775775
uses: actions/setup-node@v3
776776
with:

‎.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
ref: ${{ env.HEAD_COMMIT }}
2929
- uses: pnpm/action-setup@v2
3030
with:
31-
version: 7
31+
version: 8.3.1
3232
- name: Set up Node
3333
uses: actions/setup-node@v3
3434
with:

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"npmClient": "yarn",
55
"useWorkspaces": true
66
}

‎packages/angular-ivy/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular-ivy",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"description": "Official Sentry SDK for Angular with full Ivy Support",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular-ivy",
@@ -21,9 +21,9 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.49.0",
25-
"@sentry/types": "7.49.0",
26-
"@sentry/utils": "7.49.0",
24+
"@sentry/browser": "7.50.0",
25+
"@sentry/types": "7.50.0",
26+
"@sentry/utils": "7.50.0",
2727
"tslib": "^2.3.0"
2828
},
2929
"devDependencies": {

‎packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"description": "Official Sentry SDK for Angular",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.49.0",
25-
"@sentry/types": "7.49.0",
26-
"@sentry/utils": "7.49.0",
24+
"@sentry/browser": "7.50.0",
25+
"@sentry/types": "7.50.0",
26+
"@sentry/utils": "7.50.0",
2727
"tslib": "^2.0.0"
2828
},
2929
"devDependencies": {

‎packages/browser-integration-tests/fixtures/loader.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/browser-integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {

‎packages/browser/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"description": "Official Sentry SDK for browsers",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,15 +16,15 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry-internal/tracing": "7.49.0",
20-
"@sentry/core": "7.49.0",
21-
"@sentry/replay": "7.49.0",
22-
"@sentry/types": "7.49.0",
23-
"@sentry/utils": "7.49.0",
19+
"@sentry-internal/tracing": "7.50.0",
20+
"@sentry/core": "7.50.0",
21+
"@sentry/replay": "7.50.0",
22+
"@sentry/types": "7.50.0",
23+
"@sentry/utils": "7.50.0",
2424
"tslib": "^1.9.3"
2525
},
2626
"devDependencies": {
27-
"@sentry-internal/integration-shims": "7.49.0",
27+
"@sentry-internal/integration-shims": "7.50.0",
2828
"@types/md5": "2.1.33",
2929
"btoa": "^1.2.1",
3030
"chai": "^4.1.2",

‎packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"description": "Base implementation for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "7.49.0",
20-
"@sentry/utils": "7.49.0",
19+
"@sentry/types": "7.50.0",
20+
"@sentry/utils": "7.50.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"scripts": {

‎packages/core/src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const SDK_VERSION = '7.49.0';
1+
export const SDK_VERSION = '7.50.0';

‎packages/e2e-tests/lib/runTestApp.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ export async function buildAndTestApp(
1616

1717
const tmpFolder = path.join(__dirname, '..', 'tmp');
1818
await fs.promises.mkdir(tmpFolder, { recursive: true });
19-
const targetDir = await fs.promises.mkdtemp(path.join(tmpFolder, 'tmp-app-'));
19+
const targetDir = await fs.promises.mkdtemp(
20+
path.join(tmpFolder, `${recipeInstance.recipe.testApplicationName}-${Date.now()}-`),
21+
);
2022

2123
await fsExtra.copy(recipeDirname, targetDir);
2224

‎packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "7.49.0",
3+
"version": "7.50.0",
44
"license": "MIT",
55
"engines": {
66
"node": ">=10"

‎packages/e2e-tests/test-applications/create-next-app/playwright.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const config: PlaywrightTestConfig = {
6767

6868
/* Run your local dev server before starting the tests */
6969
webServer: {
70-
command: testEnv === 'development' ? `yarn next dev -p ${port}` : `yarn next start -p ${port}`,
70+
command: testEnv === 'development' ? `pnpm next dev -p ${port}` : `pnpm next start -p ${port}`,
7171
port,
7272
},
7373
};

‎packages/e2e-tests/test-applications/create-next-app/test-recipe.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"tests": [
66
{
77
"testName": "Playwright tests - Prod Mode",
8-
"testCommand": "yarn test:prod"
8+
"testCommand": "pnpm test:prod"
99
},
1010
{
1111
"testName": "Playwright tests - Dev Mode",
12-
"testCommand": "yarn test:dev"
12+
"testCommand": "pnpm test:dev"
1313
}
1414
]
1515
}

0 commit comments

Comments
 (0)