From f5142cd34a9892f0e2e6f64690e9baffadefd445 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Fri, 23 Aug 2019 14:07:56 +0200
Subject: [PATCH] Use babel-loader instead of ts-loader

---
 .babelrc          |  9 ++++++++-
 package-lock.json | 30 +++++++++++++++++++++++++++---
 package.json      |  2 +-
 webpack.config.js | 11 +----------
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/.babelrc b/.babelrc
index f1c1cec56..e25d8f3b8 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,6 +1,13 @@
 {
   "presets": [
-    "@babel/preset-env",
+    [
+      "@babel/preset-env",
+      {
+        "corejs": "3.2.1",
+        "modules": false,
+        "useBuiltIns": "usage"
+      }
+    ],
     "@babel/preset-react",
     "@babel/preset-typescript"
   ],
diff --git a/package-lock.json b/package-lock.json
index bfd17481a..a3b8d9fa2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7209,9 +7209,10 @@
       }
     },
     "core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
+      "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==",
+      "dev": true
     },
     "core-js-compat": {
       "version": "3.2.0",
@@ -8976,6 +8977,13 @@
         "promise": "^7.1.1",
         "setimmediate": "^1.0.5",
         "ua-parser-js": "^0.7.18"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        }
       }
     },
     "figgy-pudding": {
@@ -19111,6 +19119,14 @@
           "dev": true,
           "requires": {
             "core-js": "^1.0.0"
+          },
+          "dependencies": {
+            "core-js": {
+              "version": "1.2.7",
+              "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+              "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
+              "dev": true
+            }
           }
         },
         "pify": {
@@ -19252,6 +19268,14 @@
           "dev": true,
           "requires": {
             "core-js": "^1.0.0"
+          },
+          "dependencies": {
+            "core-js": {
+              "version": "1.2.7",
+              "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+              "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
+              "dev": true
+            }
           }
         },
         "dedent": {
diff --git a/package.json b/package.json
index e9eed1fcf..8663c5f9d 100644
--- a/package.json
+++ b/package.json
@@ -111,6 +111,7 @@
     "babel-plugin-react-intl": "^4.1.12",
     "babel-plugin-react-intl-auto": "^2.2.0",
     "codecov": "^3.5.0",
+    "core-js": "^3.2.1",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
     "enzyme-to-json": "^3.3.5",
@@ -126,7 +127,6 @@
     "rimraf": "^2.7.0",
     "testcafe": "^1.3.3",
     "ts-jest": "^23.10.5",
-    "ts-loader": "^5.4.5",
     "tsconfig-paths-webpack-plugin": "^3.2.0",
     "tslint": "^5.18.0",
     "tslint-config-prettier": "^1.18.0",
diff --git a/webpack.config.js b/webpack.config.js
index 8b4eb4755..b400fd3b0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -67,19 +67,10 @@ module.exports = (env, argv) => {
     module: {
       rules: [
         {
-          test: /\.jsx?$/,
+          test: /\.(jsx?|tsx?)$/,
           exclude: /node_modules/,
           loader: "babel-loader"
         },
-        {
-          test: /\.tsx?$/,
-          exclude: /node_modules/,
-          loader: "ts-loader",
-          options: {
-            experimentalWatchApi: true,
-            transpileOnly: true
-          }
-        },
         {
           test: /\.(eot|otf|png|svg|jpg|ttf|woff|woff2)(\?v=[0-9.]+)?$/,
           loader: fileLoaderPath,