Skip to content

[Gitflow] Merge develop into master #7111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0ea7a86
feat(nextjs): Add auto-wrapping for server components (#6953)
Feb 2, 2023
82bdbf6
Merge pull request #7042 from getsentry/master
github-actions[bot] Feb 2, 2023
9a22389
chore(wasm): Upgrade puppeteer to v18 (#7048)
billyvg Feb 3, 2023
9a6960b
test(integration-tests): Don't retry integration tests (#7050)
Feb 6, 2023
17db8e2
fix(node): `LocalVariables`, Improve frame matching for ESM (#7049)
timfish Feb 6, 2023
42d4d4b
fix(node): Add lru cache to http integration span map (#7064)
AbhiPrasad Feb 7, 2023
a09eeab
test(replay): Add Integration tests + setup for custom events (#7052)
Lms24 Feb 8, 2023
f26ebcc
test(integration-tests): Unflake some tests (#7076)
Feb 8, 2023
026072e
feat: Add source map debug ids (#7068)
Feb 8, 2023
b1e5c9b
test(core): Try and improve flakey offline test (#7084)
timfish Feb 8, 2023
2c4366c
feat(replay): Improve rrweb error ignoring (#7087)
mydea Feb 8, 2023
8ef71d1
build: Generate errors + replay only CDN bundle (#7067)
AbhiPrasad Feb 8, 2023
2a09fd6
chore: lerna optimizations (#7057)
JamesHenry Feb 8, 2023
f4564cc
test(replay): Test compressed recording payloads (#7082)
Lms24 Feb 8, 2023
ea5b1df
chore(repo): Add CDN bundle and loader entries to bug report package …
Lms24 Feb 8, 2023
6462b00
chore: metrics collection job should also run on master (#6882)
vaind Feb 8, 2023
b539b36
feat(browser): Add IndexedDb offline transport store (#6983)
timfish Feb 8, 2023
45638e4
ci: Fix yaml (#7038)
mydea Feb 8, 2023
5c937aa
fix(replay): Update worker.js to remove console log (#7098)
Lms24 Feb 8, 2023
11e6f09
chore(replay): Link to Docs for CDN bundle installation (#7101)
Lms24 Feb 9, 2023
fcf17a8
ci: fix yaml (again) (#7107)
mydea Feb 9, 2023
9fb6d0d
feat(replay): Improve ignoring of rrweb-internal errors (#7094)
mydea Feb 9, 2023
58bb657
feat(replay): Send client_report when replay sending fails (#7093)
mydea Feb 9, 2023
c62191e
meta(changelog): Update CHANGELOG for 7.37.0 (#7110)
mydea Feb 9, 2023
bc942ae
test(core): Try again to fix offline test flake (#7092)
timfish Feb 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ body:
- type: dropdown
id: package
attributes:
label: Which package are you using?
label:
Which SDK are you using? If you use the CDN bundles, please specify the exact bundle (e.g.
`bundle.tracing.min.js`) in your SDK setup.
options:
- '@sentry/angular'
- '@sentry/browser'
Expand All @@ -40,6 +42,8 @@ body:
- '@sentry/svelte'
- '@sentry/vue'
- '@sentry/wasm'
- Sentry Browser CDN bundle
- Sentry Browser Loader
validations:
required: true
- type: input
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,14 @@ jobs:
id: compute_lockfile_hash
run: echo "hash=${{ hashFiles('yarn.lock') }}" >> "$GITHUB_OUTPUT"

# When the `ci-skip-cache` label is added to a PR, we always want to skip dependency cache
- name: Check dependency cache
uses: actions/cache@v3
id: cache_dependencies
if: needs.job_get_metadata.outputs.force_skip_cache == 'false'
with:
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
key: ${{ steps.compute_lockfile_hash.outputs.hash }}

- name: Install dependencies
if:
steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
run: yarn install --ignore-engines --frozen-lockfile
outputs:
dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
Expand Down Expand Up @@ -802,7 +798,9 @@ jobs:
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 30
if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements')
if: |
contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') ||
needs.job_get_metadata.outputs.is_develop == 'true'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v3
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/clear-cache.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Clear all GHA caches
on:
workflow_dispatch:

jobs:
clear-caches:
name: Delete all caches
runs-on: ubuntu-20.04
steps:
- name: Clear caches
uses: easimon/wipe-cache@v2
10 changes: 5 additions & 5 deletions .github/workflows/gitflow-sync-master.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Gitflow - Sync develop into master
on:
push:
pull_request:
- types: [closed]
- branches:
- 'develop'
pull_request:
types:
- closed
branches:
- develop

env:
MAIN_BRANCH: master
Expand Down
6 changes: 6 additions & 0 deletions .size-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,10 @@ module.exports = [
gzip: true,
limit: '80 KB',
},
{
name: '@sentry/browser + @sentry/replay - ES6 CDN Bundle (gzipped + minified)',
path: 'packages/browser/build/bundles/bundle.replay.min.js',
gzip: true,
limit: '80 KB',
},
];
4 changes: 1 addition & 3 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
workspaces-experimental true
env:
NODE_OPTIONS --stack-trace-limit=10000
env: NODE_OPTIONS --stack-trace-limit=10000
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@

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

## 7.37.0

- feat: Add source map debug ids (#7068)
- feat(browser): Add IndexedDb offline transport store (#6983)
- feat(nextjs): Add auto-wrapping for server components (#6953)
- feat(replay): Improve rrweb error ignoring (#7087 & #7094)
- feat(replay): Send client_report when replay sending fails (#7093)
- fix(node): `LocalVariables`, Improve frame matching for ESM (#7049)
- fix(node): Add lru cache to http integration span map (#7064)

Work in this release contributed by @JamesHenry. Thank you for your contribution!

## 7.36.0

This Release re-introduces the accidentally removed but still deprecated `maskInputOptions` option for Session Replay.
Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ To run the test suite and our code linter, node.js and yarn are required.
[`node` download](https://nodejs.org/download)
[`yarn` download](https://yarnpkg.com/en/docs/install)

`sentry-javascript` is a monorepo containing several packages, and we use `lerna` to manage them. To get started, install all dependencies, use `lerna` to bootstrap the workspace, and then perform an initial build, so TypeScript can read all of the linked type definitions.
`sentry-javascript` is a monorepo containing several packages, and we use `lerna` to manage them. To get started, install all dependencies, and then perform an initial build, so TypeScript can read all of the linked type definitions.

```
$ yarn
$ yarn lerna bootstrap
$ yarn build
```

Expand Down
3 changes: 0 additions & 3 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "7.36.0",
"packages": [
"packages/*"
],
"npmClient": "yarn",
"useWorkspaces": true
}
38 changes: 14 additions & 24 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,44 @@
"cacheableOperations": [
"build:bundle",
"build:transpile",
"build:types"
"build:types",
"lint:eslint"
]
}
}
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [
"{workspaceRoot}/*.js",
"{workspaceRoot}/*.json",
"{workspaceRoot}/yarn.lock"
"{workspaceRoot}/*.json"
],
"default": [
"{projectRoot}/**/*",
"sharedGlobals",
"production": [
"default",
"!{projectRoot}/test/**/*",
"!{projectRoot}/**/*.md"
]
},
"targetDefaults": {
"build:bundle": {
"inputs": ["production", "^production"],
"dependsOn": [
"^build:transpile",
"build:transpile"
],
"outputs": [
"{projectRoot}/build/bundles"
]
},
"build:tarball": {
"inputs": ["production", "^production"],
"dependsOn": [
"^build:transpile",
"build:transpile",
"^build:types",
"build:types"
],
"outputs": []
},
"build:transpile": {
"inputs": ["production", "^production"],
"dependsOn": [
"^build:transpile:uncached",
"^build:transpile",
Expand All @@ -56,28 +56,18 @@
]
},
"build:types": {
"inputs": ["production", "^production"],
"dependsOn": [
"^build:types"
],
"outputs": [
"{projectRoot}/build/types",
"{projectRoot}/build/npm/types"
]
}
},
"targets": {
"@sentry/serverless": {
"build:bundle": {
"dependsOn": [
"^build:transpile",
"build:transpile",
"^build:types",
"build:types"
],
"outputs": [
"{projectRoot}/build/aws"
]
}
},
"lint:eslint": {
"inputs": ["default"],
"outputs": []
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"scripts": {
"build": "node ./scripts/verify-packages-versions.js && run-s build:types build:transpile build:bundle",
"build:bundle": "lerna run build:bundle",
"build:dev": "run-s build:types build:transpile",
"build:dev": "lerna run build:types,build:transpile",
"build:dev:filter": "lerna run build:dev --include-filtered-dependencies --include-filtered-dependents --scope",
"build:transpile": "lerna run build:transpile",
"build:types": "lerna run build:types",
Expand Down Expand Up @@ -85,7 +85,7 @@
"jsdom": "^19.0.0",
"karma-browserstack-launcher": "^1.5.1",
"karma-firefox-launcher": "^1.1.0",
"lerna": "^6.0.3",
"lerna": "6.5.0-alpha.2",
"madge": "4.0.2",
"magic-string": "^0.27.0",
"mocha": "^6.1.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"fix:eslint": "eslint . --format stylish --fix",
"fix:prettier": "prettier --write \"{src,test,scripts}/**/**.ts\"",
"lint": "run-s lint:prettier lint:eslint",
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
"lint:eslint": "eslint . --format stylish",
"lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
"test": "yarn test:unit",
"test:unit": "jest",
Expand Down
3 changes: 2 additions & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"btoa": "^1.2.1",
"chai": "^4.1.2",
"chokidar": "^3.0.2",
"fake-indexeddb": "^4.0.1",
"karma": "^6.3.16",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.2.0",
Expand Down Expand Up @@ -61,7 +62,7 @@
"fix:eslint": "eslint . --format stylish --fix",
"fix:prettier": "prettier --write \"{src,test,scripts}/**/**.ts\"",
"lint": "run-s lint:prettier lint:eslint",
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
"lint:eslint": "eslint . --format stylish",
"lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
"size:check": "run-p size:check:es5 size:check:es6",
"size:check:es5": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES5: \",$1,\"kB\";}'",
Expand Down
12 changes: 12 additions & 0 deletions packages/browser/rollup.bundle.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@ const builds = [];
builds.push(...makeBundleConfigVariants(baseBundleConfig));
});

// Full bundle incl. replay only available for es6
const replayBaseBundleConfig = makeBaseBundleConfig({
bundleType: 'standalone',
entrypoints: ['src/index.ts'],
jsVersion: 'es6',
licenseTitle: '@sentry/browser & @sentry/replay',
outputFileBase: () => 'bundles/bundle.replay',
includeReplay: true,
});

builds.push(...makeBundleConfigVariants(replayBaseBundleConfig));

export default builds;
14 changes: 9 additions & 5 deletions packages/browser/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ const INTEGRATIONS = {
export { INTEGRATIONS as Integrations };

// DO NOT DELETE THESE COMMENTS!
// We want to exclude Replay from CDN bundles, so we remove the block below with our
// excludeReplay Rollup plugin when generating bundles. Everything between
// ROLLUP_EXCLUDE_FROM_BUNDLES_BEGIN and _END__ is removed for bundles.
// We want to exclude Replay/Offline from CDN bundles, so we remove the block below with our
// makeExcludeBlockPlugin Rollup plugin when generating bundles. Everything between
// ROLLUP_EXCLUDE_*_FROM_BUNDLES_BEGIN and _END__ is removed for bundles.

// __ROLLUP_EXCLUDE_FROM_BUNDLES_BEGIN__
// __ROLLUP_EXCLUDE_REPLAY_FROM_BUNDLES_BEGIN__
export { Replay } from '@sentry/replay';
// __ROLLUP_EXCLUDE_FROM_BUNDLES_END__
// __ROLLUP_EXCLUDE_REPLAY_FROM_BUNDLES_END__

// __ROLLUP_EXCLUDE_OFFLINE_FROM_BUNDLES_BEGIN__
export { makeBrowserOfflineTransport } from './transports/offline';
// __ROLLUP_EXCLUDE_OFFLINE_FROM_BUNDLES_END__
Loading