Skip to content
This repository was archived by the owner on Apr 29, 2022. It is now read-only.

Commit 684b4aa

Browse files
lejoelejoe
committed
Merge pull request #97 from ginetta/revert-new-file-watch
Revert "Makes sure the new files are watched"
2 parents 5a05956 + 68af114 commit 684b4aa

10 files changed

Lines changed: 63 additions & 61 deletions

File tree

‎gulp/tasks/accessibility.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
'use strict';
22

33
module.exports = function (gulp, $, config) {
4-
return function () {
5-
var srcFiles = config.paths.pages.dest + '**/*.html';
64

5+
var srcFiles = config.paths.pages.dest + '**/*.html';
6+
7+
return function () {
78
return gulp.src(srcFiles)
89
.pipe($.a11y())
910
.pipe($.a11y.reporter())

‎gulp/tasks/assets.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
var merge = require('merge-stream');
33

44
module.exports = function (gulp, $, config) {
5-
return function () {
6-
var imagesSrc = config.appFiles.images;
7-
var imagesDest = config.paths.images.dest;
8-
var logosSrc = config.appFiles.logos;
9-
var logosDest = config.paths.logos.dest;
10-
var faviconsSrc = config.appFiles.favicons;
11-
var faviconsDest = config.paths.favicons.dest;
12-
var fontsSrc = config.appFiles.fonts;
13-
var fontsDest = config.paths.fonts.dest;
5+
var imagesSrc = config.appFiles.images;
6+
var imagesDest = config.paths.images.dest;
7+
var logosSrc = config.appFiles.logos;
8+
var logosDest = config.paths.logos.dest;
9+
var faviconsSrc = config.appFiles.favicons;
10+
var faviconsDest = config.paths.favicons.dest;
11+
var fontsSrc = config.appFiles.fonts;
12+
var fontsDest = config.paths.fonts.dest;
1413

14+
return function () {
1515
var imagesSt = gulp.src(imagesSrc)
1616
.pipe($.changed(imagesDest))
1717
.pipe(gulp.dest(imagesDest));

‎gulp/tasks/clean.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
var del = require('del');
33

44
module.exports = function (gulp, $, config) {
5-
return function (cb) {
6-
var destFolder = config.basePaths.dest + '*';
5+
var destFolder = config.basePaths.dest + '*';
76

7+
return function (cb) {
88
del([destFolder], cb);
99
};
1010
};

‎gulp/tasks/content.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
var merge = require('merge-stream');
33

44
module.exports = function (gulp, $, config) {
5-
return function () {
6-
var srcFiles = config.paths.content.src;
7-
var languages = config.languages;
8-
var destFiles = config.paths.content.dest;
5+
var srcFiles = config.paths.content.src;
6+
var languages = config.languages;
7+
var destFiles = config.paths.content.dest;
98

9+
return function () {
1010
// Generate the language file for each language
1111
var contentStreams = languages.map(function(language) {
1212
return gulp.src(srcFiles + language + '/**/*.yml')

‎gulp/tasks/deploy.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ var rsync = require('rsyncwrapper').rsync;
44

55

66
module.exports = function (gulp, $, config) {
7-
return function (done) {
8-
var environment = config.environments.testing;
9-
var defaultPath = '/home/www-clients/';
10-
var serverPath = environment.username + '@' + environment.host;
11-
var deploySrc = config.basePaths.dest;
12-
var deployDest = serverPath + ':' + defaultPath + environment.projectPath + environment.releasePath;
7+
var environment = config.environments.testing;
8+
var defaultPath = '/home/www-clients/';
9+
var serverPath = environment.username + '@' + environment.host;
10+
var deploySrc = config.basePaths.dest;
11+
var deployDest = serverPath + ':' + defaultPath + environment.projectPath + environment.releasePath;
12+
1313

14+
return function (done) {
1415
var rsyncOptions = {
1516
ssh: true,
1617
src: deploySrc,

‎gulp/tasks/pages.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ var handleError = require('../utils/handleError');
88

99

1010
module.exports = function (gulp, $, config) {
11+
var srcFiles = config.appFiles.pages;
12+
var destFiles = config.paths.pages.dest;
13+
var languages = config.languages;
14+
var contentPath = config.paths.content.dest;
15+
var baseDir = config.basePaths.src;
16+
var moduleHelpers = pageshelpers(config);
17+
18+
1119

1220
// Put the default language at the root
1321
var getLanguagePath = function(language) {
@@ -27,12 +35,6 @@ module.exports = function (gulp, $, config) {
2735
};
2836

2937
return function () {
30-
var srcFiles = config.appFiles.pages;
31-
var destFiles = config.paths.pages.dest;
32-
var languages = config.languages;
33-
var contentPath = config.paths.content.dest;
34-
var baseDir = config.basePaths.src;
35-
var moduleHelpers = pageshelpers(config);
3638

3739
// Load the content for the page
3840
function loadContent(language) {

‎gulp/tasks/scripts.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
var stream = require('../utils/browserSync').stream;
33

44
module.exports = function (gulp, $, config) {
5+
var srcFiles = config.appFiles.scripts;
6+
var destPath = config.paths.scripts.dest;
57

68
return function () {
7-
var srcFiles = config.appFiles.scripts;
8-
var destPath = config.paths.scripts.dest;
9-
109
return gulp.src(srcFiles)
1110
.pipe($.eslint({envs: ['browser']}))
1211
.pipe($.eslint.format())

‎gulp/tasks/serve.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ var reload = browserSync.reload;
44
var _ = require('lodash');
55

66
module.exports = function (gulp, $, config) {
7-
return function () {
8-
var serverBase = config.basePaths.dest;
9-
var scriptFiles = [config.appFiles.scripts];
10-
var stylesFiles = [config.appFiles.styles];
11-
var pagesFiles = [config.appFiles.pages];
12-
var layoutFiles = config.appFiles.layouts;
13-
var contentSrcFiles = config.appFiles.content;
14-
var gulpFiles = config.gulpFiles;
15-
var logosFiles = config.appFiles.logos;
16-
var faviconsFiles = config.appFiles.favicon;
17-
var imagesFiles = config.appFiles.images;
18-
var fontsFiles = config.appFiles.fonts;
19-
20-
var componentsDirs = config.components;
21-
22-
_.map(componentsDirs, function(componentDir) {
23-
stylesFiles.push(componentDir + '**/*.scss');
24-
});
25-
_.map(componentsDirs, function(componentDir) {
26-
pagesFiles.push(componentDir + '**/*.jade');
27-
});
28-
_.map(componentsDirs, function(componentDir) {
29-
pagesFiles.push(componentDir + '**/*.yml');
30-
});
7+
var serverBase = config.basePaths.dest;
8+
var scriptFiles = [config.appFiles.scripts];
9+
var stylesFiles = [config.appFiles.styles];
10+
var pagesFiles = [config.appFiles.pages];
11+
var layoutFiles = config.appFiles.layouts;
12+
var contentSrcFiles = config.appFiles.content;
13+
var gulpFiles = config.gulpFiles;
14+
var logosFiles = config.appFiles.logos;
15+
var faviconsFiles = config.appFiles.favicon;
16+
var imagesFiles = config.appFiles.images;
17+
var fontsFiles = config.appFiles.fonts;
18+
19+
var componentsDirs = config.components;
20+
21+
_.map(componentsDirs, function(componentDir) {
22+
stylesFiles.push(componentDir + '**/*.scss');
23+
});
24+
_.map(componentsDirs, function(componentDir) {
25+
pagesFiles.push(componentDir + '**/*.jade');
26+
});
27+
_.map(componentsDirs, function(componentDir) {
28+
pagesFiles.push(componentDir + '**/*.yml');
29+
});
3130

31+
return function () {
3232
// Initialising the server
3333
browserSync.start(serverBase);
3434

‎gulp/tasks/styles.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ var stream = require('../utils/browserSync').stream;
33
var handleError = require('../utils/handleError');
44

55
module.exports = function (gulp, $, config) {
6+
var srcFiles = config.appFiles.styles;
7+
var destFiles = config.paths.styles.dest;
8+
var bowerFiles = config.basePaths.bower;
69

710
return function () {
8-
var srcFiles = config.appFiles.styles;
9-
var destFiles = config.paths.styles.dest;
10-
var bowerFiles = config.basePaths.bower;
11-
1211
return gulp.src(srcFiles)
1312
.pipe($.plumber(handleError))
1413
.pipe($.cssGlobbing({

‎gulp/tasks/tasks.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

33
module.exports = function (gulp, $, config) {
4-
return function () {
54
var gulpFiles = config.gulpFiles;
65

6+
return function () {
77
return gulp.src(gulpFiles)
88
.pipe($.eslint({envs: ['node']}))
99
.pipe($.eslint.format());

0 commit comments

Comments
 (0)