Skip to content

Commit b2a5bfb

Browse files
author
JelteMX
committed
Update Gulp dependencies
1 parent 700ce6c commit b2a5bfb

File tree

9 files changed

+146
-535
lines changed

9 files changed

+146
-535
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
Grunt/node_modules
21
Gulp/node_modules
32
node_modules
43
dist

Grunt/_Gruntfile.js

Lines changed: 0 additions & 103 deletions
This file was deleted.

Grunt/_package.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

Gulp/_Gulpfile.js

Lines changed: 72 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,94 +6,111 @@
66
'use strict';
77

88
// What is the name of the style folder in this theme folder?
9-
var sourceStyleFolder = '{{{ sourceStyleFolder }}}';
9+
const sourceStyleFolder = '{{{ sourceStyleFolder }}}';
1010

1111
// What is the name of the style folder in the deployment folder?
12-
var deploymentStyleFolder = '{{{ deploymentStyleFolder }}}';
12+
const deploymentStyleFolder = '{{{ deploymentStyleFolder }}}';
1313

1414
// Browsersync feature, please specify the host & port of the running project (without http://)
15-
var proxyAddress = '{{{ localAddress }}}';
15+
const proxyAddress = '{{{ localAddress }}}';
1616

1717
/*
18-
*************************************************************************
19-
* Don't try to edit below this line, unless you know what you are doing *
20-
*************************************************************************/
21-
var gulp = require('gulp'),
22-
sass = require('gulp-sass'),
23-
browserSync = require('browser-sync').create(),
24-
path = require('path'),
25-
sourcemaps = require('gulp-sourcemaps');
26-
27-
var sourceFolder = './' + sourceStyleFolder + '/',
28-
sourceSassFolder = sourceFolder + 'sass/',
29-
sourceCssFolder = sourceFolder + 'css/';
30-
31-
var deploymentFolder = './deployment/web/' + deploymentStyleFolder,
32-
deploymentCssFolder = deploymentFolder + '/css/';
18+
*************************************************************************
19+
* Don't try to edit below this line, unless you know what you are doing *
20+
*************************************************************************/
21+
22+
const path = require('path');
23+
const gulp = require('gulp');
24+
const sass = require('gulp-sass');
25+
const browserSync = require('browser-sync').create();
26+
const sourcemaps = require('gulp-sourcemaps');
27+
28+
const sourceFolder = './' + sourceStyleFolder + '/';
29+
const sourceSassFolder = sourceFolder + 'sass/';
30+
const sourceCssFolder = sourceFolder + 'css/';
31+
32+
const deploymentFolder = './deployment/web/' + deploymentStyleFolder;
33+
const deploymentCssFolder = deploymentFolder + '/css/';
34+
35+
console.log(`Gulp is using the following folders:
36+
sourceFolder: ${sourceFolder}
37+
sourceSassFolder: ${sourceSassFolder}
38+
sourceCssFolder: ${sourceCssFolder}
39+
deploymentFolder: ${deploymentFolder}
40+
deploymentCssFolder: ${deploymentCssFolder}
41+
`);
3342

3443
gulp.task('build-sass', function () {
35-
return gulp.src(sourceSassFolder + '**/*.scss')
36-
.pipe(sass({
37-
outputStyle: 'expanded'
38-
}).on('error', sass.logError))
39-
.pipe(gulp.dest(sourceCssFolder))
40-
.pipe(gulp.dest(deploymentCssFolder));
44+
return gulp.src(sourceSassFolder + '**/*.scss')
45+
.pipe(sourcemaps.init())
46+
.pipe(sass({
47+
outputStyle: 'expanded'
48+
}).on('error', sass.logError))
49+
.pipe(sourcemaps.write('./maps'))
50+
.pipe(gulp.dest(sourceCssFolder))
51+
.pipe(gulp.dest(deploymentCssFolder));
4152
});
4253

4354
gulp.task('build', function () {
44-
return gulp.src(sourceSassFolder + '**/*.scss')
45-
.pipe(sass({
46-
outputStyle: 'compressed'
47-
}).on('error', sass.logError))
48-
.pipe(gulp.dest(sourceCssFolder))
49-
.pipe(gulp.dest(deploymentCssFolder));
55+
return gulp.src(sourceSassFolder + '**/*.scss')
56+
.pipe(sass({
57+
outputStyle: 'compressed'
58+
}).on('error', sass.logError))
59+
.pipe(gulp.dest(sourceCssFolder))
60+
.pipe(gulp.dest(deploymentCssFolder));
5061
});
5162

5263
gulp.task('copy-css', function () {
53-
return gulp.src(sourceCssFolder + '**/*.css')
54-
.pipe(gulp.dest(deploymentCssFolder));
64+
return gulp.src(sourceCssFolder + '**/*.css')
65+
.pipe(gulp.dest(deploymentCssFolder));
5566
});
5667

5768
gulp.task('watch:sass', function () {
58-
gulp.watch('**/*.scss', { cwd: sourceSassFolder }, gulp.series('build-sass'));
69+
gulp.watch('**/*.scss', {
70+
cwd: sourceSassFolder
71+
}, gulp.series('build-sass'));
5972
});
6073

6174
gulp.task('watch:css', function () {
62-
gulp.watch('**/*.css', { cwd: sourceCssFolder }, gulp.series('copy-css'));
75+
gulp.watch('**/*.css', {
76+
cwd: sourceCssFolder
77+
}, gulp.series('copy-css'));
6378
});
6479

6580
gulp.task('default', gulp.series(['watch:sass']));
6681
gulp.task('css', gulp.series(['watch:css']));
6782

6883
// Browsersync
6984
gulp.task('browsersync-sass', function () {
70-
return gulp.src(sourceSassFolder + '**/*.scss')
71-
.pipe(sourcemaps.init())
72-
.pipe(sass({
73-
outputStyle: 'expanded'
74-
}).on('error', sass.logError))
75-
.pipe(sourcemaps.write())
76-
.pipe(gulp.dest(sourceCssFolder))
77-
.pipe(gulp.dest(deploymentCssFolder))
78-
.pipe(browserSync.stream());
85+
return gulp.src(sourceSassFolder + '**/*.scss')
86+
.pipe(sourcemaps.init())
87+
.pipe(sass({
88+
outputStyle: 'expanded'
89+
}).on('error', sass.logError))
90+
.pipe(sourcemaps.write('./maps'))
91+
.pipe(gulp.dest(sourceCssFolder))
92+
.pipe(gulp.dest(deploymentCssFolder))
93+
.pipe(browserSync.stream());
7994
});
8095

8196
gulp.task('watch:browsersync-sass', function () {
82-
gulp.watch('**/*.scss', { cwd: sourceSassFolder }, gulp.series('browsersync-sass'));
97+
gulp.watch('**/*.scss', {
98+
cwd: sourceSassFolder
99+
}, gulp.series('browsersync-sass'));
83100
});
84101

85102
gulp.task('browsersync', function () {
86-
browserSync.init({
87-
proxy: {
88-
target: proxyAddress,
89-
ws: true
90-
},
91-
online: true,
92-
open: true,
93-
reloadOnRestart: true,
94-
notify: true,
95-
ghostMode: false
96-
});
103+
browserSync.init({
104+
proxy: {
105+
target: proxyAddress,
106+
ws: true
107+
},
108+
online: true,
109+
open: true,
110+
reloadOnRestart: true,
111+
notify: true,
112+
ghostMode: false
113+
});
97114
});
98115

99116
gulp.task('dev', gulp.parallel(['browsersync-sass', 'watch:browsersync-sass', 'browsersync']));

Gulp/_package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"repository": "{{{ repository }}}",
1919
"license": "MIT",
2020
"dependencies": {
21-
"browser-sync": "^2.26.7",
21+
"browser-sync": "^2.26.14",
2222
"gulp": "^4.0.2",
23-
"gulp-sass": "^4.0.2",
24-
"gulp-sourcemaps": "^2.6.5"
23+
"gulp-sass": "^4.1.0",
24+
"gulp-sourcemaps": "^3.0.0"
2525
}
2626
}

make

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ config.repository = pkg.repository;
1212

1313
target.all = function() {
1414
target.gulp();
15-
target.grunt();
1615
};
1716

1817
target.gulp = function() {
@@ -22,13 +21,6 @@ target.gulp = function() {
2221
.finalize();
2322
};
2423

25-
target.grunt = function() {
26-
createPackage("Grunt")
27-
.append(runMustache("Grunt/_Gruntfile.js", config), { name: "Gruntfile.js" })
28-
.append(runMustache("Grunt/_package.json", config), { name: "package.json" })
29-
.finalize();
30-
};
31-
3224
function createPackage(distname) {
3325
mkdir("-p", "dist");
3426

0 commit comments

Comments
 (0)