ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Improve CSS URL rebasing for images and fonts

Browse source 
because of jsTree; also replace concat-css and minify-css with more
common clean-css
This commit is contained in:
Norbert Renner 2019-01-11 11:02:35 +01:00
parent 925a6b06f6
commit 43357eee0d
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
gulpfile.js
View file

@ -1,7 +1,5 @@
var gulp = require('gulp');
var concat = require('gulp-concat');
var concatCss = require('gulp-concat-css');
var minifyCss = require('gulp-minify-css');
var postcss = require('gulp-postcss');
var autoprefixer = require('autoprefixer');
var uglify = require('gulp-uglify');
@ -9,7 +7,6 @@ var sourcemaps = require('gulp-sourcemaps');
var gulpDebug = require('gulp-debug');
var mainBowerFiles = require('main-bower-files');
var del = require('del');
var tap = require('gulp-tap');
var path = require('path');
var cached = require('gulp-cached');
var remember = require('gulp-remember');
@ -22,6 +19,8 @@ var semver = require('semver');
var git = require('gulp-git');
var replace = require('gulp-replace');
var release = require('gulp-github-release');
var cleanCSS = require('gulp-clean-css');
var modifyCssUrls = require('gulp-modify-css-urls');
var debug = false;
@ -80,23 +79,25 @@ gulp.task('concat', function() {
gulp.task('styles', function() {
return gulp.src(paths.styles)
// hack for rewriting relative URLs to images/fonts in gulp-concat-css
// when src in css subfolder (remove '../')
// see also (?) https://github.com/mariocasciaro/gulp-concat-css/pull/10
.pipe(tap(function (file) {
if (path.basename(file.base) === 'css') {
file.path = 'css/' + file.relative;
file.base = './css';
} else {
file.path = file.relative;
file.base = '.';
.pipe(modifyCssUrls({
modify(url, filePath) {
var distUrl = url;
var imageExt = ['.png', '.gif', '.svg'];
if (imageExt.indexOf(path.extname(url)) !== -1) {
distUrl = 'images/' + path.basename(url);
} else if (url.indexOf('font') !== -1) {
distUrl = 'fonts/' + path.basename(url);
}
return distUrl;
}
}))
.pipe(concatCss(paths.destName + '.css'))
.pipe(postcss([ autoprefixer({ remove: false }) ]))
.pipe(minifyCss({
.pipe(concat(paths.destName + '.css'))
.pipe(cleanCSS({
rebase: false
}))
.pipe(postcss([ autoprefixer({ remove: false }) ]))
.pipe(gulp.dest(paths.dest));
});
@ -131,9 +132,10 @@ gulp.task('watch', function() {
gulp.task('log', function() {
//return gulp.src(mainBowerFiles(['**/*.js', '!**/*.min.js']))
//return gulp.src(mainBowerFiles('**/*.css'))
return gulp.src(paths.scripts)
//return gulp.src(paths.scripts)
//return gulp.src(paths.styles)
//return gulp.src(paths.images)
return gulp.src(paths.scripts.concat(paths.styles).concat(paths.images))
.pipe(gulpDebug());
//return gulp.src(mainBowerFiles({debugging: true}));