Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nicola 2021-12-09 08:39:04 +01:00
commit dfa9810a75
3 changed files with 477 additions and 2175 deletions

View File

@ -3,7 +3,7 @@ const path = require('path');
const gulp = require('gulp'); const gulp = require('gulp');
const include = require('gulp-include'); const include = require('gulp-include');
const handlebars = require('gulp-hb'); const handlebars = require('gulp-hb');
const sass = require('gulp-sass'); const sass = require('gulp-sass')(require('sass'));
const rename = require('gulp-rename'); const rename = require('gulp-rename');
//const hb_svg = require('handlebars-helper-svg'); //const hb_svg = require('handlebars-helper-svg');
@ -63,6 +63,9 @@ function compile_page(){
// empty the build folder, or create it // empty the build folder, or create it
try {
fs.rmdirSync(BUILDDIR, { recursive: true }); fs.rmdirSync(BUILDDIR, { recursive: true });
fs.mkdirSync(BUILDDIR); fs.mkdirSync(BUILDDIR);
} catch (err) {console.log('failed to find build folder, but it\'s probably fine')}
gulp.parallel(copy_images, copy_logs, render_js, render_css, compile_page)(); gulp.parallel(copy_images, copy_logs, render_js, render_css, compile_page)();

2644
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,6 @@
"hot:reload": "cross-env RELOAD=yes npm run hot" "hot:reload": "cross-env RELOAD=yes npm run hot"
}, },
"author": "Lospec", "author": "Lospec",
"license": "ISC",
"nodemonConfig": { "nodemonConfig": {
"ext": "js,hbs,scss", "ext": "js,hbs,scss",
"ignore": "build/" "ignore": "build/"
@ -24,7 +23,7 @@
"gulp-hb": "^8.0.0", "gulp-hb": "^8.0.0",
"gulp-include": "^2.3.1", "gulp-include": "^2.3.1",
"gulp-rename": "^2.0.0", "gulp-rename": "^2.0.0",
"gulp-sass": "^4.0.2", "gulp-sass": "^5.0.0",
"handlebars-helper-svg": "^2.0.2", "handlebars-helper-svg": "^2.0.2",
"nodemon": "^2.0.7", "nodemon": "^2.0.7",
"open": "^8.0.6", "open": "^8.0.6",