Merge pull request #8132 from rtibbles/ie11

Restore IE11 compatibility
learningequality · Jun 14, 2021 · 4db150e · 4db150e
2 parents cf82939 + 60ef8b1
commit 4db150e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/browserslist b/browserslist
@@ -5,6 +5,6 @@
 
 > 0.1%
 last 2 versions
-ie >= 9
+ie >= 11
 ios >= 9.3
 Firefox ESR
diff --git a/kolibri/core/assets/src/core-app/index.js b/kolibri/core/assets/src/core-app/index.js
@@ -2,6 +2,7 @@
  * Provides the public API for the Kolibri FrontEnd core app.
  * @module Facade
  */
+import 'core-js';
 import '../styles/main.scss';
 import urls from 'kolibri.urls';
 import * as theme from 'kolibri-design-system/lib/styles/theme';

diff --git a/packages/kolibri-tools/babel.config.js b/packages/kolibri-tools/babel.config.js
@@ -4,7 +4,7 @@ module.exports = {
       '@babel/preset-env',
       {
         useBuiltIns: 'entry',
-        corejs: '3.10',
+        corejs: '3.13',
       },
     ],
   ],

diff --git a/packages/kolibri-tools/lib/webpack.config.base.js b/packages/kolibri-tools/lib/webpack.config.base.js
@@ -129,7 +129,10 @@ module.exports = (data, { mode = 'development', hot = false } = {}) => {
         {
           test: /\.js$/,
           loader: 'babel-loader',
-          exclude: /(node_modules\/vue|dist)/,
+          exclude: {
+            test: /(node_modules\/vue|dist|core-js)/,
+            not: [/\.(esm\.js|mjs)$/],
+          },
         },
         {
           test: /\.css$/,

diff --git a/packages/kolibri-tools/package.json b/packages/kolibri-tools/package.json
@@ -27,6 +27,7 @@
     "chokidar": "^2.0.4",
     "colors": "^1.1.2",
     "commander": "^2.9.0",
+    "core-js": "3",
     "css-loader": "^0.28.7",
     "csv-parse": "^4.14.1",
     "csv-parser": "^2.3.3",

diff --git a/yarn.lock b/yarn.lock
@@ -4316,6 +4316,11 @@ core-js-pure@^3.0.0:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
   integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
+core-js@3:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.13.1.tgz#30303fabd53638892062d8b4e802cac7599e9fb7"
+  integrity sha512-JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ==
+
 core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"