Skip to content

Commit

Permalink
Merge branch 'master' into master-xmr-docs-show-nav-btn-mobile
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Apr 18, 2019
2 parents 07fbb9b + 091aa1e commit b103aff
Show file tree
Hide file tree
Showing 70 changed files with 3,606 additions and 3,180 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.json
Expand Up @@ -47,7 +47,11 @@
"unicorn/filename-case": "off",
"unicorn/import-index": "off",
"unicorn/no-unused-properties": "error",
"unicorn/prefer-includes": "off",
"unicorn/prefer-node-append": "off",
"unicorn/prefer-query-selector": "off"
"unicorn/prefer-node-remove": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prefer-text-content": "off",
"unicorn/prevent-abbreviations": "off"
}
}
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -95,6 +95,10 @@ bootstrap/
├── bootstrap.bundle.js.map
├── bootstrap.bundle.min.js
├── bootstrap.bundle.min.js.map
├── bootstrap.esm.js
├── bootstrap.esm.js.map
├── bootstrap.esm.min.js
├── bootstrap.esm.min.js.map
├── bootstrap.js
├── bootstrap.js.map
├── bootstrap.min.js
Expand Down
48 changes: 12 additions & 36 deletions build/rollup.config.js
Expand Up @@ -11,42 +11,18 @@ const ESM = process.env.ESM === 'true'
let fileDest = `bootstrap${ESM ? '.esm' : ''}`
const external = ['popper.js']
const plugins = [
babel(ESM ?
{
// Only transpile our source code
exclude: 'node_modules/**',
babelrc: false,
presets: [
[
'@babel/env',
{
loose: true,
modules: false,
targets: {
browsers: [
'Chrome >= 60',
'Safari >= 10.1',
'iOS >= 10.3',
'Firefox >= 54',
'Edge >= 15'
]
}
}
]
]
} :
{
// Only transpile our source code
exclude: 'node_modules/**',
// Include only required helpers
externalHelpersWhitelist: [
'defineProperties',
'createClass',
'inheritsLoose',
'defineProperty',
'objectSpread'
]
})
babel({
// Only transpile our source code
exclude: 'node_modules/**',
// Include only required helpers
externalHelpersWhitelist: [
'defineProperties',
'createClass',
'inheritsLoose',
'defineProperty',
'objectSpread'
]
})
]
const globals = {
'popper.js': 'Popper'
Expand Down
4 changes: 2 additions & 2 deletions config.yml
Expand Up @@ -54,5 +54,5 @@ params:
js_hash: "sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-xrRywqdh3PHs8keKZN+8zzc5TX0GRTLCcmivcbNJWm2rs5C8PRhcEn3czEjhAO9o"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
popper_hash: "sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/umd/popper.min.js"
popper_hash: "sha384-L2pyEeut/H3mtgCBaUNw7KWzp5n9+4pDQiExs933/5QfaTh8YStYFFkOzSoXjlTb"
2 changes: 1 addition & 1 deletion dist/css/bootstrap-grid.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.css

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

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.min.css

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

2 changes: 1 addition & 1 deletion dist/css/bootstrap-reboot.min.css.map

Large diffs are not rendered by default.

0 comments on commit b103aff

Please sign in to comment.