Skip to content
This repository was archived by the owner on Oct 16, 2021. It is now read-only.

Commit c7b4264

Browse files
committed
feat: Upgrade to Bootstrap 4
BREAKING CHANGE: See [Bootstrap v4 migration guide](https://getbootstrap.com/docs/4.0/migration/) to read about the most notable as well as breaking changes.
1 parent fb7f655 commit c7b4264

20 files changed

+1191
-2428
lines changed

__tests__/test-app.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ describe('Baumeister with default options', () => {
158158
'src/assets/scss/_print.scss',
159159
'src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss',
160160
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_alerts.scss',
161-
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_demoElements.scss',
162161
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_footer.scss',
163162
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_mixins.scss',
164163
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_scaffolding.scss',
@@ -171,7 +170,6 @@ describe('Baumeister with default options', () => {
171170
assert.fileContent([
172171
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /testResponsiveHelpers/],
173172
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /alerts/],
174-
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /demoElements/],
175173
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /footer/],
176174
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /mixins/],
177175
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /scaffolding/]
@@ -643,7 +641,6 @@ describe('Baumeister with less boilerplate code and handlebars enabled', () => {
643641
it('should create just the essential Sass files', () => {
644642
assert.noFile([
645643
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_alerts.scss',
646-
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_demoElements.scss',
647644
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_footer.scss',
648645
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_mixins.scss',
649646
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_scaffolding.scss'
@@ -653,7 +650,6 @@ describe('Baumeister with less boilerplate code and handlebars enabled', () => {
653650
it('should only import the essential Sass files within _' + _s.slugify(prompts.theme) + '.scss file', () => {
654651
assert.noFileContent([
655652
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /alerts"/],
656-
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /demoElements"/],
657653
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /footer"/],
658654
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /mixins"/],
659655
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /scaffolding"/]
@@ -722,7 +718,6 @@ describe('Baumeister with less boilerplate code and handlebars disabled', () =>
722718
it('should create just the essential Sass files', () => {
723719
assert.noFile([
724720
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_alerts.scss',
725-
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_demoElements.scss',
726721
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_footer.scss',
727722
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_ribbon.scss',
728723
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_mixins.scss',
@@ -733,7 +728,6 @@ describe('Baumeister with less boilerplate code and handlebars disabled', () =>
733728
it('should only import the essential Sass files within _' + _s.slugify(prompts.theme) + '.scss file', () => {
734729
assert.noFileContent([
735730
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /alerts"/],
736-
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /demoElements"/],
737731
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /footer"/],
738732
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /mixins"/],
739733
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /scaffolding"/]
@@ -870,7 +864,6 @@ describe('Baumeister using --yo-rc flag', () => {
870864
'src/assets/scss/_print.scss',
871865
'src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss',
872866
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_alerts.scss',
873-
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_demoElements.scss',
874867
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_footer.scss',
875868
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_mixins.scss',
876869
'src/assets/scss/' + _s.slugify(prompts.theme) + '/_scaffolding.scss',
@@ -883,7 +876,6 @@ describe('Baumeister using --yo-rc flag', () => {
883876
assert.fileContent([
884877
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /testResponsiveHelpers/],
885878
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /alerts/],
886-
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /demoElements/],
887879
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /footer/],
888880
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /mixins/],
889881
['src/assets/scss/_' + _s.slugify(prompts.theme) + '.scss', /scaffolding/]

app/index.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -512,12 +512,6 @@ module.exports = class extends Generator {
512512
templateProps: this.templateProps
513513
}
514514
);
515-
this.fs.copyTpl(
516-
this.templatePath('src/assets/scss/_theme/_demoElements.scss'),
517-
this.destinationPath('src/assets/scss/' + this.templateProps.theme + '/_demoElements.scss'), {
518-
templateProps: this.templateProps
519-
}
520-
);
521515
this.fs.copyTpl(
522516
this.templatePath('src/assets/scss/_theme/_footer.scss'),
523517
this.destinationPath('src/assets/scss/' + this.templateProps.theme + '/_footer.scss'), {

app/templates/_README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ src/assets/scss
408408
├── index.scss
409409
└── theme
410410
├── _alerts.scss
411-
├── _demoElements.scss
412411
├── _footer.scss
413412
├── _mixins.scss
414413
├── _scaffolding.scss

app/templates/_baumeister.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
"bundleCSS": [],
55
"bundleExternalJS": [
66
"jquery",
7-
"bootstrap-sass"
8-
],
9-
"includeStaticFiles": [
10-
"bootstrap-sass/assets/fonts/**/*"
7+
"bootstrap"
118
],
9+
"includeStaticFiles": [],
1210
"webpack": {
1311
"DefinePlugin": {
1412
"dev": {},

app/templates/_package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
},
2323
"private": true,
2424
"dependencies": {
25-
"bootstrap-sass": "3.3.7",
26-
"jquery": "3.3.1"
25+
"bootstrap": "^4.0.0",
26+
"jquery": "^3.3.1",
27+
"popper.js": "^1.12.9"
2728
},
2829
"devDependencies": {
2930
"autoprefixer": "^7.2.6",

0 commit comments

Comments
 (0)