From 986d031b93db771ec2efe5635f816941d9206821 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Thu, 20 Feb 2025 19:34:07 +0100 Subject: [PATCH 1/2] chore(CI): Remove Biome --- .github/workflows/build.yml | 4 +- .vscode/extensions.json | 1 - .vscode/settings.json | 4 +- biome.json | 103 -------------------------- package.json | 8 +- packages/replay-internal/package.json | 8 +- yarn.lock | 92 +++++++++-------------- 7 files changed, 44 insertions(+), 176 deletions(-) delete mode 100644 biome.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aae090f76188..52c769d8d3d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -263,8 +263,6 @@ jobs: dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }} - name: Lint source files run: yarn lint:lerna - - name: Lint C++ files - run: yarn lint:clang - name: Lint for ES compatibility run: yarn lint:es-compatibility @@ -289,7 +287,7 @@ jobs: id: install_dependencies - name: Check file formatting - run: yarn lint:prettier && yarn lint:biome + run: yarn lint:prettier job_circular_dep_check: name: Circular Dependency Check diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 9b4a2aa7eb87..3ad96b1733d5 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,7 +3,6 @@ // for the documentation about the extensions.json format "recommendations": [ "esbenp.prettier-vscode", - "biomejs.biome", "dbaeumer.vscode-eslint", "augustocdias.tasks-shell-input", "denoland.vscode-deno" diff --git a/.vscode/settings.json b/.vscode/settings.json index 0f2399922cfc..c3515b80ced8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,8 +25,8 @@ } ], "deno.enablePaths": ["packages/deno/test"], - "editor.defaultFormatter": "biomejs.biome", + "editor.defaultFormatter": "esbenp.prettier-vscode", "[typescript]": { - "editor.defaultFormatter": "biomejs.biome" + "editor.defaultFormatter": "esbenp.prettier-vscode" } } diff --git a/biome.json b/biome.json deleted file mode 100644 index 010139fbaa82..000000000000 --- a/biome.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "$schema": "./node_modules/@biomejs/biome/configuration_schema.json", - "vcs": { - "enabled": true, - "clientKind": "git", - "useIgnoreFile": true, - "defaultBranch": "develop" - }, - "organizeImports": { - "enabled": true - }, - "linter": { - "enabled": true, - "rules": { - "recommended": false, - "correctness": { - "all": false, - "noUnusedVariables": "error", - "noPrecisionLoss": "error" - }, - "complexity": { - "useRegexLiterals": "error" - }, - "suspicious": { - "all": false, - "noControlCharactersInRegex": "error" - }, - "nursery": { - "noUnusedImports": "error" - }, - "performance": { - "all": true, - "noAccumulatingSpread": "error", - "noDelete": "off" - } - }, - "ignore": [ - ".vscode", - "**/*.json", - "**/fixtures/*/*.json", - "**/*.min.js", - ".next", - ".nuxt", - ".svelte-kit", - ".angular", - "angular.json", - "ember/instance-initializers", - "ember/types.d.ts", - "solidstart/*.d.ts", - "solidstart/client/", - "solidstart/server/", - ".output", - ".vinxi" - ] - }, - "files": { - "ignoreUnknown": true - }, - "formatter": { - "enabled": true, - "formatWithErrors": true, - "indentStyle": "space", - "indentWidth": 2, - "lineWidth": 120, - "ignore": [ - "dev-packages/browser-integration-tests/fixtures/loader.js", - "dev-packages/browser-integration-tests/suites/**/*.json", - "dev-packages/browser-integration-tests/loader-suites/**/*.js", - "dev-packages/browser-integration-tests/suites/stacktraces/**/*.js", - ".next/**/*", - "**/fixtures/*/*.json", - "**/*.min.js", - ".next/**", - ".svelte-kit/**", - ".angular/**", - "angular.json", - "**/profiling-node/lib/**", - "ember/instance-initializers/**", - "ember/types.d.ts" - ] - }, - "javascript": { - "formatter": { - "enabled": true, - "quoteStyle": "single", - "arrowParentheses": "asNeeded", - "trailingComma": "all", - "lineEnding": "lf" - }, - "parser": { - "unsafeParameterDecoratorsEnabled": true - } - }, - "json": { - "formatter": { - "enabled": true - }, - "parser": { - "allowComments": true, - "allowTrailingCommas": true - } - } -} diff --git a/package.json b/package.json index 1f63d4c57dda..51c3e524e3d2 100644 --- a/package.json +++ b/package.json @@ -20,16 +20,13 @@ "clean:tarballs": "rimraf {packages,dev-packages}/*/*.tgz", "clean:watchman": "watchman watch-del \".\"", "clean:all": "run-s clean:build clean:tarballs clean:caches clean:deps clean:watchman", - "fix": "run-s fix:biome fix:prettier fix:lerna", + "fix": "run-s fix:prettier fix:lerna", "fix:lerna": "lerna run fix", - "fix:biome": "biome check --apply .", "fix:prettier": "prettier \"**/*.md\" \"**/*.css\" --write", "changelog": "ts-node ./scripts/get-commit-list.ts", "link:yarn": "lerna exec yarn link", - "lint": "run-s lint:lerna lint:biome lint:prettier", - "lint:clang": "lerna run lint:clang", + "lint": "run-s lint:lerna lint:prettier", "lint:lerna": "lerna run lint", - "lint:biome": "biome check .", "lint:prettier": "prettier \"**/*.md\" \"**/*.css\" --check", "lint:es-compatibility": "es-check es2020 ./packages/*/build/{bundles,npm/cjs,cjs}/*.js && es-check es2020 ./packages/*/build/{npm/esm,esm}/*.js --module", "postpublish": "lerna run --stream --concurrency 1 postpublish", @@ -98,7 +95,6 @@ "dev-packages/rollup-utils" ], "devDependencies": { - "@biomejs/biome": "^1.5.2", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-esm-shim": "^0.1.5", "@rollup/plugin-json": "^6.1.0", diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json index e6a40b580d34..21f1a99cc601 100644 --- a/packages/replay-internal/package.json +++ b/packages/replay-internal/package.json @@ -48,10 +48,12 @@ "build:tarball": "npm pack", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf build sentry-replay-*.tgz", - "fix": "run-s fix:biome fix:eslint", + "fix": "run-s fix:prettier fix:eslint", "fix:eslint": "eslint . --format stylish --fix", - "fix:biome": "biome check --apply .", - "lint": "eslint . --format stylish", + "fix:prettier": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", + "lint": "run-s lint:prettier lint:eslint", + "lint:eslint": "eslint . --format stylish", + "lint:prettier": "prettier --check \"src/**/*.ts\" \"test/**/*.ts\"", "test": "vitest run", "test:watch": "vitest --watch", "yalc:publish": "yalc publish --push --sig" diff --git a/yarn.lock b/yarn.lock index 0c7b60c816e1..098d1731bf52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2656,60 +2656,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@biomejs/biome@^1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/biome/-/biome-1.5.2.tgz#fdc194125a904ec69a87cb48b03141b6c070df66" - integrity sha512-LhycxGQBQLmfv6M3e4tMfn/XKcUWyduDYOlCEBrHXJ2mMth2qzYt1JWypkWp+XmU/7Hl2dKvrP4mZ5W44+nWZw== - optionalDependencies: - "@biomejs/cli-darwin-arm64" "1.5.2" - "@biomejs/cli-darwin-x64" "1.5.2" - "@biomejs/cli-linux-arm64" "1.5.2" - "@biomejs/cli-linux-arm64-musl" "1.5.2" - "@biomejs/cli-linux-x64" "1.5.2" - "@biomejs/cli-linux-x64-musl" "1.5.2" - "@biomejs/cli-win32-arm64" "1.5.2" - "@biomejs/cli-win32-x64" "1.5.2" - -"@biomejs/cli-darwin-arm64@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.5.2.tgz#fc744f6ac454ce18b1b36d306c77b2bdb216d6ae" - integrity sha512-3JVl08aHKsPyf0XL9SEj1lssIMmzOMAn2t1zwZKBiy/mcZdb0vuyMSTM5haMQ/90wEmrkYN7zux777PHEGrGiw== - -"@biomejs/cli-darwin-x64@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.5.2.tgz#2439a338166b9acb6d56939bd9e8e6331ee43dcb" - integrity sha512-QAPW9rZb/AgucUx+ogMg+9eJNipQDqvabktC5Tx4Aqb/mFzS6eDqNP7O0SbGz3DtC5Y2LATEj6o6zKIQ4ZT+3w== - -"@biomejs/cli-linux-arm64-musl@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.2.tgz#fe5cafb9ff34ebfed7a5abe28a71cfbddd4de70f" - integrity sha512-Z29SjaOyO4QfajplNXSjLx17S79oPN42D094zjE24z7C7p3NxvLhKLygtSP9emgaXkcoESe2chOzF4IrGy/rlg== - -"@biomejs/cli-linux-arm64@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.5.2.tgz#2fd9305441d9df0aca5dfa9e56004d951aea0ec9" - integrity sha512-fVLrUgIlo05rO4cNu+Py5EwwmXnXhWH+8KrNlWkr2weMYjq85SihUsuWWKpmqU+bUVR+m5gwfcIXZVWYVCJMHw== - -"@biomejs/cli-linux-x64-musl@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.2.tgz#80cc7eb91ea10aca0a17e6296fa468b0b3332793" - integrity sha512-ZolquPEjWYUmGeERS8svHOOT7OXEeoriPnV8qptgWJmYF9EO9HUGRn1UtCvdVziDYK+u1A7PxjOdkY1B00ty5A== - -"@biomejs/cli-linux-x64@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-linux-x64/-/cli-linux-x64-1.5.2.tgz#9247165d0514a6f0fa17f9c8cd49c7d9769a9641" - integrity sha512-ixqJtUHtF0ho1+1DTZQLAEwHGSqvmvHhAAFXZQoaSdABn+IcITYExlFVA3bGvASy/xtPjRhTx42hVwPtLwMHwg== - -"@biomejs/cli-win32-arm64@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.5.2.tgz#86d709f835547537f87fd07c35b6ef3b97dca54f" - integrity sha512-DN4cXSAoFTdjOoh7f+JITj1uQgQSXt+1pVea9bFrpbgip+ZwkONqQq+jUcmFMMehbp9LuiVtNXFz/ReHn6FY7A== - -"@biomejs/cli-win32-x64@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@biomejs/cli-win32-x64/-/cli-win32-x64-1.5.2.tgz#607f0e4c01c22e573785bd69be2d7be3415838f8" - integrity sha512-YvWWXZmk936FdrXqc2jcP6rfsXsNBIs9MKBQQoVXIihwNNRiAaBD9Iwa/ouU1b7Zxq2zETgeuRewVJickFuVOw== - "@cloudflare/kv-asset-handler@0.3.4", "@cloudflare/kv-asset-handler@^0.3.4": version "0.3.4" resolved "https://registry.yarnpkg.com/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.4.tgz#5cc152847c8ae4d280ec5d7f4f6ba8c976b585c3" @@ -7930,7 +7876,12 @@ dependencies: "@types/unist" "*" -"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8": +"@types/history-4@npm:@types/history@4.7.8": + version "4.7.8" + resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934" + integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA== + +"@types/history-5@npm:@types/history@4.7.8": version "4.7.8" resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934" integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA== @@ -27465,7 +27416,16 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -27568,7 +27528,14 @@ stringify-object@^3.2.1: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -30368,7 +30335,16 @@ wrangler@^3.67.1: optionalDependencies: fsevents "~2.3.2" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@7.0.0, wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== From 4b2249f6639a8a551b82c10f224c6387be82008c Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Thu, 20 Feb 2025 20:50:03 +0100 Subject: [PATCH 2/2] Re-enable prettier for all of `./packages/**` --- .prettierignore | 2 ++ .prettierrc.json | 7 ++++++ package.json | 6 ++--- packages/browser/src/exports.ts | 8 +------ packages/browser/src/index.ts | 5 +--- packages/core/src/index.ts | 11 ++------- .../src/tracing/dynamicSamplingContext.ts | 4 +--- packages/core/src/tracing/index.ts | 5 +--- packages/core/src/types-hoist/index.ts | 11 ++------- packages/core/src/utils-hoist/index.ts | 24 ++++--------------- packages/core/src/utils/request.ts | 6 ++++- packages/core/test/lib/utils/meta.test.ts | 3 ++- packages/deno/src/index.ts | 5 +--- .../wrapPageComponentWithSentry.ts | 4 +--- .../http/SentryHttpInstrumentation.ts | 6 ++++- packages/opentelemetry/src/custom/client.ts | 8 ++----- packages/opentelemetry/src/index.ts | 10 ++------ packages/remix/src/index.server.ts | 5 +--- packages/remix/src/utils/vendor/types.ts | 13 ++-------- .../integration/test/client/utils/helpers.ts | 11 +++++---- packages/sveltekit/src/server/handle.ts | 6 ++--- packages/vercel-edge/src/index.ts | 5 +--- 22 files changed, 56 insertions(+), 109 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000000..cb7b3db12641 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +packages/browser/test/loader.js +packages/replay-worker/examples/worker.min.js diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 000000000000..ba9a3dc2c246 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,7 @@ +{ + "arrowParens": "avoid", + "printWidth": 120, + "proseWrap": "always", + "singleQuote": true, + "trailingComma": "all" +} diff --git a/package.json b/package.json index 51c3e524e3d2..2d1a90e84ac9 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ "clean:all": "run-s clean:build clean:tarballs clean:caches clean:deps clean:watchman", "fix": "run-s fix:prettier fix:lerna", "fix:lerna": "lerna run fix", - "fix:prettier": "prettier \"**/*.md\" \"**/*.css\" --write", + "fix:prettier": "prettier \"**/*.md\" \"**/*.css\" \"packages/**/**.{ts,js}\" --write", "changelog": "ts-node ./scripts/get-commit-list.ts", "link:yarn": "lerna exec yarn link", - "lint": "run-s lint:lerna lint:prettier", + "lint": "run-s lint:prettier lint:lerna", "lint:lerna": "lerna run lint", - "lint:prettier": "prettier \"**/*.md\" \"**/*.css\" --check", + "lint:prettier": "prettier \"**/*.md\" \"**/*.css\" \"packages/**/**.{ts,js}\" --check", "lint:es-compatibility": "es-check es2020 ./packages/*/build/{bundles,npm/cjs,cjs}/*.js && es-check es2020 ./packages/*/build/{npm/esm,esm}/*.js --module", "postpublish": "lerna run --stream --concurrency 1 postpublish", "test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test", diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts index ae2ff9c3fa87..ae7adf8bd383 100644 --- a/packages/browser/src/exports.ts +++ b/packages/browser/src/exports.ts @@ -82,13 +82,7 @@ export { } from './stack-parsers'; export { eventFromException, eventFromMessage, exceptionFromError } from './eventbuilder'; export { createUserFeedbackEnvelope } from './userfeedback'; -export { - getDefaultIntegrations, - forceLoad, - init, - onLoad, - showReportDialog, -} from './sdk'; +export { getDefaultIntegrations, forceLoad, init, onLoad, showReportDialog } from './sdk'; export { breadcrumbsIntegration } from './integrations/breadcrumbs'; export { globalHandlersIntegration } from './integrations/globalhandlers'; diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts index 63da52dfd30e..d034330b6283 100644 --- a/packages/browser/src/index.ts +++ b/packages/browser/src/index.ts @@ -62,10 +62,7 @@ export { makeBrowserOfflineTransport } from './transports/offline'; export { browserProfilingIntegration } from './profiling/integration'; export { spotlightBrowserIntegration } from './integrations/spotlight'; export { browserSessionIntegration } from './integrations/browsersession'; -export { - featureFlagsIntegration, - type FeatureFlagsIntegration, -} from './integrations/featureFlags'; +export { featureFlagsIntegration, type FeatureFlagsIntegration } from './integrations/featureFlags'; export { launchDarklyIntegration, buildLaunchDarklyFlagUsedHandler } from './integrations/featureFlags/launchdarkly'; export { openFeatureIntegration, OpenFeatureIntegrationHook } from './integrations/featureFlags/openfeature'; export { unleashIntegration } from './integrations/featureFlags/unleash'; diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index e0e9097bbc53..097a4ef6a69d 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -39,10 +39,7 @@ export { getClient, getTraceContextFromScope, } from './currentScopes'; -export { - getDefaultCurrentScope, - getDefaultIsolationScope, -} from './defaultScopes'; +export { getDefaultCurrentScope, getDefaultIsolationScope } from './defaultScopes'; export { setAsyncContextStrategy } from './asyncContext'; export { getGlobalSingleton, getMainCarrier } from './carrier'; export { makeSession, closeSession, updateSession } from './session'; @@ -60,11 +57,7 @@ export { initAndBind, setCurrentClient } from './sdk'; export { createTransport } from './transports/base'; export { makeOfflineTransport } from './transports/offline'; export { makeMultiplexedTransport } from './transports/multiplexed'; -export { - getIntegrationsToSetup, - addIntegration, - defineIntegration, -} from './integration'; +export { getIntegrationsToSetup, addIntegration, defineIntegration } from './integration'; export { applyScopeDataToEvent, mergeScopeData } from './utils/applyScopeDataToEvent'; export { prepareEvent } from './utils/prepareEvent'; export { createCheckInEnvelope } from './checkin'; diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts index f58f373447bb..02e3e3d76e0a 100644 --- a/packages/core/src/tracing/dynamicSamplingContext.ts +++ b/packages/core/src/tracing/dynamicSamplingContext.ts @@ -128,9 +128,7 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly { baggage: 'sentry-environment=production', }); - expect(getTraceMetaTags()).toBe(` + expect(getTraceMetaTags()) + .toBe(` `); }); diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts index d810b7429266..129f4f1a765e 100644 --- a/packages/deno/src/index.ts +++ b/packages/deno/src/index.ts @@ -85,10 +85,7 @@ export { export { DenoClient } from './client'; -export { - getDefaultIntegrations, - init, -} from './sdk'; +export { getDefaultIntegrations, init } from './sdk'; export { denoContextIntegration } from './integrations/context'; export { globalHandlersIntegration } from './integrations/globalhandlers'; diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts index 810df8005c48..b08bdad5e9ab 100644 --- a/packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts +++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts @@ -5,9 +5,7 @@ interface FunctionComponent { } interface ClassComponent { - new ( - ...args: unknown[] - ): { + new (...args: unknown[]): { props?: unknown; render(...args: unknown[]): unknown; }; diff --git a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts index d645ac5c9ec2..4a268eaf31d5 100644 --- a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts +++ b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts @@ -471,7 +471,11 @@ export function recordRequestSession({ requestIsolationScope, response, sessionFlushingDelayMS, -}: { requestIsolationScope: Scope; response: EventEmitter; sessionFlushingDelayMS?: number }): void { +}: { + requestIsolationScope: Scope; + response: EventEmitter; + sessionFlushingDelayMS?: number; +}): void { requestIsolationScope.setSDKProcessingMetadata({ requestSession: { status: 'ok' }, }); diff --git a/packages/opentelemetry/src/custom/client.ts b/packages/opentelemetry/src/custom/client.ts index ee9f21b5b5f5..70afb6f10752 100644 --- a/packages/opentelemetry/src/custom/client.ts +++ b/packages/opentelemetry/src/custom/client.ts @@ -18,12 +18,8 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ * const client = new OpenTelemetryClient(options); */ export function wrapClientClass< - ClassConstructor extends new ( - ...args: any[] - ) => Client, - WrappedClassConstructor extends new ( - ...args: any[] - ) => Client & OpenTelemetryClientInterface, + ClassConstructor extends new (...args: any[]) => Client, + WrappedClassConstructor extends new (...args: any[]) => Client & OpenTelemetryClientInterface, >(ClientClass: ClassConstructor): WrappedClassConstructor { // @ts-expect-error We just assume that this is non-abstract, if you pass in an abstract class this would make it non-abstract class OpenTelemetryClient extends ClientClass implements OpenTelemetryClientInterface { diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts index e3ae6536e11e..6958d1c9fbdd 100644 --- a/packages/opentelemetry/src/index.ts +++ b/packages/opentelemetry/src/index.ts @@ -41,15 +41,9 @@ export { setupEventContextTrace } from './setupEventContextTrace'; export { setOpenTelemetryContextAsyncContextStrategy } from './asyncContextStrategy'; export { wrapContextManagerClass } from './contextManager'; -export { - SentryPropagator, - shouldPropagateTraceForUrl, -} from './propagator'; +export { SentryPropagator, shouldPropagateTraceForUrl } from './propagator'; export { SentrySpanProcessor } from './spanProcessor'; -export { - SentrySampler, - wrapSamplingDecision, -} from './sampler'; +export { SentrySampler, wrapSamplingDecision } from './sampler'; export { openTelemetrySetupCheck } from './utils/setupCheck'; diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts index 9084284217a9..c39b9740531f 100644 --- a/packages/remix/src/index.server.ts +++ b/packages/remix/src/index.server.ts @@ -126,10 +126,7 @@ export { // Keeping the `*` exports for backwards compatibility and types export * from '@sentry/node'; -export { - sentryHandleError, - wrapHandleErrorWithSentry, -} from './utils/instrumentServer'; +export { sentryHandleError, wrapHandleErrorWithSentry } from './utils/instrumentServer'; export { captureRemixServerException } from './utils/errors'; diff --git a/packages/remix/src/utils/vendor/types.ts b/packages/remix/src/utils/vendor/types.ts index 19e30b1a78e1..062ae021ca02 100644 --- a/packages/remix/src/utils/vendor/types.ts +++ b/packages/remix/src/utils/vendor/types.ts @@ -108,12 +108,7 @@ export type DeferredData = { }; export interface MetaFunction { - (args: { - data: AppData; - parentsData: RouteData; - params: Params; - location: Location; - }): HtmlMetaDescriptor; + (args: { data: AppData; parentsData: RouteData; params: Params; location: Location }): HtmlMetaDescriptor; } export interface HtmlMetaDescriptor { @@ -148,11 +143,7 @@ export interface LoaderFunction { } export interface HeadersFunction { - (args: { - loaderHeaders: Headers; - parentHeaders: Headers; - actionHeaders: Headers; - }): Headers | HeadersInit; + (args: { loaderHeaders: Headers; parentHeaders: Headers; actionHeaders: Headers }): Headers | HeadersInit; } export interface ServerRouteModule extends EntryRouteModule { diff --git a/packages/remix/test/integration/test/client/utils/helpers.ts b/packages/remix/test/integration/test/client/utils/helpers.ts index 56e31cc331c8..97007673703b 100644 --- a/packages/remix/test/integration/test/client/utils/helpers.ts +++ b/packages/remix/test/integration/test/client/utils/helpers.ts @@ -137,10 +137,13 @@ export const countEnvelopes = async ( page.on('request', requestHandler); - setTimeout(() => { - page.off('request', requestHandler); - resolve(reqCount); - }, options?.timeout || 1000); + setTimeout( + () => { + page.off('request', requestHandler); + resolve(reqCount); + }, + options?.timeout || 1000, + ); }); if (options?.url) { diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts index 84f29a2c70c5..a3e865886341 100644 --- a/packages/sveltekit/src/server/handle.ts +++ b/packages/sveltekit/src/server/handle.ts @@ -61,9 +61,9 @@ export const FETCH_PROXY_SCRIPT = ` * * Exported only for testing */ -export function addSentryCodeToPage(options: { injectFetchProxyScript: boolean }): NonNullable< - ResolveOptions['transformPageChunk'] -> { +export function addSentryCodeToPage(options: { + injectFetchProxyScript: boolean; +}): NonNullable { return ({ html }) => { const metaTags = getTraceMetaTags(); const headWithMetaTags = metaTags ? `\n${metaTags}` : ''; diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts index ab03497ea0c6..560f06e00e44 100644 --- a/packages/vercel-edge/src/index.ts +++ b/packages/vercel-edge/src/index.ts @@ -85,9 +85,6 @@ export { } from '@sentry/core'; export { VercelEdgeClient } from './client'; -export { - getDefaultIntegrations, - init, -} from './sdk'; +export { getDefaultIntegrations, init } from './sdk'; export { winterCGFetchIntegration } from './integrations/wintercg-fetch';