From bea472bb0fced36b0726cf6127d71cddab944b4d Mon Sep 17 00:00:00 2001 From: Arnaud Kleinpeter Date: Thu, 6 Aug 2015 11:04:00 +0200 Subject: [PATCH] depend on bootstrap-sass instead of bootstrap-sass-official the bootstrap-sass-official repo has been renamed --- app/src/bower.js | 6 +++--- app/templates/_bower.json | 2 +- app/templates/gulp/_build.js | 2 +- app/templates/src/app/_bootstrap/__bootstrap-index.scss | 4 ++-- test/node/test-bower.js | 2 +- test/template/test-bower.js | 2 +- test/template/test-build.js | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/bower.js b/app/src/bower.js index bbe81bf4..87251ab1 100644 --- a/app/src/bower.js +++ b/app/src/bower.js @@ -16,7 +16,7 @@ module.exports = function(GulpAngularGenerator) { if (this.props.cssPreprocessor.extension === 'scss') { - bowerOverrides['bootstrap-sass-official'] = { + bowerOverrides['bootstrap-sass'] = { main: [ 'assets/stylesheets/_bootstrap.scss', 'assets/fonts/bootstrap/glyphicons-halflings-regular.eot', @@ -28,7 +28,7 @@ module.exports = function(GulpAngularGenerator) { }; if (this.props.bootstrapComponents.key === 'official') { - bowerOverrides['bootstrap-sass-official'].main.unshift('assets/javascripts/bootstrap.js'); + bowerOverrides['bootstrap-sass'].main.unshift('assets/javascripts/bootstrap.js'); } } else { @@ -79,7 +79,7 @@ module.exports = function(GulpAngularGenerator) { if(this.props.bootstrapComponents.key !== 'official') { this.wiredepExclusions.push('/bootstrap\.js$/'); if(this.props.cssPreprocessor.extension === 'scss') { - this.wiredepExclusions.push('/bootstrap-sass-official\\/.*\\.js/'); + this.wiredepExclusions.push('/bootstrap-sass\\/.*\\.js/'); } } if(this.props.cssPreprocessor.key !== 'none') { diff --git a/app/templates/_bower.json b/app/templates/_bower.json index 6d38c364..01d19810 100644 --- a/app/templates/_bower.json +++ b/app/templates/_bower.json @@ -28,7 +28,7 @@ "angular-ui-router": "~0.2.15", <% } if(props.ui.key === 'bootstrap') { -%> <% if(props.cssPreprocessor.extension === 'scss') { -%> - "bootstrap-sass-official": "~3.3.4", + "bootstrap-sass": "~3.3.4", <% } else if(props.cssPreprocessor.extension === 'styl') { -%> "bootstrap-stylus": "~4.0.4", <% } else { -%> diff --git a/app/templates/gulp/_build.js b/app/templates/gulp/_build.js index 68027878..951be792 100644 --- a/app/templates/gulp/_build.js +++ b/app/templates/gulp/_build.js @@ -55,7 +55,7 @@ gulp.task('html', ['inject', 'partials'], function () { .pipe(cssFilter) .pipe($.sourcemaps.init()) <% if (props.ui.key === 'bootstrap' && props.cssPreprocessor.extension === 'scss') { -%> - .pipe($.replace('../<%- computedPaths.appToBower %>/bower_components/bootstrap-sass-official/assets/fonts/bootstrap/', '../fonts/')) + .pipe($.replace('../<%- computedPaths.appToBower %>/bower_components/bootstrap-sass/assets/fonts/bootstrap/', '../fonts/')) <% } else if (props.ui.key === 'bootstrap' && props.cssPreprocessor.extension === 'less') { -%> .pipe($.replace('../<%- computedPaths.appToBower %>/bower_components/bootstrap/fonts/', '../fonts/')) <% } else if (props.ui.key === 'bootstrap' && props.cssPreprocessor.extension === 'styl') { -%> diff --git a/app/templates/src/app/_bootstrap/__bootstrap-index.scss b/app/templates/src/app/_bootstrap/__bootstrap-index.scss index 38ee8cc4..39305bf1 100644 --- a/app/templates/src/app/_bootstrap/__bootstrap-index.scss +++ b/app/templates/src/app/_bootstrap/__bootstrap-index.scss @@ -1,9 +1,9 @@ /** * If you want to override some bootstrap variables, you have to change values here. - * The list of variables are listed here bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_variables.scss + * The list of variables are listed here bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables.scss */ $navbar-inverse-link-color: #5AADBB; -$icon-font-path: "../<%- computedPaths.appToBower %>/bower_components/bootstrap-sass-official/assets/fonts/bootstrap/"; +$icon-font-path: "../<%- computedPaths.appToBower %>/bower_components/bootstrap-sass/assets/fonts/bootstrap/"; /** * Do not remove the comments below. It's the markers used by wiredep to inject diff --git a/test/node/test-bower.js b/test/node/test-bower.js index cd40c589..b21a5020 100644 --- a/test/node/test-bower.js +++ b/test/node/test-bower.js @@ -94,7 +94,7 @@ describe('gulp-angular generator bower script', function () { }; generator.computeWiredepExclusions(); generator.wiredepExclusions[0].should.be.equal('/bootstrap\.js$/'); - generator.wiredepExclusions[1].should.be.equal('/bootstrap-sass-official\\/.*\\.js/'); + generator.wiredepExclusions[1].should.be.equal('/bootstrap-sass\\/.*\\.js/'); generator.wiredepExclusions[2].should.be.equal('/bootstrap\\.css/'); }); diff --git a/test/template/test-bower.js b/test/template/test-bower.js index d0c745f6..e08718d6 100644 --- a/test/template/test-bower.js +++ b/test/template/test-bower.js @@ -136,7 +136,7 @@ describe('gulp-angular bower template', function () { model.props.ui.key = 'bootstrap'; model.props.bootstrapComponents.key = 'ui-bootstrap'; result = bower(model); - result.should.match(/bootstrap-sass-official/); + result.should.match(/bootstrap-sass/); result.should.match(/angular-bootstrap/); result.should.not.match(/"bootstrap"/); result.should.not.match(/foundation/); diff --git a/test/template/test-build.js b/test/template/test-build.js index 6429e773..6d2fa3dc 100644 --- a/test/template/test-build.js +++ b/test/template/test-build.js @@ -49,7 +49,7 @@ describe('gulp-angular build template', function () { model.props.ui.key = 'bootstrap'; model.props.cssPreprocessor.extension = 'scss'; result = build(model); - result.should.match(/\$\.replace\('\.\.\/appToBower\/bower_components\/bootstrap-sass-official/); + result.should.match(/\$\.replace\('\.\.\/appToBower\/bower_components\/bootstrap-sass/); model.props.cssPreprocessor.extension = 'less'; result = build(model);