Scott Cooper 1 год назад
Родитель
Сommit
2c814c8e7d

+ 2 - 2
package.json

@@ -72,9 +72,9 @@
     "@types/papaparse": "^5.3.5",
     "@types/pegjs": "^0.10.3",
     "@types/prismjs": "^1.26.0",
-    "@types/react": "~17.0.14",
+    "@types/react": "~17.0.62",
     "@types/react-date-range": "^1.4.4",
-    "@types/react-dom": "~17.0.9",
+    "@types/react-dom": "~17.0.20",
     "@types/react-grid-layout": "^1.3.2",
     "@types/react-mentions": "4.1.6",
     "@types/react-router": "^3.0.22",

+ 10 - 2
static/app/components/compactSelect/list.tsx

@@ -26,11 +26,19 @@ interface BaseListProps<Value extends React.Key>
   extends ListProps<any>,
     Omit<
       AriaListBoxOptions<any>,
-      'disabledKeys' | 'selectedKeys' | 'defaultSelectedKeys' | 'onSelectionChange'
+      | 'disabledKeys'
+      | 'selectedKeys'
+      | 'defaultSelectedKeys'
+      | 'onSelectionChange'
+      | 'autoFocus'
     >,
     Omit<
       AriaGridListOptions<any>,
-      'disabledKeys' | 'selectedKeys' | 'defaultSelectedKeys' | 'onSelectionChange'
+      | 'disabledKeys'
+      | 'selectedKeys'
+      | 'defaultSelectedKeys'
+      | 'onSelectionChange'
+      | 'autoFocus'
     > {
   items: SelectOptionOrSectionWithKey<Value>[];
   /**

+ 5 - 1
static/app/components/compactSelect/listBox/index.tsx

@@ -15,7 +15,10 @@ import {ListBoxOption} from './option';
 import {ListBoxSection} from './section';
 
 interface ListBoxProps
-  extends Omit<React.HTMLAttributes<HTMLUListElement>, 'onBlur' | 'onFocus'>,
+  extends Omit<
+      React.HTMLAttributes<HTMLUListElement>,
+      'onBlur' | 'onFocus' | 'autoFocus'
+    >,
     Omit<
       AriaListBoxOptions<any>,
       | 'children'
@@ -24,6 +27,7 @@ interface ListBoxProps
       | 'selectedKeys'
       | 'defaultSelectedKeys'
       | 'onSelectionChange'
+      | 'autoFocus'
     > {
   /**
    * Keyboard event handler, to be attached to the list (`ul`) element, to seamlessly

+ 5 - 2
static/app/views/admin/installWizard/index.tsx

@@ -13,13 +13,16 @@ import DeprecatedAsyncView from 'sentry/views/deprecatedAsyncView';
 
 import {getForm, getOptionDefault, getOptionField} from '../options';
 
-type Props = DeprecatedAsyncView['props'] & {
+export type InstallWizardProps = DeprecatedAsyncView['props'] & {
   onConfigured: () => void;
 };
 
 type State = DeprecatedAsyncView['state'];
 
-export default class InstallWizard extends DeprecatedAsyncView<Props, State> {
+export default class InstallWizard extends DeprecatedAsyncView<
+  InstallWizardProps,
+  State
+> {
   getEndpoints(): ReturnType<DeprecatedAsyncView['getEndpoints']> {
     return [['data', '/internal/options/?query=is:required']];
   }

+ 4 - 1
static/app/views/app/index.tsx

@@ -23,6 +23,7 @@ import {onRenderCallback} from 'sentry/utils/performanceForSentry';
 import useApi from 'sentry/utils/useApi';
 import {useColorscheme} from 'sentry/utils/useColorscheme';
 import {useHotkeys} from 'sentry/utils/useHotkeys';
+import type {InstallWizardProps} from 'sentry/views/admin/installWizard';
 
 import SystemAlerts from './systemAlerts';
 
@@ -30,7 +31,9 @@ type Props = {
   children: React.ReactNode;
 } & RouteComponentProps<{orgId?: string}, {}>;
 
-const InstallWizard = lazy(() => import('sentry/views/admin/installWizard'));
+const InstallWizard: React.FC<InstallWizardProps> = lazy(
+  () => import('sentry/views/admin/installWizard')
+);
 const NewsletterConsent = lazy(() => import('sentry/views/newsletterConsent'));
 
 /**

+ 16 - 40
yarn.lock

@@ -2372,16 +2372,6 @@
     fflate "^0.4.4"
     mitt "^1.1.3"
 
-"@sentry-internal/tracing@7.59.2":
-  version "7.59.2"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.59.2.tgz#91c44a37151bb81fac0500b4e031f53583dff772"
-  integrity sha512-02gteChV/lMobWU06VlITq+myEWk0MzhnDCm8n/DMigB47I9HkWZFAJ+CYG6Ns0rTL+3+/c2V0bPyQkZwIC+Sg==
-  dependencies:
-    "@sentry/core" "7.59.2"
-    "@sentry/types" "7.59.2"
-    "@sentry/utils" "7.59.2"
-    tslib "^2.4.1 || ^1.9.3"
-
 "@sentry-internal/tracing@7.60.1":
   version "7.60.1"
   resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.60.1.tgz#c20766a7e31589962ffe9ea9dc58b6f475432303"
@@ -2404,7 +2394,7 @@
     "@sentry/utils" "7.60.1"
     tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/core@7.59.2", "@sentry/core@^7.53.0":
+"@sentry/core@7.59.2":
   version "7.59.2"
   resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.59.2.tgz#5c69cc7b8321f47c3da353f51084e2f4c4170e7d"
   integrity sha512-GRhoPw6b6GkvOsa060aREc9yyHjgAKITgITNbzUmn0GqIeWD5SMoCBAcENRHVgUnpQWOpnkEF1/sqxvwx+rf6Q==
@@ -2413,7 +2403,7 @@
     "@sentry/utils" "7.59.2"
     tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/core@7.60.1":
+"@sentry/core@7.60.1", "@sentry/core@^7.53.0":
   version "7.60.1"
   resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.60.1.tgz#789ebb2ba6808042e8c288f6881b82ff108c9c7c"
   integrity sha512-yr/0VFYWOJyXj+F2nifkRYxXskotsNnDggUnFOZZN2ZgTG94IzRFsOZQ6RslHJ8nrYPTBNO74reU0C0GB++xRw==
@@ -2447,21 +2437,7 @@
   resolved "https://registry.yarnpkg.com/@sentry/jest-environment/-/jest-environment-4.0.0.tgz#037844bed70c8f13259ee01ab65ff8d36aef0209"
   integrity sha512-91jLBS8KbX2Ng0aDSP7kdE9sjiLc4qjp/jczTbmvOvuHxoaQ9hSLaEpsthnnUQ/zNeprZMkOC9xlS+zABw3Zmw==
 
-"@sentry/node@^7.53.0":
-  version "7.59.2"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.59.2.tgz#ff68286770d6a647a4555c9f0351c7003c00f3bc"
-  integrity sha512-cvTW4VwQdvNeAtBGVGE5hGmsWstGK4PwWe5PccBWJBQGM/rYzwk2tM9ZQnM5M5+yDV4bZ+21sJhvyhsHoTjmzQ==
-  dependencies:
-    "@sentry-internal/tracing" "7.59.2"
-    "@sentry/core" "7.59.2"
-    "@sentry/types" "7.59.2"
-    "@sentry/utils" "7.59.2"
-    cookie "^0.4.1"
-    https-proxy-agent "^5.0.0"
-    lru_map "^0.3.3"
-    tslib "^2.4.1 || ^1.9.3"
-
-"@sentry/node@^7.60.1":
+"@sentry/node@^7.53.0", "@sentry/node@^7.60.1":
   version "7.60.1"
   resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.60.1.tgz#18e287995445588ebea630aed3932a3d21dda9ab"
   integrity sha512-lBt3RqncY4XbzM+PlTbH/tUWeOsm24anwEzvA2DSDP1NL3WZ5MdvT77q7NqpvpVNd2LeGAQ6x7AXDzE53YBfnQ==
@@ -2521,17 +2497,17 @@
   dependencies:
     "@sentry-internal/tracing" "7.60.1"
 
-"@sentry/types@7.59.2", "@sentry/types@^7.53.0":
+"@sentry/types@7.59.2":
   version "7.59.2"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.59.2.tgz#25b2ae0b2dc6733ca48621cf9167c9a7965852ae"
   integrity sha512-rylG7UQ0cC/xbV6trSuaAE/bsruSZy92jxQ1/KSOYKwBBvRFPXJBuiBtA81b8eYa4THZ+mE/ol2qOTJYuuV4Ug==
 
-"@sentry/types@7.60.1":
+"@sentry/types@7.60.1", "@sentry/types@^7.53.0":
   version "7.60.1"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.60.1.tgz#2f8740db56ae4cae87523ae7a0daf753308496f0"
   integrity sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw==
 
-"@sentry/utils@7.59.2", "@sentry/utils@^7.53.0":
+"@sentry/utils@7.59.2":
   version "7.59.2"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.59.2.tgz#c4c76b1ea2a7f9363d1203dedfeafec2387bf634"
   integrity sha512-uxC8xH9wsB/tZUnjmaQ1uGtsumFOc19KWfedVHXzcNwqdt5uS3EB4+D1d8WwiJyLy2nm61DdmTC9SiB4HS+OSw==
@@ -2539,7 +2515,7 @@
     "@sentry/types" "7.59.2"
     tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/utils@7.60.1", "@sentry/utils@^7.60.1":
+"@sentry/utils@7.60.1", "@sentry/utils@^7.53.0", "@sentry/utils@^7.60.1":
   version "7.60.1"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.60.1.tgz#27b20bd2926c877011eb39fcb4b2db95dc72243f"
   integrity sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw==
@@ -3019,12 +2995,12 @@
     "@types/react" "*"
     date-fns "^2.16.1"
 
-"@types/react-dom@*", "@types/react-dom@>=16", "@types/react-dom@~17.0.9":
-  version "17.0.9"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
-  integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
+"@types/react-dom@*", "@types/react-dom@>=16", "@types/react-dom@~17.0.20":
+  version "17.0.20"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53"
+  integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==
   dependencies:
-    "@types/react" "*"
+    "@types/react" "^17"
 
 "@types/react-grid-layout@^1.3.2":
   version "1.3.2"
@@ -3080,10 +3056,10 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16", "@types/react@~17.0.14":
-  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.21.tgz#069c43177cd419afaab5ce26bb4e9056549f7ea6"
-  integrity sha512-GzzXCpOthOjXvrAUFQwU/svyxu658cwu00Q9ugujS4qc1zXgLFaO0kS2SLOaMWLt2Jik781yuHCWB7UcYdGAeQ==
+"@types/react@*", "@types/react@>=16", "@types/react@^17", "@types/react@~17.0.62":
+  version "17.0.62"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3"
+  integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"