Skip to content

Commit 20d7b92

Browse files
TkDodoTkDodo
committed
Merge branch 'master' into tkdodo/ref/eslint-plugin-query
2 parents e527699 + f0767c5 commit 20d7b92

File tree

1,283 files changed

+38725
-6270
lines changed

Some content is hidden

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

1,283 files changed

+38725
-6270
lines changed

‎.github/CODEOWNERS

+6
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,12 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
600600
/static/gsApp/components/crons/ @getsentry/crons
601601
/static/gsApp/components/replay* @getsentry/replay-frontend
602602

603+
## gsAdmin
604+
# /static/gsAdmin/* unowned
605+
/static/gsAdmin/components/forkCustomer.tsx @getsentry/hybrid-cloud
606+
/static/gsAdmin/components/relocation* @getsentry/hybrid-cloud
607+
/static/gsAdmin/views/relocation* @getsentry/hybrid-cloud
608+
603609
## ML & AI
604610
*autofix*.py @getsentry/machine-learning-ai
605611
/src/sentry/api/endpoints/event_ai_suggested_fix.py @getsentry/machine-learning-ai

‎babel.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const config: TransformOptions = {
1313
'@babel/preset-env',
1414
{
1515
useBuiltIns: 'usage',
16-
corejs: '3.37',
16+
corejs: '3.41',
1717
},
1818
],
1919
// TODO: Remove allowDeclareFields when we upgrade to Babel 8

‎config/tsconfig.base.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
"sentry-logos/*": ["src/sentry/static/sentry/images/logos/*"],
107107
"sentry-fonts/*": ["static/fonts/*"],
108108
"getsentry/*": ["static/gsApp/*"],
109-
"getsentry-images/*": ["static/images/*"]
109+
"getsentry-images/*": ["static/images/*"],
110+
"admin/*": ["static/gsAdmin/*"]
110111
},
111112

112113
"plugins": [

‎fixtures/stubs-for-mypy/pytest_jsonreport/__init__.pyi

Whitespace-only changes.

‎fixtures/stubs-for-mypy/pytest_jsonreport/plugin.pyi

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
class JSONReport:
2+
pass

‎jest.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ const config: Config.InitialOptions = {
235235
'<rootDir>/tests/js/sentry-test/importStyleMock.js',
236236
'^sentry/(.*)': '<rootDir>/static/app/$1',
237237
'^getsentry/(.*)': '<rootDir>/static/gsApp/$1',
238+
'^admin/(.*)': '<rootDir>/static/gsAdmin/$1',
238239
'^sentry-fixture/(.*)': '<rootDir>/tests/js/fixtures/$1',
239240
'^sentry-test/(.*)': '<rootDir>/tests/js/sentry-test/$1',
240241
'^getsentry-test/(.*)': '<rootDir>/tests/js/getsentry-test/$1',

‎migrations_lockfile.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ ahead of you.
55
To resolve this, rebase against latest master and regenerate your migration. This file
66
will then be regenerated, and you should be able to merge without conflicts.
77

8+
explore: 0001_add_explore_saved_query_model
9+
810
feedback: 0004_index_together
911

1012
hybridcloud: 0019_add_provider_webhook_payload
@@ -23,4 +25,4 @@ tempest: 0002_make_message_type_nullable
2325

2426
uptime: 0031_translate_uptime_object_headers_to_lists_take_three
2527

26-
workflow_engine: 0035_action_model_drop_legacy_fields
28+
workflow_engine: 0036_action_remove_legacy_fields

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"dependencies": {
1111
"@acemarke/react-prod-sourcemaps": "^0.2.1",
1212
"@amplitude/analytics-browser": "^1.5.3",
13-
"@babel/core": "~7.25.9",
14-
"@babel/plugin-transform-runtime": "~7.25.9",
15-
"@babel/preset-env": "~7.25.9",
16-
"@babel/preset-react": "^7.25.9",
17-
"@babel/preset-typescript": "^7.25.9",
18-
"@babel/runtime": "~7.25.9",
13+
"@babel/core": "~7.26.10",
14+
"@babel/plugin-transform-runtime": "~7.26.10",
15+
"@babel/preset-env": "~7.26.9",
16+
"@babel/preset-react": "^7.26.3",
17+
"@babel/preset-typescript": "^7.26.0",
18+
"@babel/runtime": "~7.26.10",
1919
"@dnd-kit/core": "^6.1.0",
2020
"@dnd-kit/sortable": "^8.0.0",
2121
"@emotion/babel-plugin": "^11.13.5",
@@ -93,15 +93,15 @@
9393
"@types/stripe-v3": "^3.1.20",
9494
"@types/webpack-env": "^1.18.5",
9595
"ansi-to-react": "^6.1.6",
96-
"babel-loader": "^9.2.1",
96+
"babel-loader": "^10.0.0",
9797
"browserslist": "^4.22.2",
9898
"buffer": "^6.0.3",
9999
"cbor-web": "^8.1.0",
100100
"classnames": "2.3.1",
101101
"color": "^4.2.3",
102102
"compression-webpack-plugin": "11.1.0",
103103
"copy-webpack-plugin": "^12.0.2",
104-
"core-js": "^3.37.0",
104+
"core-js": "^3.41.0",
105105
"cronstrue": "^2.50.0",
106106
"css-loader": "^7.1.2",
107107
"css-minimizer-webpack-plugin": "^7.0.0",

‎pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ module = [
412412
"sentry.tempest.endpoints.*",
413413
"sentry.tempest.migrations.*",
414414
"sentry.testutils.helpers.task_runner",
415+
"sentry.testutils.pytest.json_report_reruns",
415416
"sentry.testutils.skips",
416417
"sentry.toolbar.utils.*",
417418
"sentry.types.*",

‎requirements-base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ datadog>=0.49
1414
django-crispy-forms>=1.14.0
1515
django-csp>=3.8
1616
django-pg-zero-downtime-migrations>=0.16
17-
Django>=5.1.1
17+
Django>=5.1.7
1818
djangorestframework>=3.15.1
1919
drf-spectacular>=0.26.3
2020
sentry-forked-email-reply-parser>=0.5.12.post1

‎requirements-dev-frozen.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ datadog==0.49.1
4040
devservices==1.0.17
4141
distlib==0.3.8
4242
distro==1.8.0
43-
django==5.1.5
43+
django==5.1.7
4444
django-crispy-forms==1.14.0
4545
django-csp==3.8
4646
django-pg-zero-downtime-migrations==0.16

‎requirements-frozen.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cssselect==1.0.3
3333
cssutils==2.9.0
3434
datadog==0.49.1
3535
distro==1.8.0
36-
django==5.1.5
36+
django==5.1.7
3737
django-crispy-forms==1.14.0
3838
django-csp==3.8
3939
django-pg-zero-downtime-migrations==0.16

0 commit comments

Comments
 (0)