Skip to content
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 560488d2
# [101.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v100.0.0...v101.0.0) (2024-10-29)
### Features
* Remove bootstrap peer-depenceny and use vendored version instead ([1628107](https://gitlab.com/gitlab-org/gitlab-ui/commit/1628107e3fd80e2accd7f0fe30505fd600073acc))
### BREAKING CHANGES
* In release 94.4.0 we added vendored bootstrap@4.6.2 SCSS. Now
@gitlab/ui stops relying on the bootstrap peer dependency and uses the
vendored bootstrap SCSS files instead. Unless you use JavaScript bits
of bootstrap, you can simply drop the bootstrap dependency.
# [100.0.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v99.1.0...v100.0.0) (2024-10-29)
......
package.json
View file @ 560488d2
{
"name": "@gitlab/ui",
"version": "100.0.0",
"version": "101.0.0",
"description": "GitLab UI Components",
"license": "MIT",
"main": "dist/index.js",
......@@ -90,7 +90,6 @@
},
"peerDependencies": {
"@gitlab/svgs": "^1.116.0 || ^2.0.0 || ^3.0.0",
"bootstrap": ">=4.5.3 <=4.6.2",
"dompurify": ">=2.5.2 <3.0.0 || >=3.1.2",
"emoji-regex": ">=10.0.0",
"pikaday": "^1.8.0",
......@@ -145,7 +144,6 @@
"axe-core": "^4.2.3",
"babel-jest": "29.0.1",
"babel-loader": "^8.0.5",
"bootstrap": "4.6.2",
"cypress": "13.15.1",
"cypress-axe": "^1.4.0",
"cypress-real-events": "^1.11.0",
......
src/scss/bootstrap.scss
View file @ 560488d2
@import 'variables';
@import 'bootstrap/scss/functions';
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';
@import 'bootstrap/scss/root';
@import 'bootstrap/scss/reboot';
@import 'bootstrap/scss/type';
@import 'bootstrap/scss/images';
@import 'bootstrap/scss/code';
@import 'bootstrap/scss/grid';
@import 'bootstrap/scss/tables';
@import 'bootstrap/scss/forms';
@import 'bootstrap/scss/buttons';
@import 'bootstrap/scss/transitions';
@import 'bootstrap/scss/dropdown';
@import 'bootstrap/scss/button-group';
@import 'bootstrap/scss/input-group';
@import 'bootstrap/scss/custom-forms';
@import 'bootstrap/scss/nav';
@import 'bootstrap/scss/navbar';
@import 'bootstrap/scss/card';
@import 'bootstrap/scss/breadcrumb';
@import 'bootstrap/scss/pagination';
@import 'bootstrap/scss/badge';
@import 'bootstrap/scss/alert';
@import 'bootstrap/scss/progress';
@import 'bootstrap/scss/media';
@import 'bootstrap/scss/list-group';
@import 'bootstrap/scss/close';
@import 'bootstrap/scss/modal';
@import 'bootstrap/scss/tooltip';
@import 'bootstrap/scss/popover';
@import 'bootstrap/scss/utilities';
@import 'bootstrap/scss/print';
@import '../vendor/bootstrap/scss/functions';
@import '../vendor/bootstrap/scss/variables';
@import '../vendor/bootstrap/scss/mixins';
@import '../vendor/bootstrap/scss/root';
@import '../vendor/bootstrap/scss/reboot';
@import '../vendor/bootstrap/scss/type';
@import '../vendor/bootstrap/scss/images';
@import '../vendor/bootstrap/scss/code';
@import '../vendor/bootstrap/scss/grid';
@import '../vendor/bootstrap/scss/tables';
@import '../vendor/bootstrap/scss/forms';
@import '../vendor/bootstrap/scss/buttons';
@import '../vendor/bootstrap/scss/transitions';
@import '../vendor/bootstrap/scss/dropdown';
@import '../vendor/bootstrap/scss/button-group';
@import '../vendor/bootstrap/scss/input-group';
@import '../vendor/bootstrap/scss/custom-forms';
@import '../vendor/bootstrap/scss/nav';
@import '../vendor/bootstrap/scss/navbar';
@import '../vendor/bootstrap/scss/card';
@import '../vendor/bootstrap/scss/breadcrumb';
@import '../vendor/bootstrap/scss/pagination';
@import '../vendor/bootstrap/scss/badge';
@import '../vendor/bootstrap/scss/alert';
@import '../vendor/bootstrap/scss/progress';
@import '../vendor/bootstrap/scss/media';
@import '../vendor/bootstrap/scss/list-group';
@import '../vendor/bootstrap/scss/close';
@import '../vendor/bootstrap/scss/modal';
@import '../vendor/bootstrap/scss/tooltip';
@import '../vendor/bootstrap/scss/popover';
@import '../vendor/bootstrap/scss/utilities';
@import '../vendor/bootstrap/scss/print';
src/scss/bootstrap_vue.scss
View file @ 560488d2
// stylelint-disable scss/at-import-partial-extension-blacklist
// imports from https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/src/index.scss
@import '../vendor/bootstrap-vue/src/variables.scss';
// Disabe Tooltip and Popover colored variants which we do not use / support.
$bv-enable-tooltip-variants: false;
......@@ -21,4 +18,3 @@ $bv-enable-popover-variants: false;
@import '../vendor/bootstrap-vue/src/components/toast/index.scss';
@import '../vendor/bootstrap-vue/src/components/tooltip/index.scss';
// @import '../vendor/bootstrap-vue/src/icons/icons.scss';
src/scss/storybook.scss
View file @ 560488d2
......@@ -7,9 +7,9 @@ $feature-button-border: true;
@import 'functions';
@import 'variables';
@import 'bootstrap/scss/functions';
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';
@import '../vendor/bootstrap/scss/functions';
@import '../vendor/bootstrap/scss/variables';
@import '../vendor/bootstrap/scss/mixins';
@import 'bootstrap_vue';
......
src/vendor/bootstrap-vue/package.json
View file @ 560488d2
......@@ -64,7 +64,6 @@
"test:meta": "scripts/check-meta.sh"
},
"dependencies": {
"bootstrap": "^4.6.1",
"popper.js": "^1.16.1",
"portal-vue": "^2.1.7",
"vue-functional-data-merge": "^3.1.0"
......
src/vendor/bootstrap-vue/yarn.lock
View file @ 560488d2
......@@ -217,11 +217,6 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
bootstrap@^4.6.1:
version "4.6.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"
integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
......
yarn.lock
View file @ 560488d2
......@@ -4972,11 +4972,6 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
bootstrap@4.6.2:
version "4.6.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
bplist-parser@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e"
......