Skip to content

Commit

Permalink
Merge branch 'main' into master-xmr-pa11y-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR authored Nov 19, 2020
2 parents 2bbf187 + 65d6c8a commit a02bb10
Show file tree
Hide file tree
Showing 196 changed files with 6,219 additions and 3,678 deletions.
4 changes: 2 additions & 2 deletions .bundlewatch.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
},
{
"path": "./dist/css/bootstrap-utilities.min.css",
"maxSize": "6 kB"
"maxSize": "6.25 kB"
},
{
"path": "./dist/css/bootstrap.css",
"maxSize": "24 kB"
},
{
"path": "./dist/css/bootstrap.min.css",
"maxSize": "21.75 kB"
"maxSize": "22 kB"
},
{
"path": "./dist/js/bootstrap.bundle.js",
Expand Down
4 changes: 0 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,11 @@
"unicorn/no-null": "off",
"unicorn/no-unused-properties": "error",
"unicorn/no-useless-undefined": "off",
"unicorn/prefer-array-find": "off",
"unicorn/prefer-dataset": "off",
"unicorn/prefer-includes": "off",
"unicorn/prefer-node-append": "off",
"unicorn/prefer-node-remove": "off",
"unicorn/prefer-number-properties": "off",
"unicorn/prefer-optional-catch-binding": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prefer-set-has": "off",
"unicorn/prevent-abbreviations": "off"
}
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ Our default branch is for development of our upcoming Bootstrap 5 release. Head

Several quick start options are available:

- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.0-alpha2.zip)
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.0-alpha3.zip)
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@next`
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@next`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0-alpha2`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0-alpha3`
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`

Read the [Getting started page](https://v5.getbootstrap.com/docs/5.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
Expand Down
12 changes: 6 additions & 6 deletions build/build-plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@ const getConfigByPluginKey = pluginKey => {
}
}

const utilObjects = [
const utilObjects = new Set([
'Util',
'Sanitizer'
]
])

const domObjects = [
const domObjects = new Set([
'Data',
'EventHandler',
'Manipulator',
'SelectorEngine'
]
])

const build = async plugin => {
console.log(`Building ${plugin} plugin...`)
Expand All @@ -144,11 +144,11 @@ const build = async plugin => {
const pluginFilename = path.basename(bsPlugins[plugin])
let pluginPath = rootPath

if (utilObjects.includes(plugin)) {
if (utilObjects.has(plugin)) {
pluginPath = `${rootPath}/util/`
}

if (domObjects.includes(plugin)) {
if (domObjects.has(plugin)) {
pluginPath = `${rootPath}/dom/`
}

Expand Down
22 changes: 11 additions & 11 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ params:
social_image_path: /docs/5.0/assets/brand/bootstrap-social.png
social_logo_path: /docs/5.0/assets/brand/bootstrap-social-logo.png

current_version: "5.0.0-alpha2"
current_ruby_version: "5.0.0.alpha2"
current_version: "5.0.0-alpha3"
current_ruby_version: "5.0.0.alpha3"
docs_version: "5.0"
rfs_version: "9.0.3"
github_org: "https://github.com/twbs"
Expand All @@ -61,17 +61,17 @@ params:
icons: "https://icons.getbootstrap.com/"

download:
source: "https://github.com/twbs/bootstrap/archive/v5.0.0-alpha2.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-alpha2/bootstrap-5.0.0-alpha2-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-alpha2/bootstrap-5.0.0-alpha2-examples.zip"
source: "https://github.com/twbs/bootstrap/archive/v5.0.0-alpha3.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-alpha3/bootstrap-5.0.0-alpha3-dist.zip"
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-alpha3/bootstrap-5.0.0-alpha3-examples.zip"

cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: "https://cdn.jsdelivr.net/npm/[email protected]alpha2/dist/css/bootstrap.min.css"
css_hash: "sha384-DhY6onE6f3zzKbjUPRc2hOzGAdEf4/Dz+WJwBvEYL/lkkIsI3ihufq9hk9K4lVoK"
js: "https://cdn.jsdelivr.net/npm/[email protected]alpha2/dist/js/bootstrap.min.js"
js_hash: "sha384-5h4UG+6GOuV9qXh6HqOLwZMY4mnLPraeTrjT5v07o347pj6IkfuoASuGBhfDsp3d"
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected]alpha2/dist/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-BOsAfwzjNJHrJ8cZidOg56tcQWfp6y72vEJ8xQ9w6Quywb24iOsW913URv1IS4GD"
css: "https://cdn.jsdelivr.net/npm/[email protected]alpha3/dist/css/bootstrap.min.css"
css_hash: "sha384-CuOF+2SnTUfTwSZjCXf01h7uYhfOBuxIhGKPbfEJ3+FqH/s6cIFN9bGr1HmAg4fQ"
js: "https://cdn.jsdelivr.net/npm/[email protected]alpha3/dist/js/bootstrap.min.js"
js_hash: "sha384-t6I8D5dJmMXjCsRLhSzCltuhNZg6P10kE0m0nAncLUjH6GeYLhRU1zfLoW3QNQDF"
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected]alpha3/dist/js/bootstrap.bundle.min.js"
js_bundle_hash: "sha384-popRpmFF9JQgExhfw5tZT4I9/CI5e2QcuUZPOVXb1m7qUmeR2b50u+YFEYe1wgzy"
popper: "https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
popper_hash: "sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
Loading

0 comments on commit a02bb10

Please sign in to comment.