From 3ea39ad0d177b0c1e2e142f0092d08c33aef8e35 Mon Sep 17 00:00:00 2001
From: Yuta Hiroto <git@about-hiroppy.com>
Date: Sat, 1 Jun 2019 16:30:56 +0200
Subject: [PATCH] feat(client): introduce core-js

---
 client-src/default/index.js    |  5 +++--
 client-src/default/polyfill.js | 10 ++++++++++
 package-lock.json              |  5 +++++
 package.json                   |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 client-src/default/polyfill.js

diff --git a/client-src/default/index.js b/client-src/default/index.js
index df7432b5ea..436a66494e 100644
--- a/client-src/default/index.js
+++ b/client-src/default/index.js
@@ -9,6 +9,7 @@ import { log, setLogLevel } from './utils/log';
 import sendMessage from './utils/sendMessage';
 import reloadApp from './utils/reloadApp';
 import createSocketUrl from './utils/createSocketUrl';
+import { array, string } from './polyfill';
 
 const status = {
   isUnloading: false,
@@ -31,7 +32,7 @@ self.addEventListener('beforeunload', () => {
 
 if (typeof window !== 'undefined') {
   const qs = window.location.search.toLowerCase();
-  options.hotReload = qs.indexOf('hotreload=false') === -1;
+  options.hotReload = !string.includes(qs, 'hotreload=false');
 }
 
 const onSocketMessage = {
@@ -63,7 +64,7 @@ const onSocketMessage = {
   },
   'log-level': function logLevel(level) {
     const hotCtx = require.context('webpack/hot', false, /^\.\/log$/);
-    if (hotCtx.keys().indexOf('./log') !== -1) {
+    if (array.includes(hotCtx.keys(), './log')) {
       hotCtx('./log').setLogLevel(level);
     }
     setLogLevel(level);
diff --git a/client-src/default/polyfill.js b/client-src/default/polyfill.js
new file mode 100644
index 0000000000..9093982412
--- /dev/null
+++ b/client-src/default/polyfill.js
@@ -0,0 +1,10 @@
+import stringIncludes from 'core-js/features/string/includes';
+import arrayIncludes from 'core-js/features/array/includes';
+
+export const array = {
+  includes: arrayIncludes,
+};
+
+export const string = {
+  includes: stringIncludes,
+};
diff --git a/package-lock.json b/package-lock.json
index e44f7dcfb7..7c476b1739 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3609,6 +3609,11 @@
         }
       }
     },
+    "core-js": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.3.tgz",
+      "integrity": "sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA=="
+    },
     "core-js-compat": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.2.tgz",
diff --git a/package.json b/package.json
index 4d962aef78..26c9cffb2e 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "chokidar": "^3.0.1",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^1.6.0",
+    "core-js": "^3.1.3",
     "debug": "^4.1.1",
     "del": "^4.1.1",
     "express": "^4.17.1",