From 1062f27906d4f14ccd46dd70dc20503443585d91 Mon Sep 17 00:00:00 2001
From: Avi Sharvit <sharvita@gmail.com>
Date: Thu, 14 Nov 2019 09:39:51 +0200
Subject: [PATCH] Fixes #28270 - consume  @theforeman/babel

---
 .babelrc                 | 18 ------------------
 .babelrc.js              |  3 +++
 config/webpack.config.js | 14 ++------------
 package.json             | 16 ++++------------
 webpack/stories/index.js |  1 -
 5 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 .babelrc
 create mode 100644 .babelrc.js

diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 854be12e2621..000000000000
--- a/.babelrc
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": [
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-transform-object-assign",
-    "@babel/plugin-syntax-dynamic-import"
-  ],
-  "env": {
-    "test": {
-      "presets": ["@theforeman/vendor-dev/babel.preset.js"],
-      "plugins": ["dynamic-import-node"]
-    },
-    "storybook": {
-      "presets": ["@theforeman/vendor-dev/babel.preset.js"]
-    }
-  }
-}
diff --git a/.babelrc.js b/.babelrc.js
new file mode 100644
index 000000000000..b24a96fc89c7
--- /dev/null
+++ b/.babelrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  presets: [require.resolve('@theforeman/babel')],
+};
diff --git a/config/webpack.config.js b/config/webpack.config.js
index ac6ce40bde0f..6fe6314bfd3b 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-var*/
 'use strict';
 
+var babelOptions = require('../.babelrc.js');
 var path = require('path');
 var webpack = require('webpack');
 var ForemanVendorPlugin = require('@theforeman/vendor').WebpackForemanVendorPlugin;
@@ -133,18 +134,7 @@ module.exports = env => {
           unidiff can be removed once https://github.com/mvoss9000/unidiff/pull/1 is merged */
           exclude: /node_modules(?!\/(@novnc|unidiff))/,
           loader: 'babel-loader',
-          options: {
-            'presets': [
-              path.join(__dirname, '..', 'node_modules/@babel/preset-react'),
-              path.join(__dirname, '..', 'node_modules/@babel/preset-env')
-            ],
-            'plugins': [
-              path.join(__dirname, '..', 'node_modules/@babel/plugin-proposal-class-properties'),
-              path.join(__dirname, '..', 'node_modules/@babel/plugin-proposal-object-rest-spread'),
-              path.join(__dirname, '..', 'node_modules/@babel/plugin-transform-object-assign'),
-              path.join(__dirname, '..', 'node_modules/@babel/plugin-syntax-dynamic-import')
-            ]
-          }
+          options: babelOptions,
         },
         {
           test: /\.css$/,
diff --git a/package.json b/package.json
index 9df80fedce37..65b6c4c70d0d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "create-react-component": "yo react-domain"
   },
   "dependencies": {
-    "@theforeman/vendor": "^3.0.0",
+    "@theforeman/vendor": "^3.2.0",
     "intl": "~1.2.5",
     "jed": "^1.1.1",
     "react-intl": "^2.8.0"
@@ -34,22 +34,14 @@
     "@storybook/addon-storysource": "^3.4.12",
     "@storybook/react": "~3.4.12",
     "@storybook/storybook-deployer": "^2.0.0",
-    "@theforeman/vendor-dev": "^3.0.0",
+    "@theforeman/babel": "^3.2.0",
+    "@theforeman/env": "^3.2.0",
+    "@theforeman/vendor-dev": "^3.2.0",
     "argv-parse": "^1.0.1",
     "axios-mock-adapter": "^1.10.0",
-    "@babel/cli": "^7.7.0",
-    "@babel/core": "^7.7.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-    "@babel/plugin-transform-object-assign": "^7.2.0",
-    "@babel/preset-env": "^7.7.0",
-    "@babel/preset-react": "^7.7.0",
-    "@babel/register": "^7.7.0",
     "babel-eslint": "^10.0.0",
     "babel-jest": "^24.9.0",
     "babel-loader": "^8.0.0",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
     "compression-webpack-plugin": "~1.1.11",
     "coveralls": "^3.0.0",
     "cross-env": "^5.2.0",
diff --git a/webpack/stories/index.js b/webpack/stories/index.js
index c4ce7b3a7518..a33e246294a0 100644
--- a/webpack/stories/index.js
+++ b/webpack/stories/index.js
@@ -1,6 +1,5 @@
 import 'core-js/shim';
 import 'regenerator-runtime/runtime';
-
 import React from 'react';
 import { configure, storiesOf } from '@storybook/react';
 import Markdown from './components/Markdown';