Skip to content

Commit

Permalink
Update to gulp 4 so modern Node version can be used
Browse files Browse the repository at this point in the history
  • Loading branch information
gjsjohnmurray authored and nikitaeverywhere committed Jul 2, 2022
1 parent 5cbe6e7 commit 3378d15
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 43 deletions.
68 changes: 35 additions & 33 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ let dir = __dirname,
},
themes = []; // reassigned

const sass = require('gulp-sass')(require('sass'));

function themesReady () { // triggered when build is done
themes = fs.readdirSync(`${ dest }/client/css/themes`);
context.context.themes = themes.map(function (n) {
Expand All @@ -58,28 +60,42 @@ gulp.task("prepare", function (cb) {
cb();
});

gulp.task("clean", ["prepare"], function () {
return gulp.src(dest, { read: false })
gulp.task("clean", gulp.series("prepare", function () {
return gulp.src(dest, { read: false, allowEmpty: true })
.pipe(rimraf());
});
}));

gulp.task("html", ["clean"], function () {
gulp.task("html", gulp.series(function () {
return gulp.src(`${ source }/client/index.html`)
.pipe(preprocess(context))
.pipe(gulp.dest(`${ dest }/client`));
});
}));

gulp.task("scss", ["clean"], () => {
gulp.task("scss", gulp.series(() => {
return gulp.src([`${source}/client/scss/index.scss`])
.pipe(preprocess(context))
.pipe(scss())
.pipe(sass())
.pipe(cssNano({
zindex: false
}))
.pipe(gulp.dest(`${dest}/client/css`));
});
}));

gulp.task("copy-css-themes", gulp.series(function () {
return gulp.src(`${ source }/client/scss/themes/*.*`)
.pipe(preprocess(context))
.pipe(sass())
.pipe(cssNano())
.pipe(gulp.dest(`${ dest }/client/css/themes/`));
}));

// Need css themes directory copied to collect themes names.
gulp.task("css", gulp.series("scss", "copy-css-themes", function (cb) {
themesReady();
cb();
}));

gulp.task("js", ["clean", "css"], function () {
gulp.task("js", gulp.series("css", function () {
let bundler = browserify({
entries: `${source}/client/js/index.js`,
debug: true
Expand All @@ -97,39 +113,25 @@ gulp.task("js", ["clean", "css"], function () {
output: {
ascii_only: true,
width: 25000,
max_line_len: 15000
max_line_len: 15000,
comments: "some"
},
preserveComments: "some"
}))
.pipe(replace(/\x0b|\x1b/g, e => `\\x${ e === "\x0b" ? 0 : 1 }b`))
.pipe(replace(/[\x00-\x08]/g, e => `\\x0${ e.charCodeAt(0) }`))
//.pipe(sourcemaps.write())
.pipe(gulp.dest(`${ dest }/client/js`));
});
}));

gulp.task("copy-css-themes", ["clean"], function () {
return gulp.src(`${ source }/client/scss/themes/*.*`)
.pipe(preprocess(context))
.pipe(scss())
.pipe(cssNano())
.pipe(gulp.dest(`${ dest }/client/css/themes/`));
});

// Need css themes directory copied to collect themes names.
gulp.task("css", ["scss", "copy-css-themes"], function (cb) {
themesReady();
cb();
});
gulp.task("readme", gulp.series(function () {
return gulp.src(`${ dir }/readme.md`)
.pipe(gulp.dest(`${ dest }`));
}));

gulp.task("cls", ["js", "js", "html", "css", "readme"], () => {
gulp.task("cls", gulp.series("js", "js", "html", "css", "readme", () => {
return gulp.src([`${ source }/cls/**/*.cls`])
.pipe(preprocess(context))
.pipe(gulp.dest(`${dest}/cls`));
});

gulp.task("readme", ["clean"], function () {
return gulp.src(`${ dir }/readme.md`)
.pipe(gulp.dest(`${ dest }`));
});
}));

gulp.task("default", ["cls"]);
gulp.task("default", gulp.series("clean", "cls"));
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name": "Nikita Savchenko",
"url": "https://nikita.tk"
},
"version": "4.9.3",
"version": "4.9.4",
"gaID": "UA-83005064-2",
"releaseNumber": 26,
"scripts": {
Expand All @@ -24,17 +24,18 @@
"babel-preset-es2015": "^6.22.0",
"babelify": "^7.3.0",
"browserify": "^14.1.0",
"gulp": "^3.9.1",
"gulp-cssnano": "^2.1.2",
"gulp": "^4.0.2",
"gulp-cssnano": "^2.1.3",
"gulp-minify-css": "^1.2.4",
"gulp-preprocess": "^2.0.0",
"gulp-rename": "^1.2.2",
"gulp-preprocess": "^4.0.2",
"gulp-rename": "^2.0.0",
"gulp-replace": "^0.5.4",
"gulp-rimraf": "^0.2.1",
"gulp-sass": "^3.1.0",
"gulp-uglify": "^2.1.0",
"gulp-rimraf": "^1.0.0",
"gulp-sass": "^5.1.0",
"gulp-uglify": "^3.0.2",
"preprocessify": "^1.0.1",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0"
"sass": "^1.53.0",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0"
}
}

0 comments on commit 3378d15

Please sign in to comment.