Skip to content

feat(core): Hoist everything from @sentry/utils into @sentry/core #14382

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 20, 2024
Merged

feat(core): Hoist everything from @sentry/utils into @sentry/core #14382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5011919
pls just work
lforst Nov 20, 2024
af9dcf9
lint
lforst Nov 20, 2024
9ac7702
lint
lforst Nov 20, 2024
0b665e6
fix nuxt tests
lforst Nov 20, 2024
946f942
bump size-check
lforst Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .size-limit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '78.2 KB',
limit: '79 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/browser-integration-tests/utils/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { Page, Request } from '@playwright/test';
import { parseEnvelope } from '@sentry/core';
import type {
Envelope,
EnvelopeItem,
Expand All @@ -7,7 +8,6 @@ import type {
EventEnvelope,
EventEnvelopeHeaders,
} from '@sentry/types';
import { parseEnvelope } from '@sentry/utils';

export const envelopeUrlRegex = /\.sentry\.io\/api\/\d+\/envelope\//;

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app-express-legacy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "^2.7.2",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@types/compression": "^1.7.2",
"@types/express": "^4.17.17",
"@types/morgan": "^1.9.4",
Expand Down
2 changes: 1 addition & 1 deletion ...tests/test-applications/create-remix-app-express-legacy/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "^2.7.2",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@types/compression": "^1.7.5",
"@types/express": "^4.17.20",
"@types/morgan": "^1.9.9",
Expand Down
2 changes: 1 addition & 1 deletion ...sts/test-applications/create-remix-app-express-vite-dev/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "^2.7.2",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@types/compression": "^1.7.2",
"@types/express": "^4.17.17",
"@types/morgan": "^1.9.4",
Expand Down
2 changes: 1 addition & 1 deletion ...es/e2e-tests/test-applications/create-remix-app-express/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app-legacy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion ...ges/e2e-tests/test-applications/create-remix-app-legacy/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app-v2-legacy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@remix-run/dev": "2.7.2",
"@remix-run/eslint-config": "2.7.2",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"eslint": "^8.38.0",
Expand Down
2 changes: 1 addition & 1 deletion .../e2e-tests/test-applications/create-remix-app-v2-legacy/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@remix-run/dev": "2.7.2",
"@remix-run/eslint-config": "2.7.2",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"eslint": "^8.38.0",
Expand Down
2 changes: 1 addition & 1 deletion ...ackages/e2e-tests/test-applications/create-remix-app-v2/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-remix-app/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { uuid4 } from '@sentry/utils';
import { uuid4 } from '@sentry/core';

import { waitForTransaction } from '@sentry-internal/test-utils';

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/generic-ts3.8/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@sentry/node": "latest || *",
"@sentry-internal/replay": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@sentry/wasm": "latest || *"
}
}
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/nextjs-13/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"@sentry/opentelemetry": "latest || *",
"@sentry/react": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/vercel-edge": "latest || *"
},
"volta": {
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/nextjs-14/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"@sentry/react": "latest || *",
"@sentry-internal/replay": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/vercel-edge": "latest || *"
},
"volta": {
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/nextjs-15/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"@sentry/react": "latest || *",
"@sentry-internal/replay": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/vercel-edge": "latest || *"
},
"volta": {
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"@sentry/react": "latest || *",
"@sentry-internal/replay": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/vercel-edge": "latest || *",
"ts-node": "10.9.1"
},
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/nextjs-turbo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"@sentry/react": "latest || *",
"@sentry-internal/replay": "latest || *",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/vercel-edge": "latest || *",
"import-in-the-middle": "1.11.2"
},
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/node-connect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@sentry/node": "latest || *",
"@sentry/types": "latest || *",
"@sentry/core": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/opentelemetry": "latest || *",
"@types/node": "18.15.1",
"connect": "3.7.0",
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/node-fastify-5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@sentry/node": "latest || *",
"@sentry/types": "latest || *",
"@sentry/core": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/opentelemetry": "latest || *",
"@types/node": "22.7.5",
"fastify": "5.0.0",
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/node-fastify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@sentry/node": "latest || *",
"@sentry/types": "latest || *",
"@sentry/core": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/opentelemetry": "latest || *",
"@types/node": "18.15.1",
"fastify": "4.23.2",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/solid-solidrouter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"autoprefixer": "^10.4.17",
"postcss": "^8.4.33",
"solid-devtools": "^0.29.2",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/solid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"autoprefixer": "^10.4.17",
"postcss": "^8.4.33",
"solid-devtools": "^0.29.2",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/svelte-5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@sveltejs/vite-plugin-svelte": "^3.0.2",
"@tsconfig/svelte": "^5.0.2",
"svelte": "^5.0.0-next.115",
Expand Down
68 changes: 34 additions & 34 deletions dev-packages/e2e-tests/test-applications/sveltekit-2-svelte-5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{
"name": "sveltekit-2-svelte-5",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"proxy": "node start-event-proxy.mjs",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test:prod": "TEST_ENV=production playwright test",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:assert": "pnpm test:prod"
},
"dependencies": {
"@sentry/sveltekit": "latest || *",
"@spotlightjs/spotlight": "2.0.0-alpha.1"
},
"devDependencies": {
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"svelte": "^5.0.0-next.115",
"svelte-check": "^3.6.0",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.4.10"
},
"type": "module"
"name": "sveltekit-2-svelte-5",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"proxy": "node start-event-proxy.mjs",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test:prod": "TEST_ENV=production playwright test",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:assert": "pnpm test:prod"
},
"dependencies": {
"@sentry/sveltekit": "latest || *",
"@spotlightjs/spotlight": "2.0.0-alpha.1"
},
"devDependencies": {
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/core": "latest || *",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"svelte": "^5.0.0-next.115",
"svelte-check": "^3.6.0",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.4.10"
},
"type": "module"
}
66 changes: 33 additions & 33 deletions dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
{
"name": "sveltekit-2-svelte-5",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"proxy": "node start-event-proxy.mjs",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test:prod": "TEST_ENV=production playwright test",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:assert": "pnpm test:prod"
},
"dependencies": {
"@sentry/sveltekit": "latest || *"
},
"devDependencies": {
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"svelte": "^5.0.0-next.115",
"svelte-check": "^3.6.0",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.4.10"
},
"type": "module"
"name": "sveltekit-2-svelte-5",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"proxy": "node start-event-proxy.mjs",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test:prod": "TEST_ENV=production playwright test",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:assert": "pnpm test:prod"
},
"dependencies": {
"@sentry/sveltekit": "latest || *"
},
"devDependencies": {
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/core": "latest || *",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"svelte": "^5.0.0-next.115",
"svelte-check": "^3.6.0",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^5.4.10"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/sveltekit-2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@sveltejs/adapter-auto": "^3.0.0",
"@sveltejs/adapter-node": "^2.0.0",
"@sveltejs/kit": "^2.5.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"svelte": "^4.2.8",
"svelte-check": "^3.6.0",
"typescript": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/sveltekit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
"@sentry/core": "latest || *",
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-node": "^1.2.4",
"@sveltejs/kit": "1.20.5",
Expand Down
Loading
Loading