updated gulpfiles to gulp4
This commit is contained in:
@@ -0,0 +1,6 @@
|
|||||||
|
# Browsers that we support
|
||||||
|
|
||||||
|
last 2 version
|
||||||
|
> 1%
|
||||||
|
maintained node versions
|
||||||
|
not dead
|
||||||
@@ -1 +1 @@
|
|||||||
canvas#corpus-map{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;top:0;left:0;z-index:0}canvas#corpus-map.de-activated{background-color:#f4f4f4}div.node-popup{z-index:10;position:absolute;-webkit-box-sizing:content-box;box-sizing:content-box;width:300px;min-height:30px;top:60%;left:30%;pointer-events:none}div.node-popup .inner{padding:.6em;outline:red solid 1px;background-color:#fff}div.node-popup:before{content:"";position:absolute;width:60px;height:0;border-top:1px solid red}div.node-popup[pos=bottom-right]{-webkit-transform:translateY(42px) translateX(42px);transform:translateY(42px) translateX(42px)}div.node-popup[pos=bottom-right]:before{top:-1px;left:-61px;-webkit-transform-origin:bottom right;transform-origin:bottom right;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=bottom-left]{-webkit-transform:translateX(-100%) translateY(42px) translateX(-42px);transform:translateX(-100%) translateY(42px) translateX(-42px)}div.node-popup[pos=bottom-left]:before{top:calc(100% +1px);left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}div.node-popup[pos=top-left]{-webkit-transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px);transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px)}div.node-popup[pos=top-left]:before{bottom:0;left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=top-right]{-webkit-transform:translateY(-100%) translateY(-42px) translateX(42px);transform:translateY(-100%) translateY(-42px) translateX(42px)}div.node-popup[pos=top-right]:before{top:calc(100% + 1px);left:-61px;-webkit-transform-origin:top right;transform-origin:top right;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}
|
canvas#corpus-map{position:absolute;box-sizing:border-box;top:0;left:0;z-index:0}canvas#corpus-map.de-activated{background-color:#f4f4f4}div.node-popup{z-index:10;position:absolute;box-sizing:content-box;width:300px;min-height:30px;top:60%;left:30%;pointer-events:none}div.node-popup .inner{padding:.6em;outline:red solid 1px;background-color:#fff}div.node-popup:before{content:"";position:absolute;width:60px;height:0;border-top:1px solid red}div.node-popup[pos=bottom-right]{-webkit-transform:translateY(42px) translateX(42px);transform:translateY(42px) translateX(42px)}div.node-popup[pos=bottom-right]:before{top:-1px;left:-61px;-webkit-transform-origin:bottom right;transform-origin:bottom right;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=bottom-left]{-webkit-transform:translateX(-100%) translateY(42px) translateX(-42px);transform:translateX(-100%) translateY(42px) translateX(-42px)}div.node-popup[pos=bottom-left]:before{top:calc(100% +1px);left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}div.node-popup[pos=top-left]{-webkit-transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px);transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px)}div.node-popup[pos=top-left]:before{bottom:0;left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=top-right]{-webkit-transform:translateY(-100%) translateY(-42px) translateX(42px);transform:translateY(-100%) translateY(-42px) translateX(42px)}div.node-popup[pos=top-right]:before{top:calc(100% + 1px);left:-61px;-webkit-transform-origin:top right;transform-origin:top right;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}
|
||||||
@@ -33,38 +33,41 @@ function handleError(err) {
|
|||||||
console.log(err.toString());
|
console.log(err.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
gulp.task('scripts', function () {
|
gulp.task('scripts', function (done) {
|
||||||
var tasks = modules.map(function(module) {
|
return new Promise(function(resolve, reject) {
|
||||||
return gulp.src('./'+module+'/assets/scripts/*.js')
|
modules.map(function(module) {
|
||||||
.pipe(gulpif(prod, stripDebug()))
|
gulp.src('./'+module+'/assets/scripts/*.js')
|
||||||
.pipe(gulpif(prod, jsmin()))
|
.pipe(gulpif(prod, stripDebug()))
|
||||||
.pipe(rename({suffix: '.min'}))
|
.pipe(gulpif(prod, jsmin()))
|
||||||
.pipe(gulp.dest('./'+module+'/assets/dist/scripts/'));
|
.pipe(rename({suffix: '.min'}))
|
||||||
|
.pipe(gulp.dest('./'+module+'/assets/dist/scripts/'));
|
||||||
|
});
|
||||||
|
resolve();
|
||||||
});
|
});
|
||||||
return es.merge.apply(null, tasks);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('styles', function () {
|
gulp.task('styles', function (done) {
|
||||||
var tasks = modules.map(function(module) {
|
return new Promise(function(resolve, reject) {
|
||||||
return gulp.src('./'+module+'/assets/styles/*.scss')
|
modules.map(function(module) {
|
||||||
.pipe(sass().on('error', sass.logError))
|
gulp.src('./'+module+'/assets/styles/*.scss')
|
||||||
.pipe(autoprefixer({
|
.pipe(sass().on('error', sass.logError))
|
||||||
browsers: ['last 2 versions'],
|
.pipe(autoprefixer({
|
||||||
cascade: false
|
cascade: false
|
||||||
})).on('error', handleError)
|
})).on('error', handleError)
|
||||||
.pipe(gulpif(prod, cssmin()))
|
.pipe(gulpif(prod, cssmin()))
|
||||||
// .pipe(cssmin())
|
// .pipe(cssmin())
|
||||||
.pipe(rename({suffix: '.min'}))
|
.pipe(rename({suffix: '.min'}))
|
||||||
.pipe(gulp.dest('./'+module+'/assets/dist/styles/'));
|
.pipe(gulp.dest('./'+module+'/assets/dist/styles/'));
|
||||||
|
});
|
||||||
|
resolve();
|
||||||
});
|
});
|
||||||
return es.merge.apply(null, tasks);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// default gulp task
|
// default gulp task
|
||||||
gulp.task('default', ['scripts', 'styles'], function() { //'bower',
|
gulp.task('default', gulp.series('scripts', 'styles', done => {
|
||||||
for (var i = 0; i < modules.length; i++) {
|
for (var i = 0; i < modules.length; i++) {
|
||||||
// gulp.watch('./assets/styles/*/*.scss', ['styles']);
|
gulp.watch('./'+modules[i]+'/assets/styles/*.scss', gulp.series('styles'));
|
||||||
gulp.watch('./'+modules[i]+'/assets/styles/*.scss', ['styles']);
|
gulp.watch('./'+modules[i]+'/assets/scripts/*.js', gulp.series('scripts'));
|
||||||
gulp.watch('./'+modules[i]+'/assets/scripts/*.js', ['scripts']);
|
|
||||||
}
|
}
|
||||||
});
|
done()
|
||||||
|
}));
|
||||||
|
|||||||
Generated
+1476
-738
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,8 @@
|
|||||||
"gulp-sass": "^4.0.1",
|
"gulp-sass": "^4.0.1",
|
||||||
"gulp-strip-debug": "^3.0.0",
|
"gulp-strip-debug": "^3.0.0",
|
||||||
"gulp-watch": "latest",
|
"gulp-watch": "latest",
|
||||||
"minimist": "^1.2.0"
|
"minimist": "^1.2.0",
|
||||||
|
"node-sass": "^4.12.0"
|
||||||
},
|
},
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,16 +28,17 @@ function handleError(err) {
|
|||||||
console.log(err.toString());
|
console.log(err.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
gulp.task('scripts', function () {
|
gulp.task('scripts', done => {
|
||||||
gulp.src(['./assets/scripts/main.js', './assets/scripts/redirect.js']) // './assets/scripts/shared_variables.js',
|
gulp.src(['./assets/scripts/main.js', './assets/scripts/redirect.js']) // './assets/scripts/shared_variables.js',
|
||||||
// .pipe(concat('main.js'))
|
// .pipe(concat('main.js'))
|
||||||
.pipe(gulpif(prod, stripDebug()))
|
.pipe(gulpif(prod, stripDebug()))
|
||||||
.pipe(gulpif(prod, jsmin()))
|
.pipe(gulpif(prod, jsmin()))
|
||||||
.pipe(rename({suffix: '.min'}))
|
.pipe(rename({suffix: '.min'}))
|
||||||
.pipe(gulp.dest('./assets/dist/scripts/'));
|
.pipe(gulp.dest('./assets/dist/scripts/'));
|
||||||
|
done()
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('styles', function () {
|
gulp.task('styles', done => {
|
||||||
gulp.src(['./assets/styles/app.scss'])
|
gulp.src(['./assets/styles/app.scss'])
|
||||||
.pipe(sass().on('error', sass.logError))
|
.pipe(sass().on('error', sass.logError))
|
||||||
.pipe(autoprefixer({
|
.pipe(autoprefixer({
|
||||||
@@ -49,44 +50,49 @@ gulp.task('styles', function () {
|
|||||||
// .pipe(cssmin())
|
// .pipe(cssmin())
|
||||||
.pipe(rename({suffix: '.min'}))
|
.pipe(rename({suffix: '.min'}))
|
||||||
.pipe(gulp.dest('./assets/dist/styles/'));
|
.pipe(gulp.dest('./assets/dist/styles/'));
|
||||||
|
done()
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('bower', function() {
|
gulp.task('bower', done => {
|
||||||
gulp.src(mainBowerFiles({
|
gulp.src(mainBowerFiles({
|
||||||
"overrides":{
|
"overrides":{
|
||||||
"masonry-layout":{
|
"masonry-layout":{
|
||||||
"main":"./dist/masonry.pkgd.min.js"
|
"main":"./dist/masonry.pkgd.min.js"
|
||||||
},
|
},
|
||||||
"imagesloaded":{
|
"imagesloaded":{
|
||||||
"main":"./imagesloaded.pkgd.min.js"
|
"main":"./imagesloaded.pkgd.min.js"
|
||||||
},
|
},
|
||||||
"jquery":{"ignore":true},
|
"jquery":{"ignore":true},
|
||||||
"ev-emitter":{"ignore":true},
|
"ev-emitter":{"ignore":true},
|
||||||
"fizzy-ui-utils":{"ignore":true},
|
"fizzy-ui-utils":{"ignore":true},
|
||||||
"get-size":{"ignore":true},
|
"get-size":{"ignore":true},
|
||||||
"outlayer":{"ignore":true},
|
"outlayer":{"ignore":true},
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
.pipe(gulp.dest('./assets/dist/bower/'));
|
.pipe(gulp.dest('./assets/dist/bower/'));
|
||||||
|
done()
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('svg', function () {
|
gulp.task('svg', done => {
|
||||||
gulp.src(['./assets/img/*.svg', '!./assets/img/edlp-loader-anim.svg'])
|
gulp.src(['./assets/img/*.svg', '!./assets/img/edlp-loader-anim.svg'])
|
||||||
.pipe(svgmin())
|
.pipe(svgmin())
|
||||||
.pipe(gulp.dest('./assets/dist/img'));
|
.pipe(gulp.dest('./assets/dist/img'));
|
||||||
gulp.src('./assets/img/edlp-loader-anim.svg')
|
gulp.src('./assets/img/edlp-loader-anim.svg')
|
||||||
.pipe(gulp.dest('./assets/dist/img'));
|
.pipe(gulp.dest('./assets/dist/img'));
|
||||||
|
done()
|
||||||
});
|
});
|
||||||
|
|
||||||
// default gulp task
|
// default gulp task
|
||||||
// , 'vars2sass' 'vars2js',
|
// , 'vars2sass' 'vars2js',
|
||||||
gulp.task('default', ['bower', 'scripts', 'styles', 'svg'], function() {
|
// gulp.task('default', ['bower', 'scripts', 'styles', 'svg'], function() {
|
||||||
|
gulp.task('default', gulp.series('bower', 'scripts', 'styles', 'svg', function(done) {
|
||||||
// gulp.watch('./assets/json/*.json', ['vars2js', 'styles', 'scripts']); //, 'vars2sass'
|
// gulp.watch('./assets/json/*.json', ['vars2js', 'styles', 'scripts']); //, 'vars2sass'
|
||||||
gulp.watch('./assets/styles/*.scss', ['styles']);
|
gulp.watch('./assets/styles/*.scss', gulp.series('styles'));
|
||||||
gulp.watch('./assets/styles/base/*.scss', ['styles']);
|
gulp.watch('./assets/styles/base/*.scss', gulp.series('styles'));
|
||||||
gulp.watch('./assets/scripts/*.js', ['scripts']);
|
gulp.watch('./assets/scripts/*.js', gulp.series('scripts'));
|
||||||
gulp.watch('./assets/img/*.svg', ['svg']);
|
gulp.watch('./assets/img/*.svg', gulp.series('svg'));
|
||||||
});
|
done()
|
||||||
|
}));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"license": "GPLv3",
|
"license": "GPLv3",
|
||||||
"homepage": "https://encyclopediedelaparole.org",
|
"homepage": "https://encyclopediedelaparole.org",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"gulp": "latest",
|
"gulp": "^4.0.2",
|
||||||
"gulp-autoprefixer": "^5.0.0",
|
"gulp-autoprefixer": "^5.0.0",
|
||||||
"gulp-concat": "latest",
|
"gulp-concat": "latest",
|
||||||
"gulp-cssmin": "latest",
|
"gulp-cssmin": "latest",
|
||||||
@@ -16,13 +16,14 @@
|
|||||||
"gulp-json-to-sass": "latest",
|
"gulp-json-to-sass": "latest",
|
||||||
"gulp-json2js": "latest",
|
"gulp-json2js": "latest",
|
||||||
"gulp-rename": "latest",
|
"gulp-rename": "latest",
|
||||||
"gulp-sass": "^4.0.1",
|
"gulp-sass": "^4.0.2",
|
||||||
"gulp-strip-debug": "^3.0.0",
|
"gulp-strip-debug": "^3.0.0",
|
||||||
"gulp-svgmin": "^1.2.4",
|
"gulp-svgmin": "^1.2.4",
|
||||||
"gulp-util": "latest",
|
"gulp-util": "latest",
|
||||||
"gulp-watch": "latest",
|
"gulp-watch": "latest",
|
||||||
"main-bower-files": "latest",
|
"main-bower-files": "^2.13.3",
|
||||||
"minimist": "^1.2.0"
|
"minimist": "^1.2.0",
|
||||||
|
"node-sass": "^4.12.0"
|
||||||
},
|
},
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user