Skip to content

Commit e102775

Browse files
Merge branch 'v7' into egou/v7/fix/browser-tracing-latest-route
2 parents 38bd3f2 + 046422b commit e102775

File tree

67 files changed

+810
-266
lines changed

Some content is hidden

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

67 files changed

+810
-266
lines changed

.github/workflows/auto-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ jobs:
3636
version: ${{ steps.version.outputs.group1 }}
3737
force: false
3838
merge_target: master
39+
craft_config_from_merge_target: true

.github/workflows/enforce-license-compliance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Enforce License Compliance
22

33
on:
44
push:
5-
branches: [master, develop, release/*]
5+
branches: [master, develop, release/*, v7]
66
pull_request:
7-
branches: [master, develop]
7+
branches: [master, develop, v7]
88

99
jobs:
1010
enforce-license-compliance:

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
merge_target:
1212
description: Target branch to merge into. Uses the default branch as a fallback (optional)
1313
required: false
14-
default: master
14+
default: v7
1515
jobs:
1616
release:
1717
runs-on: ubuntu-20.04
@@ -29,3 +29,5 @@ jobs:
2929
version: ${{ github.event.inputs.version }}
3030
force: ${{ github.event.inputs.force }}
3131
merge_target: ${{ github.event.inputs.merge_target }}
32+
craft_config_from_merge_target: true
33+

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
## 7.102.0
8+
9+
- fix: Export session API (#10712)
10+
- fix(core): Fix scope capturing via `captureContext` function (#10737)
11+
712
## 7.101.1
813

914
In version 7.101.0 the `@sentry/hub` package was missing due to a publishing issue. This release contains the package

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -47,8 +47,8 @@
4747
"@babel/preset-typescript": "^7.16.7",
4848
"@playwright/test": "^1.40.1",
4949
"@sentry-internal/rrweb": "2.11.0",
50-
"@sentry/browser": "7.101.1",
51-
"@sentry/tracing": "7.101.1",
50+
"@sentry/browser": "7.102.0",
51+
"@sentry/tracing": "7.102.0",
5252
"axios": "1.6.0",
5353
"babel-loader": "^8.2.2",
5454
"html-webpack-plugin": "^5.5.0",

dev-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.101.1",
3+
"version": "7.102.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

dev-packages/node-integration-tests/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/node-integration-tests",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"license": "MIT",
55
"engines": {
66
"node": ">=10"
@@ -29,9 +29,9 @@
2929
"dependencies": {
3030
"@hapi/hapi": "^20.3.0",
3131
"@prisma/client": "3.15.2",
32-
"@sentry/node": "7.101.1",
33-
"@sentry/tracing": "7.101.1",
34-
"@sentry/types": "7.101.1",
32+
"@sentry/node": "7.102.0",
33+
"@sentry/tracing": "7.102.0",
34+
"@sentry/types": "7.102.0",
3535
"@types/mongodb": "^3.6.20",
3636
"@types/mysql": "^2.15.21",
3737
"@types/pg": "^8.6.5",

dev-packages/overhead-metrics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"name": "@sentry-internal/overhead-metrics",
55
"main": "index.js",
66
"author": "Sentry",

dev-packages/rollup-utils/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/rollup-utils",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "7.101.1",
3+
"version": "7.102.0",
44
"npmClient": "yarn"
55
}

0 commit comments

Comments
 (0)