Skip to content

Commit d2ecb9d

Browse files
authored
Merge branch 'master' into ognjenbostjancic/tet-2122-apply-marthas-new-conversations-design
2 parents 376e9ae + 1586980 commit d2ecb9d

File tree

397 files changed

+9767
-5321
lines changed

Some content is hidden

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

397 files changed

+9767
-5321
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py @get
439439
/static/app/components/loading/ @getsentry/app-frontend
440440
/static/app/components/events/interfaces/ @getsentry/app-frontend
441441
/static/app/components/forms/ @getsentry/app-frontend
442+
/static/app/components/featureShowcase.mdx @getsentry/app-frontend
443+
/static/app/components/featureShowcase.spec.tsx @getsentry/app-frontend
444+
/static/app/components/featureShowcase.tsx @getsentry/app-frontend
442445
/static/app/components/markdownTextArea.tsx @getsentry/app-frontend
443446
/static/app/locale.tsx @getsentry/app-frontend
444447
## End of Frontend

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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ const productionEntryPoints = [
2525
'static/app/components/pipeline/**/*.{js,ts,tsx}',
2626
// TODO: Remove when used
2727
'static/app/views/seerExplorer/contexts/**/*.{js,ts,tsx}',
28+
// TODO: Remove when used
29+
'static/app/components/featureShowcase.tsx',
2830
];
2931

3032
const testingEntryPoints = [
@@ -67,11 +69,16 @@ const config: KnipConfig = {
6769
// ignore eslint plugins in production
6870
'!static/eslint/**/*.ts!',
6971
],
72+
ignore: [
73+
// api-docs has its own package.json with its own dependencies
74+
'api-docs/**',
75+
],
7076
ignoreExportsUsedInFile: isProductionMode,
7177
ignoreDependencies: [
7278
'core-js',
7379
'tslib', // subdependency of many packages, declare the latest version
7480
'jest-environment-jsdom', // used as testEnvironment in jest config
81+
'jsdom', // knip thinks we need this because of jest-environment jsdom
7582
'swc-plugin-component-annotate', // used in rspack config, needs better knip plugin
7683
'@swc/plugin-emotion', // used in rspack config, needs better knip plugin
7784
'buffer', // rspack.ProvidePlugin, needs better knip plugin
@@ -85,7 +92,6 @@ const config: KnipConfig = {
8592
rules: {
8693
binaries: 'off',
8794
enumMembers: 'off',
88-
unlisted: 'off',
8995
},
9096
include: ['nsExports', 'nsTypes'],
9197
mdx: {

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
3131

3232
seer: 0005_delete_seerorganizationsettings
3333

34-
sentry: 1065_delete_customdynamicsamplingrule
34+
sentry: 1066_add_export_format_in_data_export_obj
3535

3636
social_auth: 0003_social_auth_json_field
3737

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)