Back to Version from March 2nd

This commit is contained in:
Thomas A. Reinert 2018-03-04 15:21:25 +01:00
parent 63a0137069
commit 832fc4b8a0
1 changed files with 129 additions and 131 deletions

View File

@ -1,54 +1,54 @@
// Defining requirements // Defining requirements
var gulp = require( 'gulp' ); var gulp = require('gulp');
var plumber = require( 'gulp-plumber' ); var plumber = require('gulp-plumber');
var sass = require( 'gulp-sass' ); var sass = require('gulp-sass');
var watch = require( 'gulp-watch' ); var watch = require('gulp-watch');
var cssnano = require( 'gulp-cssnano' ); var cssnano = require('gulp-cssnano');
var rename = require( 'gulp-rename' ); var rename = require('gulp-rename');
var concat = require( 'gulp-concat' ); var concat = require('gulp-concat');
var uglify = require( 'gulp-uglify' ); var uglify = require('gulp-uglify');
var merge2 = require( 'merge2' ); var merge2 = require('merge2');
var imagemin = require( 'gulp-imagemin' ); var imagemin = require('gulp-imagemin');
var ignore = require( 'gulp-ignore' ); var ignore = require('gulp-ignore');
var rimraf = require( 'gulp-rimraf' ); var rimraf = require('gulp-rimraf');
var clone = require( 'gulp-clone' ); var clone = require('gulp-clone');
var merge = require( 'gulp-merge' ); var merge = require('gulp-merge');
var sourcemaps = require( 'gulp-sourcemaps' ); var sourcemaps = require('gulp-sourcemaps');
var browserSync = require( 'browser-sync' ).create(); var browserSync = require('browser-sync').create();
var del = require( 'del' ); var del = require('del');
var cleanCSS = require( 'gulp-clean-css' ); var cleanCSS = require('gulp-clean-css');
var gulpSequence = require( 'gulp-sequence' ); var gulpSequence = require('gulp-sequence');
var replace = require( 'gulp-replace' ); var replace = require('gulp-replace');
var autoprefixer = require( 'gulp-autoprefixer' ); var autoprefixer = require('gulp-autoprefixer')
// Configuration file to keep your code DRY // Configuration file to keep your code DRY
var cfg = require( './gulpconfig.json' ); var cfg = require('./gulpconfig.json');
var paths = cfg.paths; var paths = cfg.paths;
// Run: // Run:
// gulp sass + cssnano + rename // gulp sass + cssnano + rename
// Prepare the min.css for production (with 2 pipes to be sure that "theme.css" == "theme.min.css") // Prepare the min.css for production (with 2 pipes to be sure that "theme.css" == "theme.min.css")
gulp.task( 'scss-for-prod', function() { gulp.task('scss-for-prod', function() {
var source = gulp.src( paths.sass + '/*.scss' ) var source = gulp.src(paths.sass + '/*.scss')
.pipe( plumber({ .pipe(plumber({
errorHandler: function( err ) { errorHandler: function (err) {
console.log( err ); console.log(err);
this.emit( 'end' ); this.emit('end');
} }
}) ) }))
.pipe( sourcemaps.init({ loadMaps: true }) ) .pipe(sourcemaps.init({loadMaps: true}))
.pipe( sass() ); .pipe(sass());
var pipe1 = source.pipe( clone() ) var pipe1 = source.pipe(clone())
.pipe( sourcemaps.write(undefined, { sourceRoot: null }) ) .pipe(sourcemaps.write(undefined, { sourceRoot: null }))
.pipe( gulp.dest( paths.css ) ) .pipe(gulp.dest(paths.css))
.pipe( rename( 'custom-editor-style.css' ) ); .pipe(rename('custom-editor-style.css'))
var pipe2 = source.pipe( clone() ) var pipe2 = source.pipe(clone())
.pipe( minify-css() ) .pipe(minify-css())
.pipe( rename( {suffix: '.min'} ) ) .pipe(rename({suffix: '.min'}))
.pipe( gulp.dest( paths.css ) ); .pipe(gulp.dest(paths.css));
return merge(pipe1, pipe2); return merge(pipe1, pipe2);
}); });
@ -57,40 +57,40 @@ gulp.task( 'scss-for-prod', function() {
// Run: // Run:
// gulp sourcemaps + sass + reload(browserSync) // gulp sourcemaps + sass + reload(browserSync)
// Prepare the child-theme.css for the development environment // Prepare the child-theme.css for the development environment
gulp.task( 'scss-for-dev', function() { gulp.task('scss-for-dev', function() {
gulp.src( paths.sass + '/*.scss' ) gulp.src(paths.sass + '/*.scss')
.pipe(plumber({ .pipe(plumber({
errorHandler: function( err ) { errorHandler: function (err) {
console.log( err ); console.log(err);
this.emit( 'end' ); this.emit('end');
} }
})) }))
.pipe( sourcemaps.init({ loadMaps: true }) ) .pipe(sourcemaps.init({loadMaps: true}))
.pipe( sass() ) .pipe(sass())
.pipe( sourcemaps.write(undefined, { sourceRoot: null }) ) .pipe(sourcemaps.write(undefined, { sourceRoot: null }))
.pipe( gulp.dest(paths.css) ); .pipe(gulp.dest(paths.css))
}); });
gulp.task( 'watch-scss', ['browser-sync'], function() { gulp.task('watch-scss', ['browser-sync'], function () {
gulp.watch( paths.sass + '/**/*.scss', ['scss-for-dev'] ); gulp.watch(paths.sass + '/**/*.scss', ['scss-for-dev']);
}); });
// Run: // Run:
// gulp sass // gulp sass
// Compiles SCSS files in CSS // Compiles SCSS files in CSS
gulp.task( 'sass', function() { gulp.task('sass', function () {
var stream = gulp.src( paths.sass + '/*.scss' ) var stream = gulp.src(paths.sass + '/*.scss')
.pipe( plumber({ .pipe(plumber({
errorHandler: function( err ) { errorHandler: function (err) {
console.log( err ); console.log(err);
this.emit( 'end' ); this.emit('end');
} }
}) ) }))
.pipe( sass() ) .pipe(sass())
.pipe( autoprefixer( 'last 2 versions' ) ) .pipe(autoprefixer('last 2 versions'))
.pipe( gulp.dest(paths.css) ) .pipe(gulp.dest(paths.css))
.pipe( rename( 'custom-editor-style.css' ) ); .pipe(rename('custom-editor-style.css'))
return stream; return stream;
}); });
@ -98,19 +98,19 @@ gulp.task( 'sass', function() {
// Run: // Run:
// gulp watch // gulp watch
// Starts watcher. Watcher runs gulp sass task on changes // Starts watcher. Watcher runs gulp sass task on changes
gulp.task( 'watch', function() { gulp.task('watch', function () {
gulp.watch( paths.sass + '/**/*.scss', ['styles'] ); gulp.watch(paths.sass + '/**/*.scss', ['styles']);
gulp.watch( [paths.dev + '/js/**/*.js','js/**/*.js','!js/theme.js','!js/theme.min.js'], ['scripts'] ); gulp.watch([paths.dev + '/js/**/*.js','js/**/*.js','!js/theme.js','!js/theme.min.js'], ['scripts']);
//Inside the watch task. //Inside the watch task.
gulp.watch( paths.imgsrc + '/**', ['imagemin-watch'] ); gulp.watch(paths.imgsrc + '/**', ['imagemin-watch']);
}); });
/** /**
* Ensures the 'imagemin' task is complete before reloading browsers * Ensures the 'imagemin' task is complete before reloading browsers
* @verbose * @verbose
*/ */
gulp.task( 'imagemin-watch', ['imagemin'], function(done) { gulp.task('imagemin-watch', ['imagemin'], function(done) {
browserSync.reload(); browserSync.reload();
done(); done();
}); });
@ -118,61 +118,59 @@ gulp.task( 'imagemin-watch', ['imagemin'], function(done) {
// Run: // Run:
// gulp imagemin // gulp imagemin
// Running image optimizing task // Running image optimizing task
gulp.task( 'imagemin', function(){ gulp.task('imagemin', function(){
gulp.src( paths.imgsrc + '/**' ) gulp.src(paths.imgsrc + '/**')
.pipe( imagemin() ) .pipe(imagemin())
.pipe( gulp.dest(paths.img) ); .pipe(gulp.dest(paths.img))
}); });
// Run: // Run:
// gulp cssnano // gulp cssnano
// Minifies CSS files // Minifies CSS files
gulp.task( 'cssnano', function(){ gulp.task('cssnano', function(){
return gulp.src( paths.css + '/theme.css' ) return gulp.src(paths.css + '/theme.css')
.pipe( sourcemaps.init({ loadMaps: true }) ) .pipe(sourcemaps.init({loadMaps: true}))
.pipe( plumber({ .pipe(plumber({
errorHandler: function( err ) { errorHandler: function (err) {
console.log( err ); console.log(err);
this.emit( 'end' ); this.emit('end');
} }
}) ) }))
.pipe( rename({ suffix: '.min' }) ) .pipe(rename({suffix: '.min'}))
.pipe( cssnano({ discardComments: { removeAll: true } }) ) .pipe(cssnano({discardComments: {removeAll: true}}))
.pipe( sourcemaps.write('./') ) .pipe(sourcemaps.write('./'))
.pipe( gulp.dest( paths.css ) ); .pipe(gulp.dest(paths.css))
}); });
gulp.task( 'minify-css', function() { gulp.task('minify-css', function() {
return gulp.src( paths.css + '/theme.css' ) return gulp.src(paths.css + '/theme.css')
.pipe( sourcemaps.init({loadMaps: true}) ) .pipe(sourcemaps.init({loadMaps: true}))
.pipe( cleanCSS({ compatibility: '*' }) ) .pipe(cleanCSS({compatibility: '*'}))
.pipe( plumber({ .pipe(plumber({
errorHandler: function( err ) { errorHandler: function (err) {
console.log( err ); console.log(err);
this.emit( 'end' ); this.emit('end');
} }
}) ) }))
.pipe( rename({ suffix: '.min' }) ) .pipe(rename({suffix: '.min'}))
.pipe( sourcemaps.write('./' )) .pipe(sourcemaps.write('./'))
.pipe( gulp.dest( paths.css )); .pipe(gulp.dest(paths.css));
}); });
gulp.task( 'cleancss', function() { gulp.task('cleancss', function() {
return gulp.src( paths.css + '/*.min.css', { read: false } ) // much faster return gulp.src(paths.css + '/*.min.css', { read: false }) // much faster
.pipe(ignore( 'theme.css' )) .pipe(ignore('theme.css'))
.pipe( rimraf() ); .pipe(rimraf());
}); });
gulp.task( 'styles', function(callback){ gulp.task('styles', function(callback){ gulpSequence('sass', 'minify-css')(callback) });
gulpSequence( 'sass', 'minify-css' )(callback);
});
// Run: // Run:
// gulp browser-sync // gulp browser-sync
// Starts browser-sync task for starting the server. // Starts browser-sync task for starting the server.
gulp.task( 'browser-sync', function() { gulp.task('browser-sync', function() {
browserSync.init(cfg.browserSyncWatchFiles, cfg.browserSyncOptions); browserSync.init(cfg.browserSyncWatchFiles, cfg.browserSyncOptions);
}); });
@ -180,13 +178,13 @@ gulp.task( 'browser-sync', function() {
// Run: // Run:
// gulp watch-bs // gulp watch-bs
// Starts watcher with browser-sync. Browser-sync reloads page automatically on your browser // Starts watcher with browser-sync. Browser-sync reloads page automatically on your browser
gulp.task( 'watch-bs', ['browser-sync', 'watch', 'scripts'], function() { }); gulp.task('watch-bs', ['browser-sync', 'watch', 'scripts'], function () { });
// Run: // Run:
// gulp scripts. // gulp scripts.
// Uglifies and concat all JS files into one // Uglifies and concat all JS files into one
gulp.task( 'scripts', function() { gulp.task('scripts', function() {
var scripts = [ var scripts = [
// Start - All BS4 stuff // Start - All BS4 stuff
@ -197,18 +195,18 @@ gulp.task( 'scripts', function() {
paths.dev + '/js/skip-link-focus-fix.js' paths.dev + '/js/skip-link-focus-fix.js'
]; ];
gulp.src(scripts) gulp.src(scripts)
.pipe( concat( 'theme.min.js' ) ) .pipe(concat('theme.min.js'))
.pipe( uglify() ) .pipe(uglify())
.pipe( gulp.dest(paths.js) ); .pipe(gulp.dest(paths.js));
gulp.src(scripts) gulp.src(scripts)
.pipe( concat( 'theme.js' ) ) .pipe(concat('theme.js'))
.pipe( gulp.dest(paths.js) ); .pipe(gulp.dest(paths.js));
}); });
// Deleting any file inside the /src folder // Deleting any file inside the /src folder
gulp.task( 'clean-source', function() { gulp.task('clean-source', function () {
return del(['src/**/*']); return del(['src/**/*',]);
}); });
// Run: // Run:
@ -216,7 +214,7 @@ gulp.task( 'clean-source', function() {
// Copy all needed dependency assets files from bower_component assets to themes /js, /scss and /fonts folder. Run this task after bower install or bower update // Copy all needed dependency assets files from bower_component assets to themes /js, /scss and /fonts folder. Run this task after bower install or bower update
////////////////// All Bootstrap SASS Assets ///////////////////////// ////////////////// All Bootstrap SASS Assets /////////////////////////
gulp.task( 'copy-assets', function() { gulp.task('copy-assets', function() {
////////////////// All Bootstrap 4 Assets ///////////////////////// ////////////////// All Bootstrap 4 Assets /////////////////////////
// Copy all JS files // Copy all JS files
@ -233,63 +231,63 @@ gulp.task( 'copy-assets', function() {
// Copy all Font Awesome Fonts // Copy all Font Awesome Fonts
var stream = gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') var stream = gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}')
.pipe( gulp.dest( './fonts' ) ); .pipe(gulp.dest('./fonts'));
// Copy all Font Awesome SCSS files // Copy all Font Awesome SCSS files
gulp.src(paths.node + 'font-awesome/scss/*.scss') gulp.src(paths.node + 'font-awesome/scss/*.scss')
.pipe( gulp.dest(paths.dev + '/sass/fontawesome') ); .pipe(gulp.dest(paths.dev + '/sass/fontawesome'));
// _s SCSS files // _s SCSS files
gulp.src(paths.node + 'undescores-for-npm/sass/media/*.scss') gulp.src(paths.node + 'undescores-for-npm/sass/media/*.scss')
.pipe( gulp.dest(paths.dev + '/sass/underscores') ); .pipe(gulp.dest(paths.dev + '/sass/underscores'));
// _s JS files into /src/js // _s JS files into /src/js
gulp.src(paths.node + 'undescores-for-npm/js/skip-link-focus-fix.js') gulp.src(paths.node + 'undescores-for-npm/js/skip-link-focus-fix.js')
.pipe( gulp.dest(paths.dev + '/js') ); .pipe(gulp.dest(paths.dev + '/js'));
// _s JS files into /js // _s JS files into /js
gulp.src(paths.node + 'undescores-for-npm/js/skip-link-focus-fix.js') gulp.src(paths.node + 'undescores-for-npm/js/skip-link-focus-fix.js')
.pipe( gulp.dest(paths.js + paths.vendor) ); .pipe(gulp.dest(paths.js + paths.vendor));
// Copy Popper JS files // Copy Popper JS files
gulp.src(paths.node + 'popper.js/dist/umd/popper.min.js') gulp.src(paths.node + 'popper.js/dist/umd/popper.min.js')
.pipe( gulp.dest(paths.js + paths.vendor) ); .pipe(gulp.dest(paths.js + paths.vendor));
gulp.src(paths.node + 'popper.js/dist/umd/popper.js') gulp.src(paths.node + 'popper.js/dist/umd/popper.js')
.pipe( gulp.dest(paths.js + paths.vendor) ); .pipe(gulp.dest(paths.js + paths.vendor));
return stream; return stream;
}); });
// Deleting the files distributed by the copy-assets task // Deleting the files distributed by the copy-assets task
gulp.task( 'clean-vendor-assets', function() { gulp.task('clean-vendor-assets', function () {
return del([paths.dev+'/js/bootstrap4/**', paths.dev+'/sass/bootstrap4/**', './fonts/*wesome*.{ttf,woff,woff2,eof,svg}', paths.dev+'/sass/fontawesome/**', paths.dev+'/sass/underscores/**', paths.dev+'/js/skip-link-focus-fix.js', paths.js+'/**/skip-link-focus-fix.js', paths.js+'/**/popper.min.js', paths.js+'/**/popper.js', (paths.vendor!=''?(paths.js+paths.vendor+'/**'):'')]); return del([paths.dev+'/js/bootstrap4/**', paths.dev+'/sass/bootstrap4/**', './fonts/*wesome*.{ttf,woff,woff2,eof,svg}', paths.dev+'/sass/fontawesome/**', paths.dev+'/sass/underscores/**', paths.dev+'/js/skip-link-focus-fix.js', paths.js+'/**/skip-link-focus-fix.js', paths.js+'/**/popper.min.js', paths.js+'/**/popper.js', (paths.vendor!=''?(paths.js+paths.vendor+'/**'):'')]);
}); });
// Run // Run
// gulp dist // gulp dist
// Copies the files to the /dist folder for distribution as simple theme // Copies the files to the /dist folder for distribution as simple theme
gulp.task( 'dist', ['clean-dist'], function() { gulp.task('dist', ['clean-dist'], function() {
return gulp.src(['**/*', '!'+paths.bower, '!'+paths.bower+'/**', '!'+paths.node, '!'+paths.node+'/**', '!'+paths.dev, '!'+paths.dev+'/**', '!'+paths.dist, '!'+paths.dist+'/**', '!'+paths.distprod, '!'+paths.distprod+'/**', '!'+paths.sass, '!'+paths.sass+'/**', '!readme.txt', '!readme.md', '!package.json', '!package-lock.json', '!gulpfile.js', '!gulpconfig.json', '!CHANGELOG.md', '!.travis.yml', '!jshintignore', '!codesniffer.ruleset.xml', '*'], {'buffer': false}) return gulp.src(['**/*', '!'+paths.bower, '!'+paths.bower+'/**', '!'+paths.node, '!'+paths.node+'/**', '!'+paths.dev, '!'+paths.dev+'/**', '!'+paths.dist, '!'+paths.dist+'/**', '!'+paths.distprod, '!'+paths.distprod+'/**', '!'+paths.sass, '!'+paths.sass+'/**', '!readme.txt', '!readme.md', '!package.json', '!package-lock.json', '!gulpfile.js', '!gulpconfig.json', '!CHANGELOG.md', '!.travis.yml', '!jshintignore', '!codesniffer.ruleset.xml', '*'], {'buffer': false})
.pipe( replace('/js/jquery.slim.min.js', '/js'+paths.vendor+'/jquery.slim.min.js', { 'skipBinary': true }) ) .pipe(replace('/js/jquery.slim.min.js', '/js'+paths.vendor+'/jquery.slim.min.js', {'skipBinary': true}))
.pipe( replace('/js/popper.min.js', '/js'+paths.vendor+'/popper.min.js', {'skipBinary': true}) ) .pipe(replace('/js/popper.min.js', '/js'+paths.vendor+'/popper.min.js', {'skipBinary': true}))
.pipe( replace('/js/skip-link-focus-fix.js', '/js'+paths.vendor+'/skip-link-focus-fix.js', {'skipBinary': true}) ) .pipe(replace('/js/skip-link-focus-fix.js', '/js'+paths.vendor+'/skip-link-focus-fix.js', {'skipBinary': true}))
.pipe( gulp.dest(paths.dist) ); .pipe(gulp.dest(paths.dist));
}); });
// Deleting any file inside the /dist folder // Deleting any file inside the /dist folder
gulp.task( 'clean-dist', function() { gulp.task('clean-dist', function () {
return del([paths.dist + '/**']); return del([paths.dist + '/**',]);
}); });
// Run // Run
// gulp dist-product // gulp dist-product
// Copies the files to the /dist-prod folder for distribution as theme with all assets // Copies the files to the /dist-prod folder for distribution as theme with all assets
gulp.task( 'dist-product', ['clean-dist-product'], function() { gulp.task('dist-product', ['clean-dist-product'], function() {
return gulp.src(['**/*', '!'+paths.bower, '!'+paths.bower+'/**', '!'+paths.node, '!'+paths.node+'/**', '!'+paths.dist, '!'+paths.dist+'/**', '!'+paths.distprod, '!'+paths.distprod+'/**', '*']) return gulp.src(['**/*', '!'+paths.bower, '!'+paths.bower+'/**', '!'+paths.node, '!'+paths.node+'/**', '!'+paths.dist, '!'+paths.dist+'/**', '!'+paths.distprod, '!'+paths.distprod+'/**', '*'])
.pipe( gulp.dest(paths.distprod) ); .pipe(gulp.dest(paths.distprod))
}); });
// Deleting any file inside the /dist-product folder // Deleting any file inside the /dist-product folder
gulp.task( 'clean-dist-product', function() { gulp.task('clean-dist-product', function () {
return del([paths.distprod + '/**']); return del([paths.distprod + '/**',]);
}); });