Skip to content

Commit 4feaacc

Browse files
authored
ENH: Update build process for gulp tasks to use gulpfile.mjs (#1960)
1 parent df9fc84 commit 4feaacc

5 files changed

Lines changed: 27 additions & 63 deletions

File tree

Dnn.CommunityForums/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "9.8.0.0",
2+
"version": "10.0.0.0",
33
"name": "dnn.community.forums",
44
"private": true,
55
"type": "module",

Dnn.CommunityForums/themes/community-bootstrap/gulpfile.js renamed to Dnn.CommunityForums/themes/community-bootstrap/gulpfile.mjs

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
const gulp = require('gulp');
2-
const sass = require('gulp-sass')(require('sass'));
3-
const cleanCSS = require('gulp-clean-css');
4-
const sourcemaps = require('gulp-sourcemaps');
5-
const rename = require('gulp-rename');
6-
const merge = require('merge-stream');
7-
8-
const zip = require('gulp-zip').default;
1+
import gulp from 'gulp';
2+
import sassModule from 'sass';
3+
import sassPlugin from 'gulp-sass';
4+
import cleanCSS from 'gulp-clean-css';
5+
import sourcemaps from 'gulp-sourcemaps';
6+
import rename from 'gulp-rename';
7+
import merge from 'merge-stream';
8+
import { default as zip } from 'gulp-zip';
99

10+
const sass = sassPlugin(sassModule);
1011

1112
// scss ----------------------
1213

@@ -17,30 +18,22 @@ const cssCopyTo = "./";
1718
function buildScss() { // Parse only the Theme.scss file
1819
// 1. What scss files to parse?
1920
var scssCss = gulp.src('./_src/scss/theme.scss')
20-
2121
.pipe(sourcemaps.init())
2222
.pipe(sass())
2323
.pipe(sourcemaps.write(cssCopyTo))
2424
.pipe(gulp.dest(cssCopyTo));
2525

26-
2726
var cssCssMin = gulp.src('./_src/scss/theme.scss')
28-
29-
3027
.pipe(sass())
3128
.pipe(rename({ suffix: '.min' }))
3229
.pipe(sourcemaps.init())
3330
.pipe(sourcemaps.write(cssCopyTo))
3431
.pipe(cleanCSS({ inline: ['none'] }))
3532
.pipe(gulp.dest(cssCopyTo));
3633

37-
3834
return merge(scssCss, cssCssMin);
39-
4035
}
4136

42-
43-
4437
function allTasks() {
4538
buildScss();
4639
}
@@ -51,21 +44,10 @@ function packageSource(cb) {
5144
.pipe(gulp.dest('./'))
5245

5346
cb();
54-
5547
}
5648

57-
58-
// Watch task: watch scss files for changes
59-
// If any change, run scss tasks
6049
function watchTask() {
61-
6250
gulp.watch(scssWatchPath, gulp.series(buildScss, packageSource));
63-
64-
6551
}
6652

67-
exports.buildScss = buildScss;
68-
exports.source = packageSource;
69-
70-
exports.default = watchTask;
71-
53+
export { buildScss, packageSource as source, watchTask as default };
Binary file not shown.

Dnn.CommunityForums/themes/community-default/gulpfile.js renamed to Dnn.CommunityForums/themes/community-default/gulpfile.mjs

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
const gulp = require('gulp');
2-
const changed = require('gulp-changed');
3-
const newer = require('gulp-newer');
4-
const less = require('gulp-less');
5-
const cleanCSS = require('gulp-clean-css');
6-
const sourcemaps = require('gulp-sourcemaps');
7-
const rename = require('gulp-rename');
8-
const merge = require('merge-stream');
9-
10-
const zip = require('gulp-zip').default;
1+
import gulp from 'gulp';
2+
import changed from 'gulp-changed';
3+
import newer from 'gulp-newer';
4+
import less from 'gulp-less';
5+
import cleanCSS from 'gulp-clean-css';
6+
import sourcemaps from 'gulp-sourcemaps';
7+
import rename from 'gulp-rename';
8+
import merge from 'merge-stream';
9+
import zipPlugin from 'gulp-zip';
1110

1211
// LESS ----------------------
1312

@@ -17,57 +16,40 @@ const cssCopyTo = "./";
1716

1817
function buildLess() { // Parse only the Skin.less file
1918
// 1. What less files to parse?
20-
var lessCss = gulp.src('./_src/less/theme.less')
21-
19+
const lessCss = gulp.src('./_src/less/theme.less')
2220
.pipe(sourcemaps.init())
2321
.pipe(less())
2422
.pipe(sourcemaps.write(cssCopyTo))
2523
.pipe(gulp.dest(cssCopyTo));
2624

27-
28-
var lessCssMin = gulp.src('./_src/less/theme.less')
29-
30-
25+
const lessCssMin = gulp.src('./_src/less/theme.less')
3126
.pipe(less())
3227
.pipe(rename({ suffix: '.min' }))
3328
.pipe(sourcemaps.init())
3429
.pipe(sourcemaps.write(cssCopyTo))
3530
.pipe(cleanCSS({ inline: ['none'] }))
3631
.pipe(gulp.dest(cssCopyTo));
3732

38-
3933
return merge(lessCss, lessCssMin);
40-
4134
}
4235

43-
44-
4536
function allTasks() {
4637
buildLess();
4738
}
4839

4940
function packageSource(cb) {
50-
var srcPipe = gulp.src(['./**/*.*', "!./theme-source.zip.resources", "!./node_modules/**"])
51-
.pipe(changed('./theme-source.zip.resources'))
52-
.pipe(zip('theme-source.zip.resources'))
53-
.pipe(gulp.dest('./'))
41+
gulp.src(['./**/*.*', "!./theme-source.zip.resources", "!./node_modules/**"])
42+
.pipe(changed('./theme-source.zip.resources'))
43+
.pipe(zipPlugin('theme-source.zip.resources'))
44+
.pipe(gulp.dest('./'));
5445

5546
cb();
56-
5747
}
5848

59-
6049
// Watch task: watch LESS files for changes
6150
// If any change, run LESS tasks
6251
function watchTask() {
63-
6452
gulp.watch(lessWatchPath, gulp.series(buildLess, packageSource));
65-
66-
6753
}
6854

69-
exports.buildLess = buildLess;
70-
exports.source = packageSource;
71-
72-
exports.default = watchTask;
73-
55+
export { buildLess, packageSource as source, watchTask as default };
Binary file not shown.

0 commit comments

Comments
 (0)