Fixes #28270 - consume babel from 3rd-party

- Consume prod babel from @theforeman/builder/babel - Consume dev babel from @theforeman/env/babel
theforeman · Dec 1, 2019 · bec5ad8 · bec5ad8
1 parent 7b25593
commit bec5ad8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 42 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.babelrc.js 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
@@ -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
@@ -20,7 +20,7 @@
     "create-react-component": "yo react-domain"
   },
   "dependencies": {
-    "@theforeman/vendor": "^3.0.0",
+    "@theforeman/vendor": "^3.3.1",
     "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.1",
+    "@theforeman/env": "^3.3.1",
+    "@theforeman/vendor-dev": "^3.3.1",
     "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
@@ -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';