[Glitch] Upgrade react-intl

Port 76960f128a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

app/javascript/flavours/glitch/actions/notifications.js

@@ -1,4 +1,4 @@
-import IntlMessageFormat from 'intl-messageformat';
+import { IntlMessageFormat } from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
 import { List as ImmutableList } from 'immutable';

app/javascript/flavours/glitch/components/domain.tsx

@@ -1,8 +1,7 @@
 import { useCallback } from 'react';
 import * as React from 'react';
 
-import type { InjectedIntl } from 'react-intl';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import { IconButton } from './icon_button';
 
@@ -16,9 +15,11 @@ const messages = defineMessages({
 interface Props {
   domain: string;
   onUnblockDomain: (domain: string) => void;
-  intl: InjectedIntl;
 }
-const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
+
+export const Domain: React.FC<Props> = ({ domain, onUnblockDomain }) => {
+  const intl = useIntl();
+
   const handleDomainUnblock = useCallback(() => {
     onUnblockDomain(domain);
   }, [domain, onUnblockDomain]);
@@ -42,5 +43,3 @@ const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
     </div>
   );
 };
-
-export const Domain = injectIntl(_Domain);

app/javascript/flavours/glitch/components/load_gap.tsx

@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
-import { injectIntl, defineMessages } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
 import { Icon } from 'flavours/glitch/components/icon';
 
@@ -13,10 +12,11 @@ interface Props {
   disabled: boolean;
   maxId: string;
   onClick: (maxId: string) => void;
-  intl: InjectedIntl;
 }
 
-const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
+export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+  const intl = useIntl();
+
   const handleClick = useCallback(() => {
     onClick(maxId);
   }, [maxId, onClick]);
@@ -32,5 +32,3 @@ const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
     </button>
   );
 };
-
-export const LoadGap = injectIntl(_LoadGap);

app/javascript/flavours/glitch/components/relative_timestamp.tsx

@@ -1,6 +1,6 @@
 import { Component } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
+import type { IntlShape } from 'react-intl';
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
@@ -103,7 +103,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: InjectedIntl,
+  intl: IntlShape,
   date: Date,
   now: number,
   year: number,
@@ -155,7 +155,7 @@ export const timeAgoString = (
 };
 
 const timeRemainingString = (
-  intl: InjectedIntl,
+  intl: IntlShape,
   date: Date,
   now: number,
   timeGiven = true
@@ -190,7 +190,7 @@ const timeRemainingString = (
 };
 
 interface Props {
-  intl: InjectedIntl;
+  intl: IntlShape;
   timestamp: string;
   year: number;
   futureDate?: boolean;
@@ -201,7 +201,7 @@ interface States {
 }
 class RelativeTimestamp extends Component<Props, States> {
   state = {
-    now: this.props.intl.now(),
+    now: Date.now(),
   };
 
   static defaultProps = {
@@ -223,7 +223,7 @@ class RelativeTimestamp extends Component<Props, States> {
 
   UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.props.timestamp !== nextProps.timestamp) {
-      this.setState({ now: this.props.intl.now() });
+      this.setState({ now: Date.now() });
     }
   }
 
@@ -253,7 +253,7 @@ class RelativeTimestamp extends Component<Props, States> {
         : Math.max(updateInterval, unitRemainder);
 
     this._timer = window.setTimeout(() => {
-      this.setState({ now: this.props.intl.now() });
+      this.setState({ now: Date.now() });
     }, delay);
   }
 

app/javascript/flavours/glitch/containers/admin_component.jsx

@@ -1,12 +1,11 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
+import { IntlProvider } from 'react-intl';
 
-import { getLocale } from 'mastodon/locales';
+import { getLocale, onProviderError } from 'mastodon/locales';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
+const { messages } = getLocale();
 
 export default class AdminComponent extends PureComponent {
 
@@ -19,7 +18,7 @@ export default class AdminComponent extends PureComponent {
     const { locale, children } = this.props;
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
         {children}
       </IntlProvider>
     );

app/javascript/flavours/glitch/containers/compose_container.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
+import { IntlProvider } from 'react-intl';
 
 import { Provider } from 'react-redux';
 
@@ -11,10 +11,9 @@ import Compose from 'flavours/glitch/features/standalone/compose';
 import initialState from 'flavours/glitch/initial_state';
 import { store } from 'flavours/glitch/store';
 
-import { getLocale } from 'mastodon/locales';
+import { getLocale, onProviderError } from 'mastodon/locales';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
+const { messages } = getLocale();
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
@@ -32,7 +31,7 @@ export default class TimelineContainer extends PureComponent {
     const { locale } = this.props;
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
         <Provider store={store}>
           <Compose />
         </Provider>

app/javascript/flavours/glitch/containers/mastodon.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
+import { IntlProvider } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 import { BrowserRouter, Route } from 'react-router-dom';
@@ -18,10 +18,9 @@ import ErrorBoundary from 'flavours/glitch/components/error_boundary';
 import UI from 'flavours/glitch/features/ui';
 import initialState, { title as siteTitle } from 'flavours/glitch/initial_state';
 import { store } from 'flavours/glitch/store';
-import { getLocale } from 'locales';
+import { getLocale, onProviderError } from 'locales';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
+const { messages } = getLocale();
 
 const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`;
 
@@ -87,7 +86,7 @@ export default class Mastodon extends PureComponent {
     const { locale } = this.props;
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
         <ReduxProvider store={store}>
           <ErrorBoundary>
             <BrowserRouter>

app/javascript/flavours/glitch/containers/media_container.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { createPortal } from 'react-dom';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
+import { IntlProvider } from 'react-intl';
 
 import { fromJS } from 'immutable';
 
@@ -16,10 +16,9 @@ import MediaModal from 'flavours/glitch/features/ui/components/media_modal';
 import Video from 'flavours/glitch/features/video';
 import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar';
 
-import { getLocale } from 'mastodon/locales';
+import { getLocale, onProviderError } from 'mastodon/locales';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
+const { messages } = getLocale();
 
 const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll, Hashtag, Audio };
 
@@ -85,7 +84,7 @@ export default class MediaContainer extends PureComponent {
     }
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider locale={locale} messages={messages} onError={onProviderError}>
         <>
           {[].map.call(components, (component, i) => {
             const componentName = component.getAttribute('data-component');

app/javascript/flavours/glitch/load_locale.js

@@ -0,0 +1,21 @@
+import { setLocale } from 'locales';
+
+export async function loadLocale() {
+  const locale = document.querySelector('html').lang || 'en';
+
+  const upstreamLocaleData = await import(
+    /* webpackMode: "lazy" */
+    /* webpackChunkName: "locales/vanilla/[request]" */
+    /* webpackInclude: /\.json$/ */
+    /* webpackPreload: true */
+    `mastodon/locales/${locale}.json`);
+
+  const localeData = await import(
+    /* webpackMode: "lazy" */
+    /* webpackChunkName: "locales/glitch/[request]" */
+    /* webpackInclude: /\.json$/ */
+    /* webpackPreload: true */
+    `flavours/glitch/locales/${locale}.json`);
+
+  setLocale({ messages: {...upstreamLocaleData, ...localeData} });
+}

app/javascript/flavours/glitch/locales/whitelist_af.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_an.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ar.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ast.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_be.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_bg.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_bn.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_br.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_bs.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ca.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ckb.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_co.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_cs.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_cy.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_da.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_de.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_el.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_en-GB.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_en.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_eo.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_es-AR.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_es-MX.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_es.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_et.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_eu.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_fa.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_fi.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_fo.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_fr-QC.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_fr.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_fy.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ga.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_gd.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_gl.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_he.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_hi.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_hr.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_hu.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_hy.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_id.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ig.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_io.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_is.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_it.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ja.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ka.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_kab.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_kk.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_kn.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ko.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ku.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_kw.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_la.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_lt.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_lv.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_mk.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ml.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_mr.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ms.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_my.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_nl.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_nn.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_no.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_oc.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_pa.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_pl.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_pt-BR.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_pt-PT.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ro.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ru.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sa.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sc.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sco.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_si.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sk.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sl.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sq.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sr-Latn.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sr.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_sv.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_szl.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ta.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_tai.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_te.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_th.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_tr.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_tt.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ug.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_uk.json

@@ -1,2 +0,0 @@
-[
-]

app/javascript/flavours/glitch/locales/whitelist_ur.json

@@ -1,2 +0,0 @@
-[
-]