Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 12 additions & 40 deletions .github/workflows/build.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -519,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -579,7 +579,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
Expand DownExpand Up@@ -779,33 +779,6 @@ jobs:
name: playwright-traces
path: dev-packages/browser-integration-tests/test-results

job_browser_build_tests:
name: Browser Build Tests
needs: [job_get_metadata, job_build]
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v4
with:
ref: ${{ env.HEAD_COMMIT }}
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Run browser build tests
run: |
cd packages/browser
yarn test:package
- name: Run utils build tests
run: |
cd packages/utils
yarn test:package

job_check_for_faulty_dts:
name: Check for faulty .d.ts files
needs: [job_get_metadata, job_build]
Expand DownExpand Up@@ -843,12 +816,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 22]
node: [14, 16, 18, 20, 22.4]
typescript:
- false
include:
# Only check typescript for latest version (to streamline CI)
- node: 22
- node: 22.4
typescript: '3.8'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
Expand DownExpand Up@@ -885,7 +858,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [18, 20, 22]
node: [18, 20, 22.4]
remix: [1, 2]
# Remix v2 only supports Node 18+, so run 16 tests separately
include:
Expand DownExpand Up@@ -1317,7 +1290,6 @@ jobs:
[
job_build,
job_compile_bindings_profiling_node,
job_browser_build_tests,
job_browser_unit_tests,
job_bun_unit_tests,
job_deno_unit_tests,
Expand DownExpand Up@@ -1409,7 +1381,7 @@ jobs:
- os: ubuntu-20.04
node: 20
- os: ubuntu-20.04
node: 22
node: 22.4

# x64 musl
- os: ubuntu-20.04
Expand All@@ -1423,7 +1395,7 @@ jobs:
node: 20
- os: ubuntu-20.04
container: node:22-alpine3.18
node: 22
node: 22.4

# arm64 glibc
- os: ubuntu-20.04
Expand All@@ -1437,7 +1409,7 @@ jobs:
node: 20
- os: ubuntu-20.04
arch: arm64
node: 22
node: 22.4

# arm64 musl
- os: ubuntu-20.04
Expand All@@ -1455,7 +1427,7 @@ jobs:
- os: ubuntu-20.04
arch: arm64
container: node:22-alpine3.18
node: 22
node: 22.4

# macos x64
- os: macos-13
Expand All@@ -1468,7 +1440,7 @@ jobs:
node: 20
arch: x64
- os: macos-13
node: 22
node: 22.4
arch: x64

# macos arm64
Expand All@@ -1486,7 +1458,7 @@ jobs:
target_platform: darwin
- os: macos-13
arch: arm64
node: 22
node: 22.4
target_platform: darwin

# windows x64
Expand All@@ -1500,7 +1472,7 @@ jobs:
node: 20
arch: x64
- os: windows-2022
node: 22
node: 22.4
arch: x64

steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,9 @@
- fix(angular): Remove `afterSendEvent` listener once root injector is destroyed (#12786)
- fix(browser): Fix bug causing unintentional dropping of transactions (#12933)
- fix(feedback): Add a missing call of Actor.appendToDom method when DOMContentLoaded event is triggered (#12973)
- feat(vercel-edge): Add dedupe as default integration (#12957)
- fix(node): Pass inferred name & attributes to `tracesSampler` (#12945)
- feat(express): Allow to pass options to `setupExpressErrorHandler` (#12952)

Work in this release was contributed by @jaspreet57 and @arturovt. Thank you for your contribution!

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,7 @@ package. Please refer to the README and instructions of those SDKs for more deta
- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): Browser SDK for Vue
- [`@sentry/solid`](https://github.com/getsentry/sentry-javascript/tree/master/packages/solid): Browser SDK for Solid
- [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
- [`@sentry/nestjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs): SDK for NestJS
- [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
- [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
/* eslint-disable no-console */
const Sentry = require('../../build/npm/cjs/index.js');

// Init
Sentry.init({
dsn: 'https://completelyrandom@dsn.asdf/42',
beforeSend(_event) {
console.log('Got an event');
return null;
},
beforeBreadcrumb(crumb) {
console.log(`Got a breadcrumb: ${crumb.category}`);
return crumb;
},
});

// Configure
const scope = Sentry.getCurrentScope();
scope.setExtra('foo', 'bar');
scope.setFingerprint('foo');
Expand DownExpand Up@@ -75,6 +58,5 @@ Sentry.withScope(scope => {

var xhr = new XMLHttpRequest();
xhr.onload = () => console.log('loaded'); // This throws error
// xhr.addEventListener("load", () => console.log('loaded')); This does not throw error
xhr.open('GET', 'https://httpbin.org/get');
xhr.send();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import * as fs from 'node:fs';
import * as path from 'node:path';

import { expect } from '@playwright/test';

import { sentryTest } from '../../../../utils/fixtures';

// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
sentryTest('should not contain tslib_1__default', async ({ getLocalTestPath }) => {
await getLocalTestPath({ testDir: __dirname });

const initBundle = fs.readFileSync(path.join(__dirname, 'dist', 'init.bundle.js'), 'utf-8');
expect(initBundle.length).toBeGreaterThan(0);
expect(initBundle).not.toContain('tslib_1__default');

const subjectBundle = fs.readFileSync(path.join(__dirname, 'dist', 'subject.bundle.js'), 'utf-8');
expect(subjectBundle.length).toBeGreaterThan(0);
expect(subjectBundle).not.toContain('tslib_1__default');
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
transport: loggingTransport,
tracesSampler: samplingContext => {
// The name we get here is inferred at span creation time
// At this point, we sadly do not have a http.route attribute yet,
// so we infer the name from the unparametrized route instead
return (
samplingContext.name === 'GET /test/123' &&
samplingContext.attributes['sentry.op'] === 'http.server' &&
samplingContext.attributes['http.method'] === 'GET'
);
},
debug: true,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');

const app = express();

app.use(cors());

app.get('/test/:id', (_req, res) => {
res.send('Success');
});

app.get('/test2', (_req, res) => {
res.send('Success');
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracesSampler', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
test('correctly samples & passes data to tracesSampler', done => {
const runner = createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/:id',
},
})
.start(done);

// This is not sampled
runner.makeRequest('get', '/test2?q=1');
// This is sampled
runner.makeRequest('get', '/test/123?q=1');
});
});
});
9 changes: 9 additions & 0 deletions docs/changelog/v7.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,15 @@
Support for Sentry SDK v7 will be dropped soon. We recommend migrating to the latest version of the SDK. You can migrate
from `v7` to `v8 of the SDK by following the [migration guide](../../MIGRATION.md).

## 7.118.0

- fix(v7/bundle): Ensure CDN bundles do not overwrite `window.Sentry` (#12579)

## 7.117.0

- feat(browser/v7): Publish browserprofling CDN bundle (#12224)
- fix(v7/publish): Add `v7` tag to `@sentry/replay` (#12304)

## 7.116.0

- build(craft): Publish lambda layer under its own name for v7 (#12098) (#12099)
Expand Down
6 changes: 1 addition & 5 deletions packages/astro/vite.config.ts
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
import type { UserConfig } from 'vitest';

import baseConfig from '../../vite/vite.config';

export default {
...baseConfig,
test: {
// test exists, no idea why TS doesn't recognize it
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...(baseConfig as UserConfig & { test: any }).test,
...baseConfig.test,
environment: 'jsdom',
},
};
4 changes: 1 addition & 3 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,7 @@
},
"devDependencies": {
"@sentry-internal/integration-shims": "8.18.0",
"fake-indexeddb": "^4.0.1",
"webpack": "^4.47.0"
"fake-indexeddb": "^4.0.1"
},
"scripts": {
"build": "run-p build:transpile build:bundle build:types",
Expand All@@ -73,7 +72,6 @@
"size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
"test": "yarn test:unit",
"test:unit": "jest",
"test:package": "node test/package/npm-build.js && rm test/package/tmp.js",
"test:unit:watch": "jest --watch",
"yalc:publish": "yalc publish --push --sig"
},
Expand Down
69 changes: 0 additions & 69 deletions packages/browser/test/package/npm-build.js

This file was deleted.

Loading