From 340236cbe4a5bfb3fb3583f177ba7a493bb4f21c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 26 May 2020 06:14:12 +0300
Subject: Update to `@rollup/plugin-babel` (#30742)

---
 js/tests/integration/rollup.bundle.js |  5 +++--
 js/tests/karma.conf.js                | 10 +++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'js')

diff --git a/js/tests/integration/rollup.bundle.js b/js/tests/integration/rollup.bundle.js
index d09a9dbbe2..0ac6e406ae 100644
--- a/js/tests/integration/rollup.bundle.js
+++ b/js/tests/integration/rollup.bundle.js
@@ -1,7 +1,7 @@
 /* eslint-env node */
 
 const resolve = require('@rollup/plugin-node-resolve')
-const babel = require('rollup-plugin-babel')
+const { babel } = require('@rollup/plugin-babel')
 
 module.exports = {
   input: 'js/tests/integration/bundle.js',
@@ -12,7 +12,8 @@ module.exports = {
   plugins: [
     resolve(),
     babel({
-      exclude: 'node_modules/**'
+      exclude: 'node_modules/**',
+      babelHelpers: 'bundled'
     })
   ]
 }
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 6e1effc3a3..8281593e25 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -1,7 +1,7 @@
 /* eslint-env node */
 const path = require('path')
 const ip = require('ip')
-const babel = require('rollup-plugin-babel')
+const { babel } = require('@rollup/plugin-babel')
 const istanbul = require('rollup-plugin-istanbul')
 const resolve = require('@rollup/plugin-node-resolve')
 
@@ -9,7 +9,6 @@ const {
   browsers,
   browsersKeys
 } = require('./browsers')
-const babelHelpers = require('../../build/babel-helpers.js')
 
 const { env } = process
 const browserStack = env.BROWSER === 'true'
@@ -77,11 +76,8 @@ const conf = {
       babel({
         // Only transpile our source code
         exclude: 'node_modules/**',
-        // Include only required helpers
-        externalHelpersWhitelist: babelHelpers,
-        plugins: [
-          '@babel/plugin-proposal-object-rest-spread'
-        ]
+        // Inline the required helpers in each file
+        babelHelpers: 'inline'
       }),
       resolve()
     ],
-- 
cgit v1.2.3