diff options
author | Johann-S <johann.servoire@gmail.com> | 2020-06-19 11:17:01 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@gmail.com> | 2020-12-06 19:42:40 +0300 |
commit | adfdf7160b5822aae12eea677e7dd3128d2569bf (patch) | |
tree | dc09bbdff9ce3457867d28aadc583f0de6da0ec2 /build | |
parent | 5f89ea3a0f9b56547eb03b98afcd189b89d7e5a6 (diff) |
Update to popper.js v2.x
Diffstat (limited to 'build')
-rw-r--r-- | build/build-plugins.js | 6 | ||||
-rw-r--r-- | build/generate-sri.js | 2 | ||||
-rw-r--r-- | build/rollup.config.js | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/build/build-plugins.js b/build/build-plugins.js index 7deda49b12..78f76622a4 100644 --- a/build/build-plugins.js +++ b/build/build-plugins.js @@ -14,6 +14,7 @@ const rollup = require('rollup') const { babel } = require('@rollup/plugin-babel') const banner = require('./banner.js') +const rootPath = path.resolve(__dirname, '../js/dist/') const plugins = [ babel({ // Only transpile our source code @@ -39,7 +40,6 @@ const bsPlugins = { Toast: path.resolve(__dirname, '../js/src/toast.js'), Tooltip: path.resolve(__dirname, '../js/src/tooltip.js') } -const rootPath = path.resolve(__dirname, '../js/dist/') const defaultPluginConfig = { external: [ @@ -87,9 +87,9 @@ const getConfigByPluginKey = pluginKey => { if (pluginKey === 'Dropdown' || pluginKey === 'Tooltip') { const config = Object.assign(defaultPluginConfig) - config.external.push(bsPlugins.Manipulator, 'popper.js') + config.external.push(bsPlugins.Manipulator, '@popperjs/core') config.globals[bsPlugins.Manipulator] = 'Manipulator' - config.globals['popper.js'] = 'Popper' + config.globals['@popperjs/core'] = 'Popper' return config } diff --git a/build/generate-sri.js b/build/generate-sri.js index 0c272ceadd..8a2e59360a 100644 --- a/build/generate-sri.js +++ b/build/generate-sri.js @@ -42,7 +42,7 @@ const files = [ configPropertyName: 'js_bundle_hash' }, { - file: 'node_modules/popper.js/dist/umd/popper.min.js', + file: 'node_modules/@popperjs/core/dist/umd/popper.min.js', configPropertyName: 'popper_hash' } ] diff --git a/build/rollup.config.js b/build/rollup.config.js index 05579d165a..7f9c1c7e11 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -3,13 +3,14 @@ const path = require('path') const { babel } = require('@rollup/plugin-babel') const { nodeResolve } = require('@rollup/plugin-node-resolve') +const replace = require('@rollup/plugin-replace') const banner = require('./banner.js') const BUNDLE = process.env.BUNDLE === 'true' const ESM = process.env.ESM === 'true' let fileDest = `bootstrap${ESM ? '.esm' : ''}` -const external = ['popper.js'] +const external = ['@popperjs/core'] const plugins = [ babel({ // Only transpile our source code @@ -19,15 +20,15 @@ const plugins = [ }) ] const globals = { - 'popper.js': 'Popper' + '@popperjs/core': 'Popper' } if (BUNDLE) { fileDest += '.bundle' // Remove last entry in external array to bundle Popper external.pop() - delete globals['popper.js'] - plugins.push(nodeResolve()) + delete globals['@popperjs/core'] + plugins.push(replace({ 'process.env.NODE_ENV': '"production"' }), nodeResolve()) } const rollupConfig = { |