Просмотр исходного кода

chore(ts): Upgrade to typescript v4 (#20756)

Scott Cooper 4 лет назад
Родитель
Сommit
0edc7c15a2
3 измененных файлов с 5 добавлено и 10 удалено
  1. 1 1
      package.json
  2. 3 3
      src/sentry/static/sentry/app/components/forms/genericField.tsx
  3. 1 6
      yarn.lock

+ 1 - 1
package.json

@@ -125,7 +125,7 @@
     "svg-sprite-loader": "^3.9.0",
     "svgo": "^1.0.3",
     "svgo-loader": "^2.1.0",
-    "typescript": "^3.8",
+    "typescript": "^4.0",
     "u2f-api": "1.0.10",
     "webpack": "4.42.1",
     "webpack-cli": "3.3.11",

+ 3 - 3
src/sentry/static/sentry/app/components/forms/genericField.tsx

@@ -114,16 +114,16 @@ const GenericField = ({
       // the chrome required tip winds up in weird places
       // for select elements, so just make it look like
       // it's required (with *) and rely on server validation
-      delete fieldProps.required;
+      const {required: _, ...selectProps} = fieldProps;
       if (config.has_autocomplete) {
         // Redeclaring field props here as config has been narrowed to include the correct options for SelectAsyncField
         const selectFieldProps = {
           ...config,
-          ...fieldProps,
+          ...selectProps,
         };
         return <SelectAsyncField deprecatedSelectControl {...selectFieldProps} />;
       }
-      return <SelectField deprecatedSelectControl {...fieldProps} />;
+      return <SelectField deprecatedSelectControl {...selectProps} />;
     default:
       return null;
   }

+ 1 - 6
yarn.lock

@@ -15935,12 +15935,7 @@ typescript-template-language-service-decorator@^2.2.0:
   resolved "https://registry.yarnpkg.com/typescript-template-language-service-decorator/-/typescript-template-language-service-decorator-2.2.0.tgz#4ee6d580f307fb9239978e69626f2775b8a59b2a"
   integrity sha512-xiolqt1i7e22rpqMaprPgSFVgU64u3b9n6EJlAaUYE61jumipKAdI1+O5khPlWslpTUj80YzjUKjJ2jxT0D74w==
 
-typescript@^3.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
-  integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
-
-typescript@^4.0.2:
+typescript@^4.0, typescript@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
   integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==