Skip to content

Commit 22464c8

Browse files
committed
Merge branch 'v5-bootstrap-compatible' of https://github.com/coreui/coreui into v5-bootstrap-compatible
2 parents 7b8a004 + b2e9d03 commit 22464c8

Some content is hidden

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

72 files changed

+56318
-71
lines changed

build/generate-sri.mjs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ const files = [
3333
file: 'dist/css/coreui.rtl.min.css',
3434
configPropertyName: 'css_pro_rtl_hash'
3535
},
36+
{
37+
file: 'dist/css/themes/bootstrap/bootstrap.min.css',
38+
configPropertyName: 'css_bs_hash'
39+
},
40+
{
41+
file: 'dist/css/themes/bootstrap/bootstrap.rtl.min.css',
42+
configPropertyName: 'css_bs_rtl_hash'
43+
},
3644
{
3745
file: 'dist/js/coreui.min.js',
3846
configPropertyName: 'js_pro_hash'
@@ -41,6 +49,14 @@ const files = [
4149
file: 'dist/js/coreui.bundle.min.js',
4250
configPropertyName: 'js_pro_bundle_hash'
4351
},
52+
{
53+
file: 'dist/js/bootstrap.min.js',
54+
configPropertyName: 'js_bs_hash'
55+
},
56+
{
57+
file: 'dist/js/bootstrap.bundle.min.js',
58+
configPropertyName: 'js_bs_bundle_hash'
59+
},
4460
{
4561
file: 'node_modules/@popperjs/core/dist/umd/popper.min.js',
4662
configPropertyName: 'popper_hash'

build/rollup.config.mjs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import banner from './banner.mjs'
99
const __dirname = path.dirname(fileURLToPath(import.meta.url))
1010

1111
const BUNDLE = process.env.BUNDLE === 'true'
12+
const BOOTSTRAP = process.env.BOOTSTRAP === 'true'
1213
const ESM = process.env.ESM === 'true'
1314

14-
let destinationFile = `coreui${ESM ? '.esm' : ''}`
15+
let destinationFile = BOOTSTRAP ? `bootstrap${ESM ? '.esm' : ''}` : `coreui${ESM ? '.esm' : ''}`
1516
const external = ['@popperjs/core']
1617
const plugins = [
1718
babel({
@@ -37,7 +38,10 @@ if (BUNDLE) {
3738
plugins.push(
3839
replace({
3940
'process.env.NODE_ENV': '"production"',
40-
preventAssignment: true
41+
preventAssignment: true,
42+
...BOOTSTRAP && {
43+
'coreui.': 'bs.'
44+
}
4145
}),
4246
nodeResolve()
4347
)
@@ -57,7 +61,7 @@ const rollupConfig = {
5761
}
5862

5963
if (!ESM) {
60-
rollupConfig.output.name = 'coreui'
64+
rollupConfig.output.name = BOOTSTRAP ? 'bootstrap' : 'coreui'
6165
}
6266

6367
export default rollupConfig

dist/css/coreui.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui.rtl.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui.rtl.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui.rtl.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)