Skip to content

Commit 6a51fe4

Browse files
authored
Merge branch 'develop' into abhi-remove-BAGGAGE_HEADER_NAME
2 parents 714c21b + cb1dcf7 commit 6a51fe4

File tree

6 files changed

+2
-98
lines changed

6 files changed

+2
-98
lines changed

docs/migration/v8-to-v9.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ It will be removed in a future major version.
108108
- The `validSeverityLevels` export has been removed. There is no replacement.
109109
- The `arrayify` export has been removed. There is no replacement.
110110
- The `BAGGAGE_HEADER_NAME` export has been removed. Use `"baggage"` string constant directly instead.
111+
- The `flatten` export has been removed. There is no replacement.
111112

112113
### `@sentry/nestjs`
113114

packages/core/src/utils-hoist/array.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

packages/core/src/utils-hoist/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
export { applyAggregateErrorsToEvent } from './aggregate-errors';
2-
// eslint-disable-next-line deprecation/deprecation
3-
export { flatten } from './array';
42
export { getBreadcrumbLogLevelFromHttpStatusCode } from './breadcrumb-log-level';
53
export { getComponentName, getDomElement, getLocationHref, htmlTreeAsString } from './browser';
64
export { dsnFromString, dsnToString, makeDsn } from './dsn';

packages/core/test/utils-hoist/array.test.ts

Lines changed: 0 additions & 67 deletions
This file was deleted.

packages/node/src/utils/redisCache.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@ export function calculateCacheItemSize(response: unknown): number | undefined {
9595
: getSize(response);
9696
}
9797

98-
// TODO(v9): This is inlined from core so we can deprecate `flatten`.
99-
// It's usage can be replaced with `Array.flat` in v9.
10098
type NestedArray<T> = Array<NestedArray<T> | T>;
99+
101100
function flatten<T>(input: NestedArray<T>): T[] {
102101
const result: T[] = [];
103102

packages/utils/src/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import {
6161
extractTraceparentData as extractTraceparentData_imported,
6262
filenameIsInApp as filenameIsInApp_imported,
6363
fill as fill_imported,
64-
flatten as flatten_imported,
6564
forEachEnvelopeItem as forEachEnvelopeItem_imported,
6665
generatePropagationContext as generatePropagationContext_imported,
6766
generateSentryTraceHeader as generateSentryTraceHeader_imported,
@@ -598,10 +597,6 @@ export const isNodeEnv = isNodeEnv_imported;
598597
/** @deprecated Import from `@sentry/core` instead. */
599598
export const loadModule = loadModule_imported;
600599

601-
/** @deprecated Import from `@sentry/core` instead. */
602-
// eslint-disable-next-line deprecation/deprecation
603-
export const flatten = flatten_imported;
604-
605600
/** @deprecated Import from `@sentry/core` instead. */
606601
// eslint-disable-next-line deprecation/deprecation
607602
export const memoBuilder = memoBuilder_imported;

0 commit comments

Comments
 (0)