diff --git a/generators/app/templates/gulp/_build.js b/generators/app/templates/gulp/_build.js index 73239e2a..24651de6 100644 --- a/generators/app/templates/gulp/_build.js +++ b/generators/app/templates/gulp/_build.js @@ -55,15 +55,7 @@ gulp.task('html', ['inject', 'partials'], function () { .pipe(jsFilter.restore) .pipe(cssFilter) .pipe($.sourcemaps.init()) -<% if (props.ui.key === 'bootstrap' && props.cssPreprocessor.extension === 'scss') { -%> - .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') { -%> - .pipe($.replace('../<%- computedPaths.appToBower %>/bower_components/bootstrap-stylus/fonts/', '../fonts/')) -<% } else if (props.ui.key === 'material-design-lite' || props.ui.key === 'angular-material') { -%> - .pipe($.replace('../<%- computedPaths.appToBower %>/bower_components/material-design-iconfont/iconfont/', '../fonts/')) -<% } -%> + .pipe($.replace(/(?:\.\.\/)*bower_components\/.*\/(.*\.(?:eot|svg|ttf|woff|woff2))/, '../fonts/$1')) .pipe($.minifyCss({ processImport: false })) .pipe($.rev()) .pipe($.sourcemaps.write('maps')) diff --git a/test/template/test-build.js b/test/template/test-build.js index 553b26ba..29571179 100644 --- a/test/template/test-build.js +++ b/test/template/test-build.js @@ -44,21 +44,11 @@ describe('gulp-angular build template', function () { model.props.ui.key = 'noUI'; model.props.cssPreprocessor.extension = 'css'; var result = build(model); - result.should.not.match(/\$\.replace/); result.should.match(/mainBowerFiles\(\)\)/); model.props.ui.key = 'bootstrap'; - model.props.cssPreprocessor.extension = 'scss'; - result = build(model); - result.should.match(/\$\.replace\('\.\.\/appToBower\/bower_components\/bootstrap-sass/); - - model.props.cssPreprocessor.extension = 'less'; - result = build(model); - result.should.match(/\$\.replace\('\.\.\/appToBower\/bower_components\/bootstrap\//); - model.props.cssPreprocessor.extension = 'styl'; result = build(model); - result.should.match(/\$\.replace\('\.\.\/appToBower\/bower_components\/bootstrap-stylus\//); result.should.match(/mainBowerFiles\(\).concat\('bower_components\/bootstrap-stylus\/fonts\/\*'\)/); }); @@ -67,7 +57,6 @@ describe('gulp-angular build template', function () { model.props.ui.key = 'material-design-lite'; var result = build(model); result = build(model); - result.should.match(/\$\.replace\('\.\.\/appToBower\/bower_components\/material-design-iconfont\/iconfont\//); result.should.match(/mainBowerFiles\(\).concat\('bower_components\/material-design-iconfont\/iconfont\/\*'\)/); });