Skip to content

Commit

Permalink
Merge branch 'master' into v5-drop-hover-query
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed May 8, 2019
2 parents ef93b5d + 438e01b commit 9ee9de5
Show file tree
Hide file tree
Showing 69 changed files with 121 additions and 123 deletions.
1 change: 0 additions & 1 deletion .eslintrc.json
Expand Up @@ -44,7 +44,6 @@
"never"
],
"unicorn/explicit-length-check": "off",
"unicorn/filename-case": "off",
"unicorn/import-index": "off",
"unicorn/no-unused-properties": "error",
"unicorn/prefer-includes": "off",
Expand Down
34 changes: 17 additions & 17 deletions build/build-plugins.js
Expand Up @@ -29,9 +29,9 @@ const plugins = [
]
const bsPlugins = {
Data: path.resolve(__dirname, '../js/src/dom/data.js'),
EventHandler: path.resolve(__dirname, '../js/src/dom/eventHandler.js'),
EventHandler: path.resolve(__dirname, '../js/src/dom/event-handler.js'),
Manipulator: path.resolve(__dirname, '../js/src/dom/manipulator.js'),
SelectorEngine: path.resolve(__dirname, '../js/src/dom/selectorEngine.js'),
SelectorEngine: path.resolve(__dirname, '../js/src/dom/selector-engine.js'),
Alert: path.resolve(__dirname, '../js/src/alert.js'),
Button: path.resolve(__dirname, '../js/src/button.js'),
Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
Expand Down Expand Up @@ -135,24 +135,25 @@ function getConfigByPluginKey(pluginKey) {
}
}

const utilObjects = [
'Util',
'Sanitizer'
]

const domObjects = [
'Data',
'EventHandler',
'Manipulator',
'SelectorEngine'
]

function build(plugin) {
console.log(`Building ${plugin} plugin...`)

const { external, globals } = getConfigByPluginKey(plugin)
const pluginFilename = path.basename(bsPlugins[plugin])
let pluginPath = rootPath

const utilObjects = [
'Util',
'Sanitizer'
]

const domObjects = [
'Data',
'EventHandler',
'Manipulator',
'SelectorEngine'
]

if (utilObjects.includes(plugin)) {
pluginPath = `${rootPath}/util/`
}
Expand All @@ -161,8 +162,6 @@ function build(plugin) {
pluginPath = `${rootPath}/dom/`
}

const pluginFilename = `${plugin.toLowerCase()}.js`

rollup.rollup({
input: bsPlugins[plugin],
plugins,
Expand All @@ -181,4 +180,5 @@ function build(plugin) {
})
}

Object.keys(bsPlugins).forEach(plugin => build(plugin))
Object.keys(bsPlugins)
.forEach(plugin => build(plugin))
4 changes: 2 additions & 2 deletions dist/js/bootstrap.bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.bundle.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/bootstrap.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.esm.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.esm.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/bootstrap.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/dist/alert.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9ee9de5

Please sign in to comment.