From 56fcbae6725b1cfd99f4ce09013571ff54762085 Mon Sep 17 00:00:00 2001
From: signechambers1 <70176538+signechambers1@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:09:51 -1000
Subject: [PATCH] Remove safari from supported browsers (#2272)

* Update README.md

* Update package.json

* Update obsoleteHTMLTemplate.html

* remove unneeded polyfills

* explicit deny safari

* remove from webpack and update lock

Co-authored-by: Seve Badajoz <sbadajoz@chanzuckerberg.com>
---
 README.md                                            |  1 -
 client/configuration/eslint/eslint.js                | 12 +++---------
 .../configuration/webpack/obsoleteHTMLTemplate.html  |  7 -------
 .../configuration/webpack/webpack.config.shared.js   |  2 +-
 client/package-lock.json                             | 11 -----------
 client/package.json                                  |  5 ++---
 .../geneExpression/menus/createGenesetDialogue.js    |  2 +-
 7 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index cec1258d..f6225fd3 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,6 @@ cellxgene currently supports the following browsers:
 - Google Chrome 61+
 - Edge 15+
 - Firefox 60+
-- Safari 10.1+
 
 Please [file an issue](https://github.com/chanzuckerberg/cellxgene/issues/new/choose) if you would like us to add support for an unsupported browser.
 
diff --git a/client/configuration/eslint/eslint.js b/client/configuration/eslint/eslint.js
index eff73aae..43d98059 100644
--- a/client/configuration/eslint/eslint.js
+++ b/client/configuration/eslint/eslint.js
@@ -10,15 +10,9 @@ module.exports = {
     "prettier",
   ],
   settings: {
-    polyfills: [
-      "TextDecoder",
-      "TextEncoder",
-      "fetch",
-      "Request",
-      "Response",
-      "Headers",
-      "AbortController",
-    ],
+    // AbortController is not supported in iOS Safari 10.3, Chrome 61
+    // Headers is not supported in iOS Safari 10.3
+    polyfills: ["Headers", "AbortController"],
   },
   env: { browser: true, commonjs: true, es6: true },
   globals: {
diff --git a/client/configuration/webpack/obsoleteHTMLTemplate.html b/client/configuration/webpack/obsoleteHTMLTemplate.html
index ddb2dd27..d5ca7df4 100644
--- a/client/configuration/webpack/obsoleteHTMLTemplate.html
+++ b/client/configuration/webpack/obsoleteHTMLTemplate.html
@@ -56,13 +56,6 @@
         />
         <div>Chrome &gt; 60</div>
       </a>
-      <a href="https://www.apple.com/safari/" aria-label="Download Safari">
-        <img
-          src="https://cellxgene.cziscience.com/s3/cellxgene/static/images/safari.png"
-          style="width: 80px; height: 80px;"
-        />
-        <div>Safari ≥ 10.1</div>
-      </a>
       <a href="https://www.mozilla.com/firefox/" aria-label="Download Firefox">
         <img
           src="https://cellxgene.cziscience.com/s3/cellxgene/static/images/firefox.png"
diff --git a/client/configuration/webpack/webpack.config.shared.js b/client/configuration/webpack/webpack.config.shared.js
index f0adb5f3..0f98b59d 100644
--- a/client/configuration/webpack/webpack.config.shared.js
+++ b/client/configuration/webpack/webpack.config.shared.js
@@ -2,6 +2,7 @@ const path = require("path");
 const fs = require("fs");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const ObsoleteWebpackPlugin = require("obsolete-webpack-plugin");
+// eslint-disable-next-line @blueprintjs/classes-constants -- incorrect match
 const ScriptExtHtmlWebpackPlugin = require("script-ext-html-webpack-plugin");
 
 const src = path.resolve("src");
@@ -20,7 +21,6 @@ module.exports = {
   entry: [
     "core-js",
     "regenerator-runtime/runtime",
-    "fastestsmallesttextencoderdecoder",
     "whatwg-fetch",
     "abort-controller/polyfill",
     "./src/index",
diff --git a/client/package-lock.json b/client/package-lock.json
index bbae2b00..7fa1914b 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -18,7 +18,6 @@
         "core-js": "^3.6.5",
         "d3": "^4.10.0",
         "d3-scale-chromatic": "^1.5.0",
-        "fastestsmallesttextencoderdecoder": "^1.0.22",
         "flatbuffers": "^1.11.0",
         "fuzzysort": "^1.1.4",
         "gl-mat4": "^1.2.0",
@@ -9061,11 +9060,6 @@
       "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
       "dev": true
     },
-    "node_modules/fastestsmallesttextencoderdecoder": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/fastestsmallesttextencoderdecoder/-/fastestsmallesttextencoderdecoder-1.0.22.tgz",
-      "integrity": "sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw=="
-    },
     "node_modules/fastq": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -29688,11 +29682,6 @@
       "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
       "dev": true
     },
-    "fastestsmallesttextencoderdecoder": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/fastestsmallesttextencoderdecoder/-/fastestsmallesttextencoderdecoder-1.0.22.tgz",
-      "integrity": "sha512-Pb8d48e+oIuY4MaM64Cd7OW1gt4nxCHs7/ddPPZ/Ic3sg8yVGM7O9wDvZ7us6ScaUupzM+pfBolwtYhN1IxBIw=="
-    },
     "fastq": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
diff --git a/client/package.json b/client/package.json
index 76ec68c8..5b1dd841 100644
--- a/client/package.json
+++ b/client/package.json
@@ -31,11 +31,11 @@
   },
   "browserslist": [
     "Chrome > 60",
-    "Safari >= 10.1",
     "iOS >= 10.3",
     "Firefox >= 60",
     "Edge >= 79",
-    "not Explorer > 0"
+    "not Explorer > 0",
+    "not Safari > 0"
   ],
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.13.0",
@@ -47,7 +47,6 @@
     "core-js": "^3.6.5",
     "d3": "^4.10.0",
     "d3-scale-chromatic": "^1.5.0",
-    "fastestsmallesttextencoderdecoder": "^1.0.22",
     "flatbuffers": "^1.11.0",
     "fuzzysort": "^1.1.4",
     "gl-mat4": "^1.2.0",
diff --git a/client/src/components/geneExpression/menus/createGenesetDialogue.js b/client/src/components/geneExpression/menus/createGenesetDialogue.js
index 98a8a151..d7c30635 100644
--- a/client/src/components/geneExpression/menus/createGenesetDialogue.js
+++ b/client/src/components/geneExpression/menus/createGenesetDialogue.js
@@ -128,7 +128,7 @@ class CreateGenesetDialogue extends React.PureComponent {
   };
 
   render() {
-    const { genesetName, nameErrorMessage} = this.state;
+    const { genesetName, nameErrorMessage } = this.state;
     const { genesetsUI, genesets } = this.props;
 
     return (