Skip to content

Commit 512f43c

Browse files
authored
chore(CI): Remove Biome in favour of prettier (#15461)
1 parent 6e9682a commit 512f43c

File tree

28 files changed

+65
-280
lines changed

28 files changed

+65
-280
lines changed

Diff for: .github/workflows/build.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@ jobs:
263263
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
264264
- name: Lint source files
265265
run: yarn lint:lerna
266-
- name: Lint C++ files
267-
run: yarn lint:clang
268266
- name: Lint for ES compatibility
269267
run: yarn lint:es-compatibility
270268

@@ -289,7 +287,7 @@ jobs:
289287
id: install_dependencies
290288

291289
- name: Check file formatting
292-
run: yarn lint:prettier && yarn lint:biome
290+
run: yarn lint:prettier
293291

294292
job_circular_dep_check:
295293
name: Circular Dependency Check

Diff for: .prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
packages/browser/test/loader.js
2+
packages/replay-worker/examples/worker.min.js

Diff for: .prettierrc.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"arrowParens": "avoid",
3+
"printWidth": 120,
4+
"proseWrap": "always",
5+
"singleQuote": true,
6+
"trailingComma": "all"
7+
}

Diff for: .vscode/extensions.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// for the documentation about the extensions.json format
44
"recommendations": [
55
"esbenp.prettier-vscode",
6-
"biomejs.biome",
76
"dbaeumer.vscode-eslint",
87
"augustocdias.tasks-shell-input",
98
"denoland.vscode-deno"

Diff for: .vscode/settings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
}
2626
],
2727
"deno.enablePaths": ["packages/deno/test"],
28-
"editor.defaultFormatter": "biomejs.biome",
28+
"editor.defaultFormatter": "esbenp.prettier-vscode",
2929
"[typescript]": {
30-
"editor.defaultFormatter": "biomejs.biome"
30+
"editor.defaultFormatter": "esbenp.prettier-vscode"
3131
}
3232
}

Diff for: biome.json

-103
This file was deleted.

Diff for: package.json

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@
2020
"clean:tarballs": "rimraf {packages,dev-packages}/*/*.tgz",
2121
"clean:watchman": "watchman watch-del \".\"",
2222
"clean:all": "run-s clean:build clean:tarballs clean:caches clean:deps clean:watchman",
23-
"fix": "run-s fix:biome fix:prettier fix:lerna",
23+
"fix": "run-s fix:prettier fix:lerna",
2424
"fix:lerna": "lerna run fix",
25-
"fix:biome": "biome check --apply .",
26-
"fix:prettier": "prettier \"**/*.md\" \"**/*.css\" --write",
25+
"fix:prettier": "prettier \"**/*.md\" \"**/*.css\" \"packages/**/**.{ts,js}\" --write",
2726
"changelog": "ts-node ./scripts/get-commit-list.ts",
2827
"link:yarn": "lerna exec yarn link",
29-
"lint": "run-s lint:lerna lint:biome lint:prettier",
30-
"lint:clang": "lerna run lint:clang",
28+
"lint": "run-s lint:prettier lint:lerna",
3129
"lint:lerna": "lerna run lint",
32-
"lint:biome": "biome check .",
33-
"lint:prettier": "prettier \"**/*.md\" \"**/*.css\" --check",
30+
"lint:prettier": "prettier \"**/*.md\" \"**/*.css\" \"packages/**/**.{ts,js}\" --check",
3431
"lint:es-compatibility": "es-check es2020 ./packages/*/build/{bundles,npm/cjs,cjs}/*.js && es-check es2020 ./packages/*/build/{npm/esm,esm}/*.js --module",
3532
"postpublish": "lerna run --stream --concurrency 1 postpublish",
3633
"test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test",
@@ -98,7 +95,6 @@
9895
"dev-packages/rollup-utils"
9996
],
10097
"devDependencies": {
101-
"@biomejs/biome": "^1.5.2",
10298
"@rollup/plugin-commonjs": "^25.0.7",
10399
"@rollup/plugin-esm-shim": "^0.1.5",
104100
"@rollup/plugin-json": "^6.1.0",

Diff for: packages/browser/src/exports.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,7 @@ export {
8282
} from './stack-parsers';
8383
export { eventFromException, eventFromMessage, exceptionFromError } from './eventbuilder';
8484
export { createUserFeedbackEnvelope } from './userfeedback';
85-
export {
86-
getDefaultIntegrations,
87-
forceLoad,
88-
init,
89-
onLoad,
90-
showReportDialog,
91-
} from './sdk';
85+
export { getDefaultIntegrations, forceLoad, init, onLoad, showReportDialog } from './sdk';
9286

9387
export { breadcrumbsIntegration } from './integrations/breadcrumbs';
9488
export { globalHandlersIntegration } from './integrations/globalhandlers';

Diff for: packages/browser/src/index.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ export { makeBrowserOfflineTransport } from './transports/offline';
6262
export { browserProfilingIntegration } from './profiling/integration';
6363
export { spotlightBrowserIntegration } from './integrations/spotlight';
6464
export { browserSessionIntegration } from './integrations/browsersession';
65-
export {
66-
featureFlagsIntegration,
67-
type FeatureFlagsIntegration,
68-
} from './integrations/featureFlags';
65+
export { featureFlagsIntegration, type FeatureFlagsIntegration } from './integrations/featureFlags';
6966
export { launchDarklyIntegration, buildLaunchDarklyFlagUsedHandler } from './integrations/featureFlags/launchdarkly';
7067
export { openFeatureIntegration, OpenFeatureIntegrationHook } from './integrations/featureFlags/openfeature';
7168
export { unleashIntegration } from './integrations/featureFlags/unleash';

Diff for: packages/core/src/index.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ export {
3939
getClient,
4040
getTraceContextFromScope,
4141
} from './currentScopes';
42-
export {
43-
getDefaultCurrentScope,
44-
getDefaultIsolationScope,
45-
} from './defaultScopes';
42+
export { getDefaultCurrentScope, getDefaultIsolationScope } from './defaultScopes';
4643
export { setAsyncContextStrategy } from './asyncContext';
4744
export { getGlobalSingleton, getMainCarrier } from './carrier';
4845
export { makeSession, closeSession, updateSession } from './session';
@@ -60,11 +57,7 @@ export { initAndBind, setCurrentClient } from './sdk';
6057
export { createTransport } from './transports/base';
6158
export { makeOfflineTransport } from './transports/offline';
6259
export { makeMultiplexedTransport } from './transports/multiplexed';
63-
export {
64-
getIntegrationsToSetup,
65-
addIntegration,
66-
defineIntegration,
67-
} from './integration';
60+
export { getIntegrationsToSetup, addIntegration, defineIntegration } from './integration';
6861
export { applyScopeDataToEvent, mergeScopeData } from './utils/applyScopeDataToEvent';
6962
export { prepareEvent } from './utils/prepareEvent';
7063
export { createCheckInEnvelope } from './checkin';

Diff for: packages/core/src/tracing/dynamicSamplingContext.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,7 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
128128
// The Sentry OTEL SpanSampler takes care of writing the sample rand on the root span
129129
traceState?.get('sentry.sample_rand') ??
130130
// On all other platforms we can actually get the scopes from a root span (we use this as a fallback)
131-
getCapturedScopesOnSpan(rootSpan)
132-
.scope?.getPropagationContext()
133-
.sampleRand.toString();
131+
getCapturedScopesOnSpan(rootSpan).scope?.getPropagationContext().sampleRand.toString();
134132
}
135133

136134
applyLocalSampleRateToDsc(dsc);

Diff for: packages/core/src/tracing/index.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ export { setCapturedScopesOnSpan, getCapturedScopesOnSpan } from './utils';
33
export { startIdleSpan, TRACING_DEFAULTS } from './idleSpan';
44
export { SentrySpan } from './sentrySpan';
55
export { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
6-
export {
7-
setHttpStatus,
8-
getSpanStatusFromHttpCode,
9-
} from './spanstatus';
6+
export { setHttpStatus, getSpanStatusFromHttpCode } from './spanstatus';
107
export { SPAN_STATUS_ERROR, SPAN_STATUS_OK, SPAN_STATUS_UNSET } from './spanstatus';
118
export {
129
startSpan,

Diff for: packages/core/src/types-hoist/index.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ export type {
8484
SendFeedbackParams,
8585
UserFeedback,
8686
} from './feedback';
87-
export type {
88-
QueryParams,
89-
RequestEventData,
90-
SanitizedRequestData,
91-
} from './request';
87+
export type { QueryParams, RequestEventData, SanitizedRequestData } from './request';
9288
export type { Runtime } from './runtime';
9389
export type { SdkInfo } from './sdkinfo';
9490
export type { SdkMetadata } from './sdkmetadata';
@@ -119,10 +115,7 @@ export type { StackFrame } from './stackframe';
119115
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
120116
export type { PropagationContext, TracePropagationTargets, SerializedTraceData } from './tracing';
121117
export type { StartSpanOptions } from './startSpanOptions';
122-
export type {
123-
TraceparentData,
124-
TransactionSource,
125-
} from './transaction';
118+
export type { TraceparentData, TransactionSource } from './transaction';
126119
export type { CustomSamplingContext, SamplingContext } from './samplingcontext';
127120
export type {
128121
DurationUnit,

Diff for: packages/core/src/utils-hoist/index.ts

+4-20
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
export { applyAggregateErrorsToEvent } from './aggregate-errors';
22
export { getBreadcrumbLogLevelFromHttpStatusCode } from './breadcrumb-log-level';
3-
export {
4-
getComponentName,
5-
getLocationHref,
6-
htmlTreeAsString,
7-
} from './browser';
3+
export { getComponentName, getLocationHref, htmlTreeAsString } from './browser';
84
export { dsnFromString, dsnToString, makeDsn } from './dsn';
95
export { SentryError } from './error';
106
export { GLOBAL_OBJ } from './worldwide';
@@ -13,12 +9,7 @@ export { addConsoleInstrumentationHandler } from './instrument/console';
139
export { addFetchEndInstrumentationHandler, addFetchInstrumentationHandler } from './instrument/fetch';
1410
export { addGlobalErrorInstrumentationHandler } from './instrument/globalError';
1511
export { addGlobalUnhandledRejectionInstrumentationHandler } from './instrument/globalUnhandledRejection';
16-
export {
17-
addHandler,
18-
maybeInstrument,
19-
resetInstrumentationHandlers,
20-
triggerHandlers,
21-
} from './instrument/handlers';
12+
export { addHandler, maybeInstrument, resetInstrumentationHandlers, triggerHandlers } from './instrument/handlers';
2213
export {
2314
isDOMError,
2415
isDOMException,
@@ -88,11 +79,7 @@ export {
8879
supportsReportingObserver,
8980
} from './supports';
9081
export { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './syncpromise';
91-
export {
92-
browserPerformanceTimeOrigin,
93-
dateTimestampInSeconds,
94-
timestampInSeconds,
95-
} from './time';
82+
export { browserPerformanceTimeOrigin, dateTimestampInSeconds, timestampInSeconds } from './time';
9683
export {
9784
TRACEPARENT_REGEXP,
9885
extractTraceparentData,
@@ -137,10 +124,7 @@ export { getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from './url
137124
export { eventFromMessage, eventFromUnknownInput, exceptionFromError, parseStackFrames } from './eventbuilder';
138125
export { callFrameToStackFrame, watchdogTimer } from './anr';
139126
export { LRUMap } from './lru';
140-
export {
141-
generateTraceId,
142-
generateSpanId,
143-
} from './propagationContext';
127+
export { generateTraceId, generateSpanId } from './propagationContext';
144128
export { vercelWaitUntil } from './vercelWaitUntil';
145129
export { SDK_VERSION } from './version';
146130
export { getDebugImagesForResources, getFilenameToDebugIdMap } from './debug-ids';

Diff for: packages/core/src/utils/request.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ function getAbsoluteUrl({
105105
url,
106106
protocol,
107107
host,
108-
}: { url?: string; protocol: string; host?: string }): string | undefined {
108+
}: {
109+
url?: string;
110+
protocol: string;
111+
host?: string;
112+
}): string | undefined {
109113
if (url?.startsWith('http')) {
110114
return url;
111115
}

Diff for: packages/core/test/lib/utils/meta.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ describe('getTraceMetaTags', () => {
99
baggage: 'sentry-environment=production',
1010
});
1111

12-
expect(getTraceMetaTags()).toBe(`<meta name="sentry-trace" content="12345678901234567890123456789012-1234567890123456-1"/>
12+
expect(getTraceMetaTags())
13+
.toBe(`<meta name="sentry-trace" content="12345678901234567890123456789012-1234567890123456-1"/>
1314
<meta name="baggage" content="sentry-environment=production"/>`);
1415
});
1516

Diff for: packages/deno/src/index.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ export {
8585

8686
export { DenoClient } from './client';
8787

88-
export {
89-
getDefaultIntegrations,
90-
init,
91-
} from './sdk';
88+
export { getDefaultIntegrations, init } from './sdk';
9289

9390
export { denoContextIntegration } from './integrations/context';
9491
export { globalHandlersIntegration } from './integrations/globalhandlers';

Diff for: packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ interface FunctionComponent {
55
}
66

77
interface ClassComponent {
8-
new (
9-
...args: unknown[]
10-
): {
8+
new (...args: unknown[]): {
119
props?: unknown;
1210
render(...args: unknown[]): unknown;
1311
};

Diff for: packages/node/src/integrations/http/SentryHttpInstrumentation.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,11 @@ export function recordRequestSession({
471471
requestIsolationScope,
472472
response,
473473
sessionFlushingDelayMS,
474-
}: { requestIsolationScope: Scope; response: EventEmitter; sessionFlushingDelayMS?: number }): void {
474+
}: {
475+
requestIsolationScope: Scope;
476+
response: EventEmitter;
477+
sessionFlushingDelayMS?: number;
478+
}): void {
475479
requestIsolationScope.setSDKProcessingMetadata({
476480
requestSession: { status: 'ok' },
477481
});

0 commit comments

Comments
 (0)