From 7a9bbd4489dc9343db2ae269037a9dc0ca2cb52d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 26 May 2020 19:20:15 +0300
Subject: Backport #30742

Update to `@rollup/plugin-babel`
---
 build/babel-helpers.js | 13 -------------
 build/build-plugins.js | 15 +++++++--------
 build/rollup.config.js | 17 ++++++++---------
 3 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 build/babel-helpers.js

(limited to 'build')

diff --git a/build/babel-helpers.js b/build/babel-helpers.js
deleted file mode 100644
index d444628f6..000000000
--- a/build/babel-helpers.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict'
-
-// These are the babel helpers we whitelist
-const helpers = [
-  'createClass',
-  'createSuper',
-  'defineProperties',
-  'defineProperty',
-  'inheritsLoose',
-  'objectSpread2'
-]
-
-module.exports = helpers
diff --git a/build/build-plugins.js b/build/build-plugins.js
index 9e4f2e1c3..00ae91d5d 100644
--- a/build/build-plugins.js
+++ b/build/build-plugins.js
@@ -9,19 +9,18 @@
 
 'use strict'
 
-const path    = require('path')
-const rollup  = require('rollup')
-const babel   = require('rollup-plugin-babel')
-const banner  = require('./banner.js')
-const babelHelpers = require('./babel-helpers.js')
+const path = require('path')
+const rollup = require('rollup')
+const { babel } = require('@rollup/plugin-babel')
+const banner = require('./banner.js')
 
-const TEST    = process.env.NODE_ENV === 'test'
+const TEST = process.env.NODE_ENV === 'test'
 const plugins = [
   babel({
     // Only transpile our source code
     exclude: 'node_modules/**',
-    // Include only required helpers
-    externalHelpersWhitelist: babelHelpers
+    // Inline the required helpers in each file
+    babelHelpers: 'inline'
   })
 ]
 const bsPlugins = {
diff --git a/build/rollup.config.js b/build/rollup.config.js
index 2d43194fe..95e412f0e 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -1,21 +1,20 @@
 'use strict'
 
-const path    = require('path')
-const babel   = require('rollup-plugin-babel')
+const path = require('path')
+const { babel } = require('@rollup/plugin-babel')
 const resolve = require('@rollup/plugin-node-resolve')
-const banner  = require('./banner.js')
-const babelHelpers = require('./babel-helpers.js')
+const banner = require('./banner.js')
 
-const BUNDLE  = process.env.BUNDLE === 'true'
+const BUNDLE = process.env.BUNDLE === 'true'
 
-let fileDest  = 'bootstrap.js'
+let fileDest = 'bootstrap.js'
 const external = ['jquery', 'popper.js']
 const plugins = [
   babel({
-  // Only transpile our source code
+    // Only transpile our source code
     exclude: 'node_modules/**',
-    // Include only required helpers
-    externalHelpersWhitelist: babelHelpers
+    // Include the helpers in the bundle, at most one copy of each
+    babelHelpers: 'bundled'
   })
 ]
 const globals = {
-- 
cgit v1.2.3