Merge pull request #2887 from reosarevok/dollar-dollar-bill-yall

Use React$ global types instead of React. ones
metabrainz · Mar 8, 2023 · ceefb6c · ceefb6c
2 parents bacbf25 + 830355d
commit ceefb6c
Show file tree

Hide file tree

Showing 766 changed files with 976 additions and 1,948 deletions.
diff --git a/root/account/Donation.js b/root/account/Donation.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import UserAccountLayout, {
   sanitizedAccountLayoutUser,
 } from '../components/UserAccountLayout.js';
@@ -27,7 +25,7 @@ const Donation = ({
   days,
   nag,
   user,
-}: Props): React.Element<typeof UserAccountLayout> => (
+}: Props): React$Element<typeof UserAccountLayout> => (
   <UserAccountLayout
     entity={sanitizedAccountLayoutUser(user)}
     page="donation"

diff --git a/root/account/EditProfile.js b/root/account/EditProfile.js
@@ -21,7 +21,7 @@ import EditProfileForm
 
 const EditProfile = (
   props: EditProfileFormPropsT,
-): React.Element<typeof UserAccountLayout> | null => {
+): React$Element<typeof UserAccountLayout> | null => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   if (!user) {

diff --git a/root/account/EmailVerificationStatus.js b/root/account/EmailVerificationStatus.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const EmailVerificationStatus = ({
   message,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Email Verification')}>
     <p>
       {nonEmpty(message)

diff --git a/root/account/LostPassword.js b/root/account/LostPassword.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -27,7 +25,7 @@ type Props = {
   +form: LostPasswordFormT,
 };
 
-const LostPassword = (props: Props): React.Element<typeof Layout> => (
+const LostPassword = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Lost Password')}>
     <h1>{l('Lost Password')}</h1>
     <p>

diff --git a/root/account/LostPasswordSent.js b/root/account/LostPasswordSent.js
@@ -7,12 +7,10 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 import {CONTACT_URL} from '../constants.js';
 
-const LostPasswordSent = (): React.Element<typeof StatusPage> => (
+const LostPasswordSent = (): React$Element<typeof StatusPage> => (
   <StatusPage title={hyphenateTitle(l('Lost Password'), l('Email Sent!'))}>
     <p>
       {exp.l(

diff --git a/root/account/LostUsername.js b/root/account/LostUsername.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -25,7 +23,7 @@ type Props = {
   +form: LostUsernameFormT,
 };
 
-const LostUsername = (props: Props): React.Element<typeof Layout> => (
+const LostUsername = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Lost Username')}>
     <h1>{l('Lost Username')}</h1>
     <p>

diff --git a/root/account/LostUsernameSent.js b/root/account/LostUsernameSent.js
@@ -7,12 +7,10 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 import {CONTACT_URL} from '../constants.js';
 
-const LostUsernameSent = (): React.Element<typeof StatusPage> => (
+const LostUsernameSent = (): React$Element<typeof StatusPage> => (
   <StatusPage title={hyphenateTitle(l('Lost Username'), l('Email Sent!'))}>
     <p>
       {exp.l(

diff --git a/root/account/Preferences.js b/root/account/Preferences.js
@@ -21,7 +21,7 @@ import PreferencesForm
 
 const Preferences = (
   props: PreferencesFormPropsT,
-): React.Element<typeof UserAccountLayout> | null => {
+): React$Element<typeof UserAccountLayout> | null => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   if (!user) {

diff --git a/root/account/PreferencesSaved.js b/root/account/PreferencesSaved.js
@@ -12,7 +12,7 @@ import * as React from 'react';
 import StatusPage from '../components/StatusPage.js';
 import {SanitizedCatalystContext} from '../context.mjs';
 
-const PreferencesSaved = (): React.Element<typeof StatusPage> => {
+const PreferencesSaved = (): React$Element<typeof StatusPage> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <StatusPage title={l('Preferences')}>

diff --git a/root/account/ResetPasswordStatus.js b/root/account/ResetPasswordStatus.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const ResetPasswordStatus = ({
   message,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Reset Password')}>
     <p>{message}</p>
   </StatusPage>

diff --git a/root/account/applications/Edit.js b/root/account/applications/Edit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import type {ApplicationFormT}
   from '../../static/scripts/account/components/ApplicationForm.js';
@@ -19,7 +17,7 @@ type Props = {
   +form: ApplicationFormT,
 };
 
-const EditApplication = (props: Props): React.Element<typeof Layout> => (
+const EditApplication = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edit Application')}>
     <h1>{l('Edit Application')}</h1>
     <ApplicationForm

diff --git a/root/account/applications/Index.js b/root/account/applications/Index.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import {ACCESS_SCOPE_PERMISSIONS} from '../../constants.js';
 import Layout from '../../layout/index.js';
@@ -80,7 +78,7 @@ const Index = ({
   appsPager,
   tokens,
   tokensPager,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Applications')}>
     <h1>{l('Applications')}</h1>
 

diff --git a/root/account/applications/Register.js b/root/account/applications/Register.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import * as manifest from '../../static/manifest.mjs';
 import type {ApplicationFormT}
@@ -20,7 +18,7 @@ type Props = {
   +form: ApplicationFormT,
 };
 
-const RegisterApplication = (props: Props): React.Element<typeof Layout> => (
+const RegisterApplication = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Register Application')}>
     <h1>{l('Register Application')}</h1>
     <ApplicationForm

diff --git a/root/account/applications/Remove.js b/root/account/applications/Remove.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ConfirmLayout from '../../components/ConfirmLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RemoveApplication = ({
   form,
-}: Props): React.Element<typeof ConfirmLayout> => (
+}: Props): React$Element<typeof ConfirmLayout> => (
   <ConfirmLayout
     form={form}
     question={l('Are you sure you want to remove this application?')}

diff --git a/root/account/applications/RevokeAccess.js b/root/account/applications/RevokeAccess.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ConfirmLayout from '../../components/ConfirmLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RevokeApplicationAccess = ({
   form,
-}: Props): React.Element<typeof ConfirmLayout> => (
+}: Props): React$Element<typeof ConfirmLayout> => (
   <ConfirmLayout
     form={form}
     question={l(

diff --git a/root/account/sso/DiscourseRegistered.js b/root/account/sso/DiscourseRegistered.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const DiscourseRegistered = ({
   emailAddress,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Account Created')}>
     <h2>{l('Account Created')}</h2>
     <p style={{fontSize: '1.2em'}}>

diff --git a/root/account/sso/DiscourseUnconfirmedEmailAddress.js b/root/account/sso/DiscourseUnconfirmedEmailAddress.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
-const DiscourseUnconfirmedEmailAddress = (): React.Element<typeof Layout> => (
+const DiscourseUnconfirmedEmailAddress = (): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Unverified Email Address')}>
     <h2>{l('Unverified Email Address')}</h2>
     <p>

diff --git a/root/admin/EditBanner.js b/root/admin/EditBanner.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -23,7 +21,7 @@ type Props = {
   }>,
 };
 
-const EditBanner = ({form}: Props): React.Element<typeof Layout> => (
+const EditBanner = ({form}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edit Banner Message')}>
     <div id="content">
       <h1>{l('Edit banner message')}</h1>

diff --git a/root/admin/EmailSearch.js b/root/admin/EmailSearch.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import expand2react from '../static/scripts/common/i18n/expand2react.js';
 import FormRowText from '../static/scripts/edit/components/FormRowText.js';
@@ -26,7 +24,7 @@ type Props = {
 const EmailSearch = ({
   form,
   results,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Search users by email')}>
     <div id="content">
       <h1>{l('Search users by email')}</h1>

diff --git a/root/admin/IpLookup.js b/root/admin/IpLookup.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import UserList from './components/UserList.js';
@@ -21,7 +19,7 @@ type Props = {
 const IpLookup = ({
   ipHash,
   users,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('IP lookup')}>
     <div id="content">
       <h1>{l('IP lookup')}</h1>

diff --git a/root/admin/LockedUsernameSearch.js b/root/admin/LockedUsernameSearch.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import expand2react from '../static/scripts/common/i18n/expand2react.js';
 import bracketed from '../static/scripts/common/utility/bracketed.js';
@@ -30,7 +28,7 @@ const LockedUsernameSearch = ({
   form,
   results,
   showResults,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title="Search locked usernames">
     <div id="content">
       <h1>{'Search locked usernames'}</h1>

diff --git a/root/admin/LockedUsernameUnlock.js b/root/admin/LockedUsernameUnlock.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import expand2text from '../static/scripts/common/i18n/expand2text.js';
 import FormCsrfToken
@@ -23,7 +21,7 @@ type Props = {
 const LockedUsernameUnlock = ({
   form,
   username,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title="Unlock username">
     <div id="content">
       <h1>{'Unlock username'}</h1>

diff --git a/root/admin/PrivilegeSearch.js b/root/admin/PrivilegeSearch.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../components/PaginatedResults.js';
 import Layout from '../layout/index.js';
 import FormRowCheckbox
@@ -42,7 +40,7 @@ const PrivilegeSearch = ({
   form,
   pager,
   results,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Search users by privileges')}>
     <div id="content">
       <h1>{l('Search users by privileges')}</h1>

diff --git a/root/admin/attributes/Attribute.js b/root/admin/attributes/Attribute.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import {compare} from '../../static/scripts/common/i18n.js';
 import expand2react from '../../static/scripts/common/i18n/expand2react.js';
@@ -85,7 +83,7 @@ const renderAttributes = (attribute: AttributeT) => {
 const Attribute = ({
   attributes,
   model,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={model}>
     <h1>
       <a href="/admin/attributes">{l('Attributes')}</a>