From eb4bfaadbbf244a5c6a4d49a7f5bc95a1d9f1aa7 Mon Sep 17 00:00:00 2001
From: Martin Hradil <mhradil@redhat.com>
Date: Thu, 1 Mar 2018 19:15:44 +0000
Subject: [PATCH 1/5] Webpack - remove coffeescript & erb loaders

we have no coffescript or erb code, not in ui-classic, not in ui-componets or in v2v plugin
no point in having the loaders
---
 config/webpack/loaders/coffee.js | 4 ----
 config/webpack/loaders/erb.js    | 9 ---------
 2 files changed, 13 deletions(-)
 delete mode 100644 config/webpack/loaders/coffee.js
 delete mode 100644 config/webpack/loaders/erb.js

diff --git a/config/webpack/loaders/coffee.js b/config/webpack/loaders/coffee.js
deleted file mode 100644
index dae8742492f..00000000000
--- a/config/webpack/loaders/coffee.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-  test: /\.coffee(\.erb)?$/,
-  loader: 'coffee-loader'
-}
diff --git a/config/webpack/loaders/erb.js b/config/webpack/loaders/erb.js
deleted file mode 100644
index 4cd7d684955..00000000000
--- a/config/webpack/loaders/erb.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-  test: /\.erb$/,
-  enforce: 'pre',
-  exclude: /node_modules/,
-  loader: 'rails-erb-loader',
-  options: {
-    runner: 'bin/rails runner'
-  }
-}

From 73730aad118354e6e13811abb26de7ba040cd736 Mon Sep 17 00:00:00 2001
From: Martin Hradil <mhradil@redhat.com>
Date: Thu, 1 Mar 2018 19:19:48 +0000
Subject: [PATCH 2/5] Webpack loaders - consistently use \.(extensions)$ regex,
 drop optional erb

we don't support erb, and the typescript loader was matching anything ending in ts, not .ts
---
 config/webpack/loaders/angular.js | 2 +-
 config/webpack/loaders/babel.js   | 2 +-
 config/webpack/loaders/react.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/webpack/loaders/angular.js b/config/webpack/loaders/angular.js
index cbb916e33e3..e921a429bd0 100644
--- a/config/webpack/loaders/angular.js
+++ b/config/webpack/loaders/angular.js
@@ -1,4 +1,4 @@
 module.exports = {
-  test: /.ts$/,
+  test: /\.(ts|tsx)$/,
   loader: 'ts-loader'
 }
diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index c608e708f37..c00ba3fdeb8 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -1,5 +1,5 @@
 module.exports = {
-  test: /\.js(\.erb)?$/,
+  test: /\.js$/,
   exclude: /node_modules/,
   loader: 'babel-loader'
 }
diff --git a/config/webpack/loaders/react.js b/config/webpack/loaders/react.js
index f5948cc4c29..e8a2c919ede 100644
--- a/config/webpack/loaders/react.js
+++ b/config/webpack/loaders/react.js
@@ -1,5 +1,5 @@
 module.exports = {
-  test: /\.(js|jsx)?(\.erb)?$/,
+  test: /\.(js|jsx)$/,
   exclude: /node_modules/,
   loader: 'babel-loader',
   query: {

From 827c781d05c60713b616065562cea366db0f8076 Mon Sep 17 00:00:00 2001
From: Martin Hradil <mhradil@redhat.com>
Date: Thu, 1 Mar 2018 19:20:46 +0000
Subject: [PATCH 3/5] Webpack loaders - don't ignore node_modules

we still want to compile es6 code to es5, regardless whether this comes from our code or from a npm dependency
---
 config/webpack/loaders/babel.js | 1 -
 config/webpack/loaders/react.js | 2 --
 2 files changed, 3 deletions(-)

diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index c00ba3fdeb8..484b68c0347 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -1,5 +1,4 @@
 module.exports = {
   test: /\.js$/,
-  exclude: /node_modules/,
   loader: 'babel-loader'
 }
diff --git a/config/webpack/loaders/react.js b/config/webpack/loaders/react.js
index e8a2c919ede..245cd51d643 100644
--- a/config/webpack/loaders/react.js
+++ b/config/webpack/loaders/react.js
@@ -1,9 +1,7 @@
 module.exports = {
   test: /\.(js|jsx)$/,
-  exclude: /node_modules/,
   loader: 'babel-loader',
   query: {
     presets: ['react'],
   },
 };
-

From 4d1260116e684246807848f3b4746ac85502bc7e Mon Sep 17 00:00:00 2001
From: Martin Hradil <mhradil@redhat.com>
Date: Thu, 1 Mar 2018 19:22:49 +0000
Subject: [PATCH 4/5] Drop unused loaders from package.json

no coffescript or erb anywhere in manageiq
---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 8b9adab9013..50b4d28fc0f 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,6 @@
     "babel-polyfill": "^6.23.0",
     "babel-preset-env": "~1.4.0",
     "babel-preset-react": "^6.24.1",
-    "coffee-loader": "~0.7.3",
-    "coffee-script": "~1.12.5",
     "compression-webpack-plugin": "~0.4.0",
     "css-loader": "~0.28.0",
     "eslint": "^4.14.0",
@@ -84,7 +82,6 @@
     "postcss-loader": "~1.3.3",
     "postcss-smart-import": "~0.6.11",
     "precss": "~1.4.0",
-    "rails-erb-loader": "~5.0.0",
     "resolve-url-loader": "^2.0.2",
     "sass-loader": "~6.0.3",
     "style-loader": "~0.16.1",

From 16886773788e12d9ab69a9e6702c2f751a7dce23 Mon Sep 17 00:00:00 2001
From: Martin Hradil <mhradil@redhat.com>
Date: Thu, 1 Mar 2018 19:27:49 +0000
Subject: [PATCH 5/5] webpack - Drop coffee & erb from supported extensions,
 add tsx

---
 config/webpacker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/webpacker.yml b/config/webpacker.yml
index 05e3bf20080..057618bb7b1 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -6,11 +6,10 @@ default: &default
   public_output_path: packs
 
   extensions:
-  - .coffee
-  - .erb
   - .js
   - .jsx
   - .ts
+  - .tsx
   - .vue
   - .sass
   - .scss