feat: upgrade Intl polyfills & add Chromium bug detection for Intl.Di…

…splayNames
JakeChampion · Aug 15, 2020 · d869a01 · d869a01
1 parent 810bd14
commit d869a01
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 2,453 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,13 +45,13 @@
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "^1.7.0",
-    "@formatjs/intl-datetimeformat": "^2.0.2",
-    "@formatjs/intl-displaynames": "^3.0.2",
-    "@formatjs/intl-getcanonicallocales": "^1.2.10",
-    "@formatjs/intl-listformat": "^3.0.2",
-    "@formatjs/intl-numberformat": "^5.0.2",
-    "@formatjs/intl-pluralrules": "^3.0.2",
-    "@formatjs/intl-relativetimeformat": "^6.0.2",
+    "@formatjs/intl-datetimeformat": "^2.4.0",
+    "@formatjs/intl-displaynames": "^3.1.7",
+    "@formatjs/intl-getcanonicallocales": "^1.3.1",
+    "@formatjs/intl-listformat": "^4.0.0",
+    "@formatjs/intl-numberformat": "^5.3.3",
+    "@formatjs/intl-pluralrules": "^3.2.5",
+    "@formatjs/intl-relativetimeformat": "^7.0.0",
     "@juggle/resize-observer": "^3.2.0",
     "@webcomponents/template": "^1.4.0",
     "Base64": "^1.0.0",

diff --git a/polyfills/Intl/DateTimeFormat/config.toml b/polyfills/Intl/DateTimeFormat/config.toml
@@ -27,5 +27,5 @@ samsung_mob = "*"
 
 [install]
 module = "@formatjs/intl-datetimeformat"
-paths = [ "dist/umd/polyfill.js" ]
+paths = [ "polyfill.js" ]
 postinstall = "update.task.js"
diff --git a/polyfills/Intl/DisplayNames/config.toml b/polyfills/Intl/DisplayNames/config.toml
@@ -23,6 +23,6 @@ samsung_mob = "*"
 
 [install]
 module = "@formatjs/intl-displaynames"
-paths = [ "dist/umd/polyfill.js" ]
+paths = [ "polyfill.js" ]
 postinstall = "update.task.js"
 
diff --git a/polyfills/Intl/DisplayNames/detect.js b/polyfills/Intl/DisplayNames/detect.js
@@ -1 +1,11 @@
-'Intl' in self && 'DisplayNames' in self.Intl
+'Intl' in self && 'DisplayNames' in self.Intl &&
+/**
+ * https://bugs.chromium.org/p/chromium/issues/detail?id=1097432
+ */
+(function hasMissingICUBug() {
+    if (Intl.DisplayNames) {
+        const regionNames = new Intl.DisplayNames(['en'], {type: 'region'});
+        return regionNames.of('CA') === 'CA';
+    }
+    return false;
+})()
diff --git a/polyfills/Intl/DisplayNames/update.task.js b/polyfills/Intl/DisplayNames/update.task.js
@@ -58,10 +58,17 @@ configSource.test = { ci: false };
 var configFileSource = TOML.stringify(configSource);
 
 function intlLocaleDetectFor(locale) {
-	return "'Intl' in self && " +
-			"Intl.DisplayNames && " +
-			"Intl.DisplayNames.supportedLocalesOf && " +
-			"Intl.DisplayNames.supportedLocalesOf('"+locale+"').length === 1";
+	return `'Intl' in self &&
+Intl.DisplayNames &&
+Intl.DisplayNames.supportedLocalesOf &&
+Intl.DisplayNames.supportedLocalesOf('${locale}').length === 1 &&
+(function hasMissingICUBug() {
+	if (Intl.DisplayNames) {
+		const regionNames = new Intl.DisplayNames(['en'], {type: 'region'});
+		return regionNames.of('CA') === 'CA';
+	}
+	return false;
+})()`;
 }
 
 console.log('Importing Intl.DisplayNames~locale.* polyfill from ' + LocalesPath);

diff --git a/polyfills/Intl/ListFormat/config.toml b/polyfills/Intl/ListFormat/config.toml
@@ -23,6 +23,6 @@ samsung_mob = "*"
 
 [install]
 module = "@formatjs/intl-listformat"
-paths = [ "dist/umd/polyfill-intl-listformat.js" ]
+paths = [ "polyfill.js" ]
 postinstall = "update.task.js"
 
diff --git a/polyfills/Intl/NumberFormat/config.toml b/polyfills/Intl/NumberFormat/config.toml
@@ -26,6 +26,6 @@ samsung_mob = "*"
 
 [install]
 module = "@formatjs/intl-numberformat"
-paths = [ "dist/umd/polyfill.js" ]
+paths = [ "polyfill.js" ]
 postinstall = "update.task.js"
 
diff --git a/polyfills/Intl/PluralRules/config.toml b/polyfills/Intl/PluralRules/config.toml
@@ -24,5 +24,5 @@ samsung_mob = "*"
 
 [install]
 module = "@formatjs/intl-pluralrules"
-paths = [ "dist/umd/polyfill.js" ]
+paths = [ "polyfill.js" ]
 postinstall = "update.task.js"
diff --git a/polyfills/Intl/PluralRules/update.task.js b/polyfills/Intl/PluralRules/update.task.js
@@ -59,7 +59,7 @@ function intlLocaleDetectFor(locale) {
 	return "'Intl' in this && " +
 			"Intl.PluralRules && " +
 			"Intl.PluralRules.supportedLocalesOf && " +
-			'(function() { try { return Intl.PluralRules.supportedLocalesOf("' + locale + '").length === 1; } catch (e) { return false; } }())';
+			'Intl.PluralRules.supportedLocalesOf("' + locale + '").length === 1';
 }
 
 console.log('Importing Intl.PluralRules~locale.* polyfill from ' + LocalesPath);

diff --git a/polyfills/Intl/RelativeTimeFormat/config.toml b/polyfills/Intl/RelativeTimeFormat/config.toml
@@ -23,6 +23,6 @@ samsung_mob = "<6"
 
 [install]
 module = "@formatjs/intl-relativetimeformat"
-paths = [ "dist/umd/polyfill-intl-relativetimeformat.js" ]
+paths = [ "polyfill.js" ]
 postinstall = "update.task.js"
 
diff --git a/polyfills/Intl/getCanonicalLocales/config.toml b/polyfills/Intl/getCanonicalLocales/config.toml
@@ -21,4 +21,4 @@ samsung_mob = "*"
 
 [install]
 module = "@formatjs/intl-getcanonicallocales"
-paths = [ "dist/umd/polyfill.js" ]
+paths = [ "polyfill.js" ]