diff options
author | Johann-S <johann.servoire@gmail.com> | 2018-10-14 14:59:51 +0300 |
---|---|---|
committer | XhmikosR <xhmikosr@gmail.com> | 2018-10-20 15:32:09 +0300 |
commit | c08652cfe84051184570d704d3a0904e8d01358c (patch) | |
tree | 789d1a191cfd9fbc6632b564d756eae42cf9cd40 /build | |
parent | caefd7046372e954d21550bbdadcabf98b2a86f0 (diff) |
swipe left/right without hammerjs
Diffstat (limited to 'build')
-rw-r--r-- | build/build-plugins.js | 11 | ||||
-rw-r--r-- | build/generate-sri.js | 4 | ||||
-rw-r--r-- | build/rollup.config.js | 26 |
3 files changed, 14 insertions, 27 deletions
diff --git a/build/build-plugins.js b/build/build-plugins.js index 299f502d9d..1de65b426d 100644 --- a/build/build-plugins.js +++ b/build/build-plugins.js @@ -5,10 +5,10 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -const path = require('path') -const rollup = require('rollup') -const babel = require('rollup-plugin-babel') -const banner = require('./banner.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 plugins = [ @@ -41,9 +41,8 @@ const rootPath = TEST ? '../js/coverage/dist/' : '../js/dist/' function build(plugin) { console.log(`Building ${plugin} plugin...`) - const external = ['hammerjs', 'jquery', 'popper.js'] + const external = ['jquery', 'popper.js'] const globals = { - hammerjs: 'Hammer', jquery: 'jQuery', // Ensure we use jQuery which is always available even in noConflict mode 'popper.js': 'Popper' } diff --git a/build/generate-sri.js b/build/generate-sri.js index 13b90db1ce..6929097703 100644 --- a/build/generate-sri.js +++ b/build/generate-sri.js @@ -42,10 +42,6 @@ const files = [ { file: 'node_modules/popper.js/dist/umd/popper.min.js', configPropertyName: 'popper_hash' - }, - { - file: 'node_modules/hammerjs/hammer.min.js', - configPropertyName: 'hammer_hash' } ] diff --git a/build/rollup.config.js b/build/rollup.config.js index 72e3951fa6..c8acf7a9e9 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -1,13 +1,12 @@ -const path = require('path') -const babel = require('rollup-plugin-babel') -const resolve = require('rollup-plugin-node-resolve') -const commonjs = require('rollup-plugin-commonjs') -const banner = require('./banner.js') +const path = require('path') +const babel = require('rollup-plugin-babel') +const resolve = require('rollup-plugin-node-resolve') +const banner = require('./banner.js') const BUNDLE = process.env.BUNDLE === 'true' -let fileDest = 'bootstrap.js' -const external = ['jquery', 'hammerjs', 'popper.js'] +let fileDest = 'bootstrap.js' +const external = ['jquery', 'popper.js'] const plugins = [ babel({ exclude: 'node_modules/**', // Only transpile our source code @@ -22,22 +21,15 @@ const plugins = [ ] const globals = { jquery: 'jQuery', // Ensure we use jQuery which is always available even in noConflict mode - hammerjs: 'Hammer', 'popper.js': 'Popper' } if (BUNDLE) { fileDest = 'bootstrap.bundle.js' - // We just keep jQuery as external - external.length = 1 + // Remove last entry in external array to bundle Popper + external.pop() delete globals['popper.js'] - delete globals.hammerjs - plugins.push( - commonjs({ - include: 'node_modules/**' - }), - resolve() - ) + plugins.push(resolve()) } module.exports = { |