From a9e19cb89ed08689dc58c92b3d5491318a703f0e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 22 Aug 2020 19:40:57 +0200 Subject: composer update bootstrap --- vendor/twbs/bootstrap/build/babel-helpers.js | 13 ------------- vendor/twbs/bootstrap/build/banner.js | 2 +- vendor/twbs/bootstrap/build/build-plugins.js | 17 ++++++++--------- vendor/twbs/bootstrap/build/change-version.js | 2 +- vendor/twbs/bootstrap/build/generate-sri.js | 2 +- vendor/twbs/bootstrap/build/rollup.config.js | 21 ++++++++++----------- vendor/twbs/bootstrap/build/vnu-jar.js | 2 +- vendor/twbs/bootstrap/build/zip-examples.js | 2 +- 8 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 vendor/twbs/bootstrap/build/babel-helpers.js (limited to 'vendor/twbs/bootstrap/build') diff --git a/vendor/twbs/bootstrap/build/babel-helpers.js b/vendor/twbs/bootstrap/build/babel-helpers.js deleted file mode 100644 index d444628f6..000000000 --- a/vendor/twbs/bootstrap/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/vendor/twbs/bootstrap/build/banner.js b/vendor/twbs/bootstrap/build/banner.js index 453fc3b6e..df82ff32e 100644 --- a/vendor/twbs/bootstrap/build/banner.js +++ b/vendor/twbs/bootstrap/build/banner.js @@ -7,7 +7,7 @@ function getBanner(pluginFilename) { return `/*! * Bootstrap${pluginFilename ? ` ${pluginFilename}` : ''} v${pkg.version} (${pkg.homepage}) * Copyright 2011-${year} ${pkg.author} - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */` } diff --git a/vendor/twbs/bootstrap/build/build-plugins.js b/vendor/twbs/bootstrap/build/build-plugins.js index 9e4f2e1c3..3829bb294 100644 --- a/vendor/twbs/bootstrap/build/build-plugins.js +++ b/vendor/twbs/bootstrap/build/build-plugins.js @@ -4,24 +4,23 @@ * Script to build our plugins to use them separately. * Copyright 2020 The Bootstrap Authors * Copyright 2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ '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/vendor/twbs/bootstrap/build/change-version.js b/vendor/twbs/bootstrap/build/change-version.js index ec3c77857..d1131237c 100644 --- a/vendor/twbs/bootstrap/build/change-version.js +++ b/vendor/twbs/bootstrap/build/change-version.js @@ -4,7 +4,7 @@ * Script to update version number references in the project. * Copyright 2017-2020 The Bootstrap Authors * Copyright 2017-2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ 'use strict' diff --git a/vendor/twbs/bootstrap/build/generate-sri.js b/vendor/twbs/bootstrap/build/generate-sri.js index ca2920ef2..d340b5378 100644 --- a/vendor/twbs/bootstrap/build/generate-sri.js +++ b/vendor/twbs/bootstrap/build/generate-sri.js @@ -7,7 +7,7 @@ * * Copyright 2017-2020 The Bootstrap Authors * Copyright 2017-2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ 'use strict' diff --git a/vendor/twbs/bootstrap/build/rollup.config.js b/vendor/twbs/bootstrap/build/rollup.config.js index 2d43194fe..6294204cd 100644 --- a/vendor/twbs/bootstrap/build/rollup.config.js +++ b/vendor/twbs/bootstrap/build/rollup.config.js @@ -1,21 +1,20 @@ 'use strict' -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 path = require('path') +const { babel } = require('@rollup/plugin-babel') +const { nodeResolve } = require('@rollup/plugin-node-resolve') +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 = { @@ -28,7 +27,7 @@ if (BUNDLE) { // Remove last entry in external array to bundle Popper external.pop() delete globals['popper.js'] - plugins.push(resolve()) + plugins.push(nodeResolve()) } module.exports = { diff --git a/vendor/twbs/bootstrap/build/vnu-jar.js b/vendor/twbs/bootstrap/build/vnu-jar.js index ebd027adc..f4a4141c1 100644 --- a/vendor/twbs/bootstrap/build/vnu-jar.js +++ b/vendor/twbs/bootstrap/build/vnu-jar.js @@ -4,7 +4,7 @@ * Script to run vnu-jar if Java is available. * Copyright 2017-2020 The Bootstrap Authors * Copyright 2017-2020 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ 'use strict' diff --git a/vendor/twbs/bootstrap/build/zip-examples.js b/vendor/twbs/bootstrap/build/zip-examples.js index 3f7fb9abb..5d6d31454 100644 --- a/vendor/twbs/bootstrap/build/zip-examples.js +++ b/vendor/twbs/bootstrap/build/zip-examples.js @@ -4,7 +4,7 @@ * Script to create the built examples zip archive; * requires the `zip` command to be present! * Copyright 2020 The Bootstrap Authors - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ 'use strict' -- cgit v1.2.3