Merge pull request #12232 from vector-im/t3chguy/modernizr

Improve Browser checks

.modernizr.json

@@ -11,6 +11,16 @@
     "test/css/objectfit",
     "test/storage/localstorage",
     "test/workers/webworkers",
-    "test/indexeddb"
+    "test/indexeddb",
+    "test/es6/array",
+    "test/es6/collections",
+    "test/es6/promises",
+    "test/serviceworker",
+    "test/svg",
+    "test/svg/asimg",
+    "test/svg/filters",
+    "test/css/animations",
+    "test/css/filters",
+    "test/network/fetch"
   ]
 }

package.json

@@ -67,7 +67,6 @@
     "highlight.js": "^9.13.1",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
-    "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",
     "prop-types": "^15.7.2",
@@ -131,6 +130,7 @@
     "mini-css-extract-plugin": "^0.8.0",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
+    "modernizr": "^3.6.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^12.0.1",

src/vector/app.js

@@ -53,11 +53,23 @@ import CallHandler from 'matrix-react-sdk/src/CallHandler';
 
 let lastLocationHashSet = null;
 
-function checkBrowserFeatures(featureList) {
+function checkBrowserFeatures() {
     if (!window.Modernizr) {
         console.error("Cannot check features - Modernizr global is missing.");
         return false;
     }
+
+    // custom checks atop Modernizr because it doesn't have ES2018/ES2019 checks in it for some features we depend on,
+    // Modernizr requires rules to be lowercase with no punctuation:
+    // ES2018: http://www.ecma-international.org/ecma-262/9.0/#sec-promise.prototype.finally
+    window.Modernizr.addTest("promiseprototypefinally", () =>
+        window.Promise && window.Promise.prototype && typeof window.Promise.prototype.finally === "function");
+    // ES2019: http://www.ecma-international.org/ecma-262/10.0/#sec-object.fromentries
+    window.Modernizr.addTest("objectfromentries", () =>
+        window.Object && typeof window.Object.fromEntries === "function");
+
+    const featureList = Object.keys(window.Modernizr);
+
     let featureComplete = true;
     for (let i = 0; i < featureList.length; i++) {
         if (window.Modernizr[featureList[i]] === undefined) {
@@ -69,8 +81,7 @@ function checkBrowserFeatures(featureList) {
         }
         if (window.Modernizr[featureList[i]] === false) {
             console.error("Browser missing feature: '%s'", featureList[i]);
-            // toggle flag rather than return early so we log all missing features
+            // toggle flag rather than return early so we log all missing features rather than just the first.
-            // rather than just the first.
             featureComplete = false;
         }
     }
@@ -260,10 +271,7 @@ export async function loadApp() {
         return;
     }
 
-    const validBrowser = checkBrowserFeatures([
+    const validBrowser = checkBrowserFeatures();
-        "displaytable", "flexbox", "es5object", "es5function", "localstorage",
-        "objectfit", "indexeddb", "webworkers",
-    ]);
 
     const acceptInvalidBrowser = window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser');