Skip to content

Commit 7a128bf

Browse files
committed
refactor: update Bootstrap to 5.0.2
2 parents 64a428b + 7f053bd commit 7a128bf

File tree

185 files changed

+6097
-3477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+6097
-3477
lines changed

.bundlewatch.config.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
"files": [
33
{
44
"path": "./dist/css/coreui-grid.css",
5-
"maxSize": "7 kB"
5+
"maxSize": "7.25 kB"
66
},
77
{
88
"path": "./dist/css/coreui-grid.min.css",
9-
"maxSize": "6 kB"
9+
"maxSize": "6.5 kB"
1010
},
1111
{
1212
"path": "./dist/css/coreui-reboot.css",
13-
"maxSize": "2.25 kB"
13+
"maxSize": "2 kB"
1414
},
1515
{
1616
"path": "./dist/css/coreui-reboot.min.css",
1717
"maxSize": "2 kB"
1818
},
1919
{
2020
"path": "./dist/css/coreui-utilities.css",
21-
"maxSize": "7.5 kB"
21+
"maxSize": "7.25 kB"
2222
},
2323
{
2424
"path": "./dist/css/coreui-utilities.min.css",
25-
"maxSize": "6.75 kB"
25+
"maxSize": "6.6 kB"
2626
},
2727
{
2828
"path": "./dist/css/coreui.css",
29-
"maxSize": "24.25 kB"
29+
"maxSize": "25 kB"
3030
},
3131
{
3232
"path": "./dist/css/coreui.min.css",
33-
"maxSize": "22.25 kB"
33+
"maxSize": "22.75 kB"
3434
},
3535
{
3636
"path": "./dist/js/coreui.bundle.js",

.github/SUPPORT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.
77
For general troubleshooting or help getting started:
88

99
- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
10-
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
10+
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
1111
- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Editor preferences are available in the [editor config](https://github.com/coreu
151151

152152
Stay up to date on the development of CoreUI and reach out to the community with these helpful resources.
153153

154-
- Read and subscribe to [The Official CoreUI Blog](https://coreui.io/blog/).
154+
- Read and subscribe to [The Official CoreUI Blog](https://blog.coreui.io/).
155155
- Join [the official Community](https://community.coreui.io/).
156156

157157
You can also follow [@core_ui on Twitter](https://twitter.com/core_ui).

build/build-plugins.js

Lines changed: 54 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -60,76 +60,67 @@ const defaultPluginConfig = {
6060

6161
// eslint-disable-next-line complexity
6262
const getConfigByPluginKey = pluginKey => {
63-
if (
64-
pluginKey === 'Data' ||
65-
pluginKey === 'Manipulator' ||
66-
pluginKey === 'EventHandler' ||
67-
pluginKey === 'SelectorEngine' ||
68-
pluginKey === 'Util' ||
69-
pluginKey === 'Sanitizer' ||
70-
pluginKey === 'Backdrop'
71-
) {
72-
return {
73-
external: []
63+
switch (pluginKey) {
64+
case 'Alert':
65+
case 'Offcanvas':
66+
case 'Tab':
67+
return defaultPluginConfig
68+
69+
case 'Base':
70+
case 'Button':
71+
case 'Carousel':
72+
case 'Collapse':
73+
case 'Modal':
74+
case 'ScrollSpy': {
75+
const config = Object.assign(defaultPluginConfig)
76+
config.external.push(bsPlugins.Manipulator)
77+
config.globals[bsPlugins.Manipulator] = 'Manipulator'
78+
return config
7479
}
75-
}
76-
77-
if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'Offcanvas') {
78-
return defaultPluginConfig
79-
}
8080

81-
if (
82-
pluginKey === 'Base' ||
83-
pluginKey === 'Button' ||
84-
pluginKey === 'Carousel' ||
85-
pluginKey === 'Collapse' ||
86-
pluginKey === 'Modal' ||
87-
pluginKey === 'ScrollSpy'
88-
) {
89-
const config = Object.assign(defaultPluginConfig)
90-
config.external.push(bsPlugins.Manipulator)
91-
config.globals[bsPlugins.Manipulator] = 'Manipulator'
92-
return config
93-
}
81+
case 'Dropdown':
82+
case 'Tooltip': {
83+
const config = Object.assign(defaultPluginConfig)
84+
config.external.push(bsPlugins.Manipulator, '@popperjs/core')
85+
config.globals[bsPlugins.Manipulator] = 'Manipulator'
86+
config.globals['@popperjs/core'] = 'Popper'
87+
return config
88+
}
9489

95-
if (pluginKey === 'Dropdown' || pluginKey === 'Tooltip') {
96-
const config = Object.assign(defaultPluginConfig)
97-
config.external.push(bsPlugins.Manipulator, '@popperjs/core')
98-
config.globals[bsPlugins.Manipulator] = 'Manipulator'
99-
config.globals['@popperjs/core'] = 'Popper'
100-
return config
101-
}
90+
case 'Popover':
91+
return {
92+
external: [
93+
bsPlugins.Data,
94+
bsPlugins.SelectorEngine,
95+
bsPlugins.Tooltip
96+
],
97+
globals: {
98+
[bsPlugins.Data]: 'Data',
99+
[bsPlugins.SelectorEngine]: 'SelectorEngine',
100+
[bsPlugins.Tooltip]: 'Tooltip'
101+
}
102+
}
102103

103-
if (pluginKey === 'Popover') {
104-
return {
105-
external: [
106-
bsPlugins.Data,
107-
bsPlugins.SelectorEngine,
108-
bsPlugins.Tooltip
109-
],
110-
globals: {
111-
[bsPlugins.Data]: 'Data',
112-
[bsPlugins.SelectorEngine]: 'SelectorEngine',
113-
[bsPlugins.Tooltip]: 'Tooltip'
104+
case 'Toast':
105+
return {
106+
external: [
107+
bsPlugins.Data,
108+
bsPlugins.Base,
109+
bsPlugins.EventHandler,
110+
bsPlugins.Manipulator
111+
],
112+
globals: {
113+
[bsPlugins.Data]: 'Data',
114+
[bsPlugins.Base]: 'Base',
115+
[bsPlugins.EventHandler]: 'EventHandler',
116+
[bsPlugins.Manipulator]: 'Manipulator'
117+
}
114118
}
115-
}
116-
}
117119

118-
if (pluginKey === 'Toast') {
119-
return {
120-
external: [
121-
bsPlugins.Data,
122-
bsPlugins.Base,
123-
bsPlugins.EventHandler,
124-
bsPlugins.Manipulator
125-
],
126-
globals: {
127-
[bsPlugins.Data]: 'Data',
128-
[bsPlugins.Base]: 'Base',
129-
[bsPlugins.EventHandler]: 'EventHandler',
130-
[bsPlugins.Manipulator]: 'Manipulator'
120+
default:
121+
return {
122+
external: []
131123
}
132-
}
133124
}
134125
}
135126

build/vnu-jar.js

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
'use strict'
1111

12-
const childProcess = require('child_process')
12+
const { execFile, spawn } = require('child_process')
1313
const vnu = require('vnu-jar')
1414

15-
childProcess.exec('java -version', (error, stdout, stderr) => {
15+
execFile('java', ['-version'], (error, stdout, stderr) => {
1616
if (error) {
1717
console.error('Skipping vnu-jar test; Java is missing.')
1818
return
@@ -21,32 +21,19 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
2121
const is32bitJava = !/64-Bit/.test(stderr)
2222

2323
// vnu-jar accepts multiple ignores joined with a `|`.
24-
// Also note that the ignores are regular expressions.
24+
// Also note that the ignores are string regular expressions.
2525
const ignores = [
2626
// "autocomplete" is included in <button> and checkboxes and radio <input>s due to
2727
// Firefox's non-standard autocomplete behavior - see https://bugzilla.mozilla.org/show_bug.cgi?id=654072
2828
'Attribute “autocomplete” is only allowed when the input type is.*',
29-
'Attribute “autocomplete” not allowed on element “button” at this point.',
30-
// Markup used in Components → Forms → Layout → Form grid → Horizontal form is currently invalid,
31-
// but used this way due to lack of support for flexbox layout on <fieldset> element in most browsers
32-
'Element “legend” not allowed as child of element “div” in this context.*',
33-
// Content → Reboot uses various date/time inputs as a visual example.
34-
// Documentation does not rely on them being usable.
35-
'The “date” input type is not supported in all browsers.*',
36-
'The “week” input type is not supported in all browsers.*',
37-
'The “month” input type is not supported in all browsers.*',
38-
'The “color” input type is not supported in all browsers.*',
39-
'The “datetime-local” input type is not supported in all browsers.*',
40-
'The “time” input type is not supported in all browsers.*'
29+
'Attribute “autocomplete” not allowed on element “button” at this point.'
4130
].join('|')
4231

4332
const args = [
4433
'-jar',
4534
`"${vnu}"`,
4635
'--asciiquotes',
4736
'--skip-non-html',
48-
// Ignore the language code warnings
49-
'--no-langdetect',
5037
'--Werror',
5138
`--filterpattern "${ignores}"`,
5239
'_gh_pages/',
@@ -58,7 +45,7 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
5845
args.splice(0, 0, '-Xss512k')
5946
}
6047

61-
return childProcess.spawn('java', args, {
48+
return spawn('java', args, {
6249
shell: true,
6350
stdio: 'inherit'
6451
})

config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildFuture: true
1818

1919
enableRobotsTXT: true
2020
metaDataFormat: "yaml"
21-
disableKinds: ["404", "taxonomy", "taxonomyTerm", "RSS"]
21+
disableKinds: ["404", "taxonomy", "term", "RSS"]
2222

2323
publishDir: "_gh_pages"
2424

0 commit comments

Comments
 (0)