Skip to content

Commit 4479bbd

Browse files
authored
Merge branch 'master' into tony/bound-segments
2 parents 6fff2a5 + bf9e57f commit 4479bbd

File tree

429 files changed

+10465
-5183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

429 files changed

+10465
-5183
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
832832
/static/app/components/core/ @getsentry/design-engineering
833833
/static/app/components/dnd/ @getsentry/design-engineering
834834
/static/app/components/pageFilters/ @getsentry/design-engineering
835+
/static/app/components/backendJsonFormAdapter/ @getsentry/design-engineering
835836
/static/app/icons/ @getsentry/design-engineering
836837
/static/app/stories/ @getsentry/design-engineering
837838
/static/app/components/commandPalette/ @getsentry/design-engineering

eslint.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@ export default typescript.config([
609609
'@typescript-eslint/no-for-in-array': 'error',
610610
'@typescript-eslint/no-unnecessary-template-expression': 'error',
611611
'@typescript-eslint/no-unnecessary-type-assertion': 'error',
612+
'@typescript-eslint/no-unnecessary-type-parameters': 'error',
612613
'@typescript-eslint/switch-exhaustiveness-check': [
613614
'error',
614615
{considerDefaultExhaustiveForUnions: true},

knip.config.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,16 @@ const config: KnipConfig = {
6767
// ignore eslint plugins in production
6868
'!static/eslint/**/*.ts!',
6969
],
70+
ignore: [
71+
// api-docs has its own package.json with its own dependencies
72+
'api-docs/**',
73+
],
7074
ignoreExportsUsedInFile: isProductionMode,
7175
ignoreDependencies: [
7276
'core-js',
7377
'tslib', // subdependency of many packages, declare the latest version
7478
'jest-environment-jsdom', // used as testEnvironment in jest config
79+
'jsdom', // knip thinks we need this because of jest-environment jsdom
7580
'swc-plugin-component-annotate', // used in rspack config, needs better knip plugin
7681
'@swc/plugin-emotion', // used in rspack config, needs better knip plugin
7782
'buffer', // rspack.ProvidePlugin, needs better knip plugin
@@ -85,7 +90,6 @@ const config: KnipConfig = {
8590
rules: {
8691
binaries: 'off',
8792
enumMembers: 'off',
88-
unlisted: 'off',
8993
},
9094
include: ['nsExports', 'nsTypes'],
9195
mdx: {

migrations_lockfile.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ replays: 0007_organizationmember_replay_access
3131

3232
seer: 0005_delete_seerorganizationsettings
3333

34-
sentry: 1064_eventattachment_date_expires_now
34+
sentry: 1066_add_export_format_in_data_export_obj
3535

3636
social_auth: 0003_social_auth_json_field
3737

3838
tempest: 0003_use_encrypted_char_field
3939

4040
uptime: 0055_backfill_2xx_status_assertion
4141

42-
workflow_engine: 0111_add_workflowfirehistory_date_added_index
42+
workflow_engine: 0112_drop_redundant_error_detector_workflows

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@
235235
"@emotion/server": "^11.11.0",
236236
"@eslint/js": "9.32.0",
237237
"@figma/code-connect": "^1.3.13",
238+
"@jest/environment": "30.3.0",
239+
"@jest/types": "30.3.0",
238240
"@mdx-js/language-service": "^0.7.3",
239241
"@sentry-internal/rrweb-types": "2.41.0",
240242
"@sentry/jest-environment": "6.1.0",
@@ -277,7 +279,7 @@
277279
"jest-environment-jsdom": "30.3.0",
278280
"jest-fail-on-console": "3.3.4",
279281
"jest-junit": "16.0.0",
280-
"knip": "6.0.1",
282+
"knip": "6.3.1",
281283
"odiff-bin": "^4.3.2",
282284
"oxfmt": "^0.41.0",
283285
"playwright": "^1.58.2",
@@ -286,6 +288,7 @@
286288
"stylelint": "16.10.0",
287289
"stylelint-config-recommended": "^14.0.1",
288290
"terser": "5.40.0",
291+
"tinyglobby": "0.2.16",
289292
"typescript": "6.0.2",
290293
"typescript-eslint": "8.58.0"
291294
},

0 commit comments

Comments
 (0)