Skip to content

Commit b37a810

Browse files
mrholekmrholek
committed
Merge branch 'main' of https://github.com/coreui/coreui
# Conflicts: # README.md # config.yml # dist/css/coreui-grid.css # dist/css/coreui-grid.css.map # dist/css/coreui-grid.min.css # dist/css/coreui-grid.min.css.map # dist/css/coreui-grid.rtl.css # dist/css/coreui-grid.rtl.css.map # dist/css/coreui-grid.rtl.min.css # dist/css/coreui-grid.rtl.min.css.map # dist/css/coreui-reboot.css # dist/css/coreui-reboot.css.map # dist/css/coreui-reboot.min.css # dist/css/coreui-reboot.min.css.map # dist/css/coreui-reboot.rtl.css # dist/css/coreui-reboot.rtl.css.map # dist/css/coreui-reboot.rtl.min.css # dist/css/coreui-reboot.rtl.min.css.map # dist/css/coreui-utilities.css # dist/css/coreui-utilities.css.map # dist/css/coreui-utilities.min.css # dist/css/coreui-utilities.min.css.map # dist/css/coreui-utilities.rtl.css # dist/css/coreui-utilities.rtl.css.map # dist/css/coreui-utilities.rtl.min.css # dist/css/coreui-utilities.rtl.min.css.map # dist/css/coreui.css # dist/css/coreui.css.map # dist/css/coreui.min.css # dist/css/coreui.min.css.map # dist/css/coreui.rtl.css # dist/css/coreui.rtl.css.map # dist/css/coreui.rtl.min.css # dist/css/coreui.rtl.min.css.map # dist/js/coreui.bundle.js # dist/js/coreui.bundle.js.map # dist/js/coreui.bundle.min.js # dist/js/coreui.bundle.min.js.map # dist/js/coreui.esm.js # dist/js/coreui.esm.js.map # dist/js/coreui.esm.min.js # dist/js/coreui.esm.min.js.map # dist/js/coreui.js # dist/js/coreui.js.map # dist/js/coreui.min.js # dist/js/coreui.min.js.map # docs/content/getting-started/webpack.md # docs/layouts/partials/js-data-attributes.md # js/dist/alert.js # js/dist/alert.js.map # js/dist/base-component.js # js/dist/base-component.js.map # js/dist/button.js # js/dist/button.js.map # js/dist/carousel.js # js/dist/carousel.js.map # js/dist/collapse.js # js/dist/collapse.js.map # js/dist/dom/data.js # js/dist/dom/data.js.map # js/dist/dom/event-handler.js # js/dist/dom/event-handler.js.map # js/dist/dom/manipulator.js # js/dist/dom/manipulator.js.map # js/dist/dom/selector-engine.js # js/dist/dom/selector-engine.js.map # js/dist/dropdown.js # js/dist/dropdown.js.map # js/dist/modal.js # js/dist/modal.js.map # js/dist/navigation.js # js/dist/navigation.js.map # js/dist/offcanvas.js # js/dist/offcanvas.js.map # js/dist/popover.js # js/dist/popover.js.map # js/dist/scrollspy.js # js/dist/scrollspy.js.map # js/dist/sidebar.js # js/dist/sidebar.js.map # js/dist/tab.js # js/dist/tab.js.map # js/dist/toast.js # js/dist/toast.js.map # js/dist/tooltip.js # js/dist/tooltip.js.map # js/dist/util/backdrop.js # js/dist/util/component-functions.js # js/dist/util/config.js # js/dist/util/focustrap.js # js/dist/util/index.js # js/dist/util/index.js.map # js/dist/util/sanitizer.js # js/dist/util/sanitizer.js.map # js/dist/util/scrollbar.js # js/dist/util/swipe.js # js/dist/util/template-factory.js # js/index.esm.js # js/index.umd.js # js/src/alert.js # js/src/base-component.js # js/src/button.js # js/src/carousel.js # js/src/collapse.js # js/src/dom/data.js # js/src/dom/event-handler.js # js/src/dom/manipulator.js # js/src/dom/selector-engine.js # js/src/dropdown.js # js/src/modal.js # js/src/navigation.js # js/src/offcanvas.js # js/src/popover.js # js/src/scrollspy.js # js/src/sidebar.js # js/src/tab.js # js/src/toast.js # js/src/tooltip.js # js/src/util/index.js # js/src/util/sanitizer.js # package-lock.json # package.js # package.json # scss/_list-group.scss # scss/_toasts.scss # scss/coreui-grid.rtl.scss # scss/coreui-grid.scss # scss/coreui-reboot.rtl.scss # scss/coreui-reboot.scss # scss/coreui-utilities.rtl.scss # scss/coreui-utilities.scss # scss/coreui.rtl.scss # scss/coreui.scss # scss/sidebar/_sidebar-nav.scss
2 parents 8a0bd55 + fc6a112 commit b37a810

File tree

218 files changed

+6899
-10691
lines changed

Some content is hidden

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

218 files changed

+6899
-10691
lines changed

‎.bundlewatch.config.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
},
1919
{
2020
"path": "./dist/css/coreui-utilities.css",
21-
"maxSize": "8.0 kB"
21+
"maxSize": "9.25 kB"
2222
},
2323
{
2424
"path": "./dist/css/coreui-utilities.min.css",
25-
"maxSize": "7.25 kB"
25+
"maxSize": "8.5 kB"
2626
},
2727
{
2828
"path": "./dist/css/coreui.css",
@@ -34,23 +34,23 @@
3434
},
3535
{
3636
"path": "./dist/js/coreui.bundle.js",
37-
"maxSize": "43.0 kB"
37+
"maxSize": "43.25 kB"
3838
},
3939
{
4040
"path": "./dist/js/coreui.bundle.min.js",
4141
"maxSize": "24.60 kB"
4242
},
4343
{
4444
"path": "./dist/js/coreui.esm.js",
45-
"maxSize": "27.75 kB"
45+
"maxSize": "28 kB"
4646
},
4747
{
4848
"path": "./dist/js/coreui.esm.min.js",
4949
"maxSize": "18.5 kB"
5050
},
5151
{
5252
"path": "./dist/js/coreui.js",
53-
"maxSize": "28.5 kB"
53+
"maxSize": "28.75 kB"
5454
},
5555
{
5656
"path": "./dist/js/coreui.min.js",

‎.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
**/vendor/
44
/_gh_pages/
55
/js/coverage/
6+
/js/tests/integration/
7+
/docs/content/_index.html
68
/docs/static/sw.js
9+
/docs/layouts/

‎.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"error",
4747
"after"
4848
],
49+
"prefer-template": "error",
4950
"semi": [
5051
"error",
5152
"never"

‎.stylelintrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
"ignore": "local"
2727
}
2828
],
29-
"scss/selector-no-union-class-name": true,
30-
"value-keyword-case": [
31-
"lower",
32-
{
33-
"camelCaseSvgKeywords": true
34-
}
35-
]
29+
"scss/selector-no-union-class-name": true
3630
}
3731
}

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## [v4.2.2](https://github.com/coreui/coreui/compare/v4.1.5...v4.2.2)
3+
## [v4.2.4](https://github.com/coreui/coreui/compare/v4.1.5...v4.2.4)
44

55
> 9 June 2022
66

‎build/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"extends": "../.eslintrc.json",
1010
"rules": {
1111
"no-console": "off",
12-
"strict": "error"
12+
"strict": "error",
13+
"unicorn/prefer-top-level-await": "off"
1314
}
1415
}

‎build/build-plugins.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
'use strict'
1111

12-
const path = require('path')
12+
const path = require('node:path')
1313
const rollup = require('rollup')
1414
const globby = require('globby')
1515
const { babel } = require('@rollup/plugin-babel')
1616
const banner = require('./banner.js')
1717

1818
const sourcePath = path.resolve(__dirname, '../js/src/').replace(/\\/g, '/')
19-
const jsFiles = globby.sync(sourcePath + '/**/*.js')
19+
const jsFiles = globby.sync(`${sourcePath}/**/*.js`)
2020

2121
// Array which holds the resolved plugins
2222
const resolvedPlugins = []
@@ -27,7 +27,7 @@ const filenameToEntity = filename => filename.replace('.js', '')
2727

2828
for (const file of jsFiles) {
2929
resolvedPlugins.push({
30-
src: file.replace('.js', ''),
30+
src: file,
3131
dist: file.replace('src', 'dist'),
3232
fileName: path.basename(file),
3333
className: filenameToEntity(path.basename(file))

‎build/change-version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
'use strict'
1111

12-
const fs = require('fs').promises
13-
const path = require('path')
12+
const fs = require('node:fs').promises
13+
const path = require('node:path')
1414
const globby = require('globby')
1515

1616
const VERBOSE = process.argv.includes('--verbose')

‎build/generate-sri.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
'use strict'
1414

15-
const crypto = require('crypto')
16-
const fs = require('fs')
17-
const path = require('path')
15+
const crypto = require('node:crypto')
16+
const fs = require('node:fs')
17+
const path = require('node:path')
1818
const sh = require('shelljs')
1919

2020
sh.config.fatal = true

‎build/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const path = require('path')
3+
const path = require('node:path')
44
const { babel } = require('@rollup/plugin-babel')
55
const { nodeResolve } = require('@rollup/plugin-node-resolve')
66
const replace = require('@rollup/plugin-replace')

0 commit comments

Comments
 (0)