diff --git a/webapp/configs/babel.config.js b/webapp/configs/babel.config.js
index 15f601d7f5..967c7cd34b 100644
--- a/webapp/configs/babel.config.js
+++ b/webapp/configs/babel.config.js
@@ -18,28 +18,34 @@ module.exports = {
   compact: prod,
   presets: [
     "@babel/preset-react",
-    ['@babel/preset-typescript', { isTSX: true, allExtensions: true, onlyRemoveTypeImports: true }],
+    ['@babel/preset-typescript', { isTSX: true, allExtensions:true }],
     [
       "@babel/preset-env",
       {
-        targets: {
-          esmodules: true,
-        },
         modules: false,
-        // "useBuiltIns": "usage"
+        targets: {
+          browsers: [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 edge version",
+            "last 1 safari version"
+          ]
+        },
+        exclude: ["transform-async-to-generator", "transform-regenerator"],
       }
-    ]
+    ],
   ],
   plugins: [
     '@babel/plugin-syntax-dynamic-import',
     'babel-plugin-transform-typescript-metadata',
+    '@babel/plugin-proposal-nullish-coalescing-operator',
     '@babel/plugin-proposal-optional-chaining',
     ['@babel/plugin-proposal-decorators', { legacy: true }],
     ['@babel/plugin-proposal-class-properties', { loose: true }],
     ["@babel/plugin-proposal-object-rest-spread", { loose: true, useBuiltIns: true }],
     'react-require',
     'reshadow/babel',
-    /*!prod &&*/ [
+    /*!prod &&*/[
       "babel-plugin-module-resolver",
       {
         alias: {
diff --git a/webapp/configs/webpack.product.config.js b/webapp/configs/webpack.product.config.js
index 027a0327e3..9240cbd74e 100644
--- a/webapp/configs/webpack.product.config.js
+++ b/webapp/configs/webpack.product.config.js
@@ -28,7 +28,7 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
     splitChunks: {
       cacheGroups: {
         vendor: {
-          test: /[\\/]node_modules[\\/]/,
+          test: /[\\/]node_modules[\\/](?!@ag-grid)(.[a-zA-Z0-9.\-_]+)[\\/]/,
           name: 'vendors',
           chunks: 'all',
         },