From ce12cd9b4c853f945184a4f3a22931ce397b7506 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  babel from 3rd-party

- Consume prod babel from @theforeman/builder/babel
- Consume dev  babel from @theforeman/env/babel
---
 .babelrc                 | 18 ------------------
 .babelrc.js              |  3 +++
 config/webpack.config.js | 13 ++-----------
 package.json             | 17 +++++------------
 webpack/stories/index.js |  1 -
 5 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 .babelrc
 create mode 100644 .babelrc.js

diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 854be12e262..00000000000
--- 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 00000000000..45cb3784f7a
--- /dev/null
+++ b/.babelrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['@theforeman/builder/babel'],
+};
diff --git a/config/webpack.config.js b/config/webpack.config.js
index ac6ce40bde0..76dcac5dffe 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -134,17 +134,8 @@ module.exports = env => {
           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')
-            ]
-          }
+            presets: [require.resolve('@theforeman/builder/babel')]
+          },
         },
         {
           test: /\.css$/,
diff --git a/package.json b/package.json
index cd14761d75d..04ea94116e8 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.3.2",
     "intl": "~1.2.5",
     "jed": "^1.1.1",
     "react-intl": "^2.8.0"
@@ -29,27 +29,20 @@
     "chromedriver": "77.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.0",
     "@storybook/addon-actions": "~3.4.12",
     "@storybook/addon-knobs": "~3.4.12",
     "@storybook/addon-storysource": "^3.4.12",
     "@storybook/react": "~3.4.12",
     "@storybook/storybook-deployer": "^2.0.0",
-    "@theforeman/vendor-dev": "^3.0.0",
+    "@theforeman/builder": "^3.3.2",
+    "@theforeman/env": "^3.3.2",
+    "@theforeman/vendor-dev": "^3.3.2",
     "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 5b3d9c603e8..d48a5d29674 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';