Compare commits
No commits in common. "master" and "3.0.2" have entirely different histories.
|
|
@ -1,11 +1,5 @@
|
|||
# Changelog
|
||||
|
||||
## 3.0.3 (2020-05-28)
|
||||
|
||||
- Fixed gulp script (cssnano)
|
||||
- Seperated scss tasks
|
||||
- minor structure update
|
||||
|
||||
## 3.0.2 (2020-05-04)
|
||||
|
||||
- Updated npm dependencies
|
||||
|
|
|
|||
83
gulpfile.js
83
gulpfile.js
|
|
@ -1,10 +1,9 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
//------------------------
|
||||
//----------------
|
||||
//:: Initiate npm-modules
|
||||
|
||||
const gulp = require('gulp'),
|
||||
sass = require('gulp-sass')(require('sass')),
|
||||
sass = require('gulp-sass'),
|
||||
concat = require('gulp-concat'),
|
||||
livereload = require('gulp-livereload'),
|
||||
notify = require('gulp-notify'),
|
||||
|
|
@ -16,10 +15,8 @@ const gulp = require('gulp'),
|
|||
merge2 = require('merge2'),
|
||||
rimraf = require('rimraf');
|
||||
|
||||
|
||||
//------------------------
|
||||
//:: Config parameter
|
||||
|
||||
//----------------
|
||||
//:: configs
|
||||
var Config = {
|
||||
inputDir: '_source/',
|
||||
outputDir: '_dist/'
|
||||
|
|
@ -33,18 +30,22 @@ var SassConfig = {
|
|||
}
|
||||
}
|
||||
|
||||
var postcss_plugins = [
|
||||
cssnano,
|
||||
autoprefixer
|
||||
];
|
||||
|
||||
//------------------------
|
||||
//----------------
|
||||
//:: Tasks
|
||||
|
||||
// compile scss
|
||||
function scss_addons() {
|
||||
function scss() {
|
||||
var onError = function(err) {
|
||||
notify.onError({
|
||||
"title": "scss_addons",
|
||||
"subtitle": "Error!",
|
||||
"message": "❌ <%= error.message %>",
|
||||
"sound": "Submarine"
|
||||
title: 'gulp',
|
||||
subtitle: 'Error!',
|
||||
message: '❌ <%= error.message %>',
|
||||
sound: 'Submarine'
|
||||
})(err);
|
||||
this.emit('end');
|
||||
};
|
||||
|
|
@ -54,62 +55,40 @@ function scss_addons() {
|
|||
'node_modules/sanitize.css/sanitize.css'
|
||||
]))
|
||||
.pipe(concat('addons.css'))
|
||||
.pipe(postcss([autoprefixer()]))
|
||||
.pipe(gulp.dest(SassConfig.outputDir))
|
||||
.pipe(postcss([cssnano()]))
|
||||
.pipe(postcss(postcss_plugins))
|
||||
.pipe(rename({suffix: '.min'}))
|
||||
.pipe(gulp.dest(SassConfig.outputDir))
|
||||
.pipe(livereload())
|
||||
.pipe(notify({
|
||||
"title": "scss_addons",
|
||||
"subtitle": "Success!",
|
||||
"message": "✅ SCSS compiled",
|
||||
"timeout": "2"
|
||||
}));
|
||||
}
|
||||
.pipe(gulp.dest(SassConfig.outputDir)),
|
||||
|
||||
function scss_main() {
|
||||
var onError = function(err) {
|
||||
notify.onError({
|
||||
"title": "scss_main",
|
||||
"subtitle": "Error!",
|
||||
"message": "❌ <%= error.message %>",
|
||||
"sound": "Submarine"
|
||||
})(err);
|
||||
this.emit('end');
|
||||
};
|
||||
|
||||
return gulp
|
||||
.src(SassConfig.inputDir + '*.scss')
|
||||
gulp.src(SassConfig.inputDir + '*.scss')
|
||||
.pipe(concat('styles.css'))
|
||||
.pipe(plumber({errorHandler: onError}))
|
||||
.pipe(postcss(postcss_plugins))
|
||||
.pipe(sass(SassConfig.options).on('error', sass.logError))
|
||||
.pipe(postcss([autoprefixer()]))
|
||||
.pipe(gulp.dest(SassConfig.outputDir))
|
||||
.pipe(postcss([cssnano()]))
|
||||
.pipe(rename({suffix: '.min'}))
|
||||
.pipe(gulp.dest(SassConfig.outputDir))
|
||||
.pipe(livereload())
|
||||
.pipe(notify({
|
||||
"title": "scss_main",
|
||||
"subtitle": "Success!",
|
||||
"message": "✅ SCSS compiled",
|
||||
"timeout": "2"
|
||||
title: 'gulp',
|
||||
subtitle: 'Success!',
|
||||
message: '✅ SCSS compiled',
|
||||
timeout: '2'
|
||||
}));
|
||||
};
|
||||
|
||||
// Copy those other files
|
||||
function copy(done) {
|
||||
gulp.src([Config.inputDir + '**/*.*'])
|
||||
gulp.src([Config.inputDir + '*.*'])
|
||||
.pipe(gulp.dest(Config.outputDir))
|
||||
.pipe(livereload())
|
||||
done();
|
||||
};
|
||||
|
||||
// Watch for changes
|
||||
// watch for changes
|
||||
function watch() {
|
||||
livereload.listen();
|
||||
gulp.watch(SassConfig.inputDir + '*.scss', scss_main);
|
||||
gulp.watch(SassConfig.inputDir + '*.scss', scss);
|
||||
gulp.watch(Config.inputDir + '*.html', copy);
|
||||
};
|
||||
|
||||
|
|
@ -118,16 +97,14 @@ function cleanup(cb) {
|
|||
return rimraf(Config.outputDir + '*', cb)
|
||||
};
|
||||
|
||||
|
||||
//------------------------
|
||||
//:: Define tasks
|
||||
//----------------
|
||||
//:: Export tasks
|
||||
|
||||
// complex tasks
|
||||
const build = gulp.series(cleanup, gulp.parallel(copy, scss_addons, scss_main));
|
||||
const build = gulp.series(cleanup, gulp.parallel(copy, scss));
|
||||
|
||||
// export tasks
|
||||
exports.scss_main = scss_main;
|
||||
exports.scss_addons = scss_addons;
|
||||
exports.scss = scss;
|
||||
exports.copy = copy;
|
||||
exports.watch = watch;
|
||||
exports.cleanup = cleanup;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
19
package.json
19
package.json
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "website_template",
|
||||
"description": "npm & gulp development template",
|
||||
"version": "3.2.0",
|
||||
"version": "3.0.2",
|
||||
"author": "Jan Jastrow",
|
||||
"license": "MIT",
|
||||
"homepage": "https://jan.jastrow.me",
|
||||
|
|
@ -16,21 +16,20 @@
|
|||
"url": "https://gitea.schwerkraftlabor.de/jan/website_template"
|
||||
},
|
||||
"devDependencies": {
|
||||
"sass": "^1.49.7",
|
||||
"autoprefixer": "^9.7.6",
|
||||
"caniuse-lite": "^1.0.30001050",
|
||||
"cssnano": "^4.1.10",
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-sass": "^5.1.0",
|
||||
"gulp-concat": "^2.6.1",
|
||||
"gulp-livereload": "^4.0.2",
|
||||
"gulp-notify": "^4.0.0",
|
||||
"gulp-notify": "^3.2.0",
|
||||
"gulp-plumber": "^1.2.1",
|
||||
"gulp-postcss": "^9.0.1",
|
||||
"gulp-postcss": "^8.0.0",
|
||||
"gulp-rename": "^2.0.0",
|
||||
"merge2": "^1.4.1",
|
||||
"gulp-sass": "^4.1.0",
|
||||
"merge2": "^1.3.0",
|
||||
"rimraf": "^3.0.2",
|
||||
"sanitize.css": "^13.0.0",
|
||||
"autoprefixer": "^10.4.2",
|
||||
"caniuse-lite": "^1.0.30001312",
|
||||
"cssnano": "^5.0.17"
|
||||
"sanitize.css": "^11.0.0"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 2 version",
|
||||
|
|
|
|||
Loading…
Reference in New Issue