Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Upgrade react-intl (#24906)

Browse source
This commit is contained in:
Renaud Chaput 2023-05-31 23:43:39 +02:00 • committed by GitHub
parent 00c222377d
commit 44cd88adc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
130 changed files with 413 additions and 5046 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/polyfills/base_polyfills.ts
View file

@ -1,5 +1,3 @@
import 'intl';
import 'intl/locale-data/jsonp/en';
import 'core-js/features/object/assign';
import 'core-js/features/object/values';
import 'core-js/features/symbol';

4
app/javascript/mastodon/polyfills/index.ts
View file

@ -2,6 +2,8 @@
// If there are no polyfills, then this is just Promise.resolve() which means
// it will execute in the same tick of the event loop (i.e. near-instant).
import { loadIntlPolyfills } from './intl';
function importBasePolyfills() {
return import(/* webpackChunkName: "base_polyfills" */ './base_polyfills');
}
@ -13,7 +15,6 @@ function importExtraPolyfills() {
export function loadPolyfills() {
const needsBasePolyfills = !(
'toBlob' in HTMLCanvasElement.prototype &&
'Intl' in window &&
'assign' in Object &&
'values' in Object &&
'Symbol' in window &&
@ -32,6 +33,7 @@ export function loadPolyfills() {
);
return Promise.all([
loadIntlPolyfills(),
needsBasePolyfills && importBasePolyfills(),
needsExtraPolyfills && importExtraPolyfills(),
]);

105
app/javascript/mastodon/polyfills/intl.ts Normal file
View file

@ -0,0 +1,105 @@
// import { shouldPolyfill as shouldPolyfillCanonicalLocales } from '@formatjs/intl-getcanonicallocales/should-polyfill';
// import { shouldPolyfill as shouldPolyfillLocale } from '@formatjs/intl-locale/should-polyfill';
import { shouldPolyfill as shoudPolyfillPluralRules } from '@formatjs/intl-pluralrules/should-polyfill';
// import { shouldPolyfill as shouldPolyfillNumberFormat } from '@formatjs/intl-numberformat/should-polyfill';
// import { shouldPolyfill as shouldPolyfillIntlDateTimeFormat } from '@formatjs/intl-datetimeformat/should-polyfill';
// import { shouldPolyfill as shouldPolyfillIntlRelativeTimeFormat } from '@formatjs/intl-relativetimeformat/should-polyfill';
// async function loadGetCanonicalLocalesPolyfill() {
// // This platform already supports Intl.getCanonicalLocales
// if (shouldPolyfillCanonicalLocales()) {
// await import('@formatjs/intl-getcanonicallocales/polyfill');
// }
// }
// async function loadLocalePolyfill() {
// // This platform already supports Intl.Locale
// if (shouldPolyfillLocale()) {
// await import('@formatjs/intl-locale/polyfill');
// }
// }
// async function loadIntlNumberFormatPolyfill(locale: string) {
// const unsupportedLocale = shouldPolyfillNumberFormat(locale);
// // This locale is supported
// if (!unsupportedLocale) {
// return;
// }
// // Load the polyfill 1st BEFORE loading data
// await import('@formatjs/intl-numberformat/polyfill-force');
// await import(`@formatjs/intl-numberformat/locale-data/${unsupportedLocale}`);
// }
// async function loadIntlDateTimeFormatPolyfill(locale: string) {
// const unsupportedLocale = shouldPolyfillIntlDateTimeFormat(locale);
// // This locale is supported
// if (!unsupportedLocale) {
// return;
// }
// // Load the polyfill 1st BEFORE loading data
// await import('@formatjs/intl-datetimeformat/polyfill-force');
// // Parallelize CLDR data loading
// const dataPolyfills = [
// import('@formatjs/intl-datetimeformat/add-all-tz'),
// import(`@formatjs/intl-datetimeformat/locale-data/${unsupportedLocale}`),
// ];
// await Promise.all(dataPolyfills);
// }
async function loadIntlPluralRulesPolyfills(locale: string) {
const unsupportedLocale = shoudPolyfillPluralRules(locale);
// This locale is supported
if (!unsupportedLocale) {
return;
}
// Load the polyfill 1st BEFORE loading data
await import(
/* webpackChunkName: "i18n-pluralrules-polyfill" */ '@formatjs/intl-pluralrules/polyfill-force'
);
await import(
/* webpackChunkName: "i18n-pluralrules-polyfill-[request]" */ `@formatjs/intl-pluralrules/locale-data/${unsupportedLocale}`
);
}
// async function loadIntlRelativeTimeFormatPolyfill(locale: string) {
// const unsupportedLocale = shouldPolyfillIntlRelativeTimeFormat(locale);
// // This locale is supported
// if (!unsupportedLocale) {
// return;
// }
// // Load the polyfill 1st BEFORE loading data
// await import(
// /* webpackChunkName: "i18n-relativetimeformat-polyfill" */
// '@formatjs/intl-relativetimeformat/polyfill-force'
// );
// await import(
// /* webpackChunkName: "i18n-relativetimeformat-polyfill-[request]" */
// `@formatjs/intl-relativetimeformat/locale-data/${unsupportedLocale}`
// );
// }
export async function loadIntlPolyfills() {
const locale = document.querySelector('html')?.lang || 'en';
// order is important here
// Supported in IE11 and most other browsers, not useful
// await loadGetCanonicalLocalesPolyfill()
// Supported in IE11 and most other browsers, not useful
// await loadLocalePolyfill()
// Supported in IE11 and most other browsers, not useful
// await loadIntlNumberFormatPolyfill(locale)
// Supported in IE11 and most other browsers, not useful
// await loadIntlDateTimeFormatPolyfill(locale)
// Supported from Safari 13+, may still be useful
await loadIntlPluralRulesPolyfills(locale);
// This is not used yet in the codebase yet
// Supported from Safari 14+
// await loadIntlRelativeTimeFormatPolyfill(locale);
}