Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Commit

Permalink
Revert "Makes sure the new files are watched"
Browse files Browse the repository at this point in the history
This reverts commit 67fd2bc.
  • Loading branch information
lejoe committed Nov 6, 2015
1 parent 5a05956 commit 68af114
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 61 deletions.
5 changes: 3 additions & 2 deletions gulp/tasks/accessibility.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict';

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

var srcFiles = config.paths.pages.dest + '**/*.html';

return function () {
return gulp.src(srcFiles)
.pipe($.a11y())
.pipe($.a11y.reporter())
Expand Down
18 changes: 9 additions & 9 deletions gulp/tasks/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
var merge = require('merge-stream');

module.exports = function (gulp, $, config) {
return function () {
var imagesSrc = config.appFiles.images;
var imagesDest = config.paths.images.dest;
var logosSrc = config.appFiles.logos;
var logosDest = config.paths.logos.dest;
var faviconsSrc = config.appFiles.favicons;
var faviconsDest = config.paths.favicons.dest;
var fontsSrc = config.appFiles.fonts;
var fontsDest = config.paths.fonts.dest;
var imagesSrc = config.appFiles.images;
var imagesDest = config.paths.images.dest;
var logosSrc = config.appFiles.logos;
var logosDest = config.paths.logos.dest;
var faviconsSrc = config.appFiles.favicons;
var faviconsDest = config.paths.favicons.dest;
var fontsSrc = config.appFiles.fonts;
var fontsDest = config.paths.fonts.dest;

return function () {
var imagesSt = gulp.src(imagesSrc)
.pipe($.changed(imagesDest))
.pipe(gulp.dest(imagesDest));
Expand Down
4 changes: 2 additions & 2 deletions gulp/tasks/clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
var del = require('del');

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

return function (cb) {
del([destFolder], cb);
};
};
8 changes: 4 additions & 4 deletions gulp/tasks/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
var merge = require('merge-stream');

module.exports = function (gulp, $, config) {
return function () {
var srcFiles = config.paths.content.src;
var languages = config.languages;
var destFiles = config.paths.content.dest;
var srcFiles = config.paths.content.src;
var languages = config.languages;
var destFiles = config.paths.content.dest;

return function () {
// Generate the language file for each language
var contentStreams = languages.map(function(language) {
return gulp.src(srcFiles + language + '/**/*.yml')
Expand Down
13 changes: 7 additions & 6 deletions gulp/tasks/deploy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ var rsync = require('rsyncwrapper').rsync;


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


return function (done) {
var rsyncOptions = {
ssh: true,
src: deploySrc,
Expand Down
14 changes: 8 additions & 6 deletions gulp/tasks/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ var handleError = require('../utils/handleError');


module.exports = function (gulp, $, config) {
var srcFiles = config.appFiles.pages;
var destFiles = config.paths.pages.dest;
var languages = config.languages;
var contentPath = config.paths.content.dest;
var baseDir = config.basePaths.src;
var moduleHelpers = pageshelpers(config);



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

return function () {
var srcFiles = config.appFiles.pages;
var destFiles = config.paths.pages.dest;
var languages = config.languages;
var contentPath = config.paths.content.dest;
var baseDir = config.basePaths.src;
var moduleHelpers = pageshelpers(config);

// Load the content for the page
function loadContent(language) {
Expand Down
5 changes: 2 additions & 3 deletions gulp/tasks/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
var stream = require('../utils/browserSync').stream;

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

return function () {
var srcFiles = config.appFiles.scripts;
var destPath = config.paths.scripts.dest;

return gulp.src(srcFiles)
.pipe($.eslint({envs: ['browser']}))
.pipe($.eslint.format())
Expand Down
48 changes: 24 additions & 24 deletions gulp/tasks/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@ var reload = browserSync.reload;
var _ = require('lodash');

module.exports = function (gulp, $, config) {
return function () {
var serverBase = config.basePaths.dest;
var scriptFiles = [config.appFiles.scripts];
var stylesFiles = [config.appFiles.styles];
var pagesFiles = [config.appFiles.pages];
var layoutFiles = config.appFiles.layouts;
var contentSrcFiles = config.appFiles.content;
var gulpFiles = config.gulpFiles;
var logosFiles = config.appFiles.logos;
var faviconsFiles = config.appFiles.favicon;
var imagesFiles = config.appFiles.images;
var fontsFiles = config.appFiles.fonts;

var componentsDirs = config.components;

_.map(componentsDirs, function(componentDir) {
stylesFiles.push(componentDir + '**/*.scss');
});
_.map(componentsDirs, function(componentDir) {
pagesFiles.push(componentDir + '**/*.jade');
});
_.map(componentsDirs, function(componentDir) {
pagesFiles.push(componentDir + '**/*.yml');
});
var serverBase = config.basePaths.dest;
var scriptFiles = [config.appFiles.scripts];
var stylesFiles = [config.appFiles.styles];
var pagesFiles = [config.appFiles.pages];
var layoutFiles = config.appFiles.layouts;
var contentSrcFiles = config.appFiles.content;
var gulpFiles = config.gulpFiles;
var logosFiles = config.appFiles.logos;
var faviconsFiles = config.appFiles.favicon;
var imagesFiles = config.appFiles.images;
var fontsFiles = config.appFiles.fonts;

var componentsDirs = config.components;

_.map(componentsDirs, function(componentDir) {
stylesFiles.push(componentDir + '**/*.scss');
});
_.map(componentsDirs, function(componentDir) {
pagesFiles.push(componentDir + '**/*.jade');
});
_.map(componentsDirs, function(componentDir) {
pagesFiles.push(componentDir + '**/*.yml');
});

return function () {
// Initialising the server
browserSync.start(serverBase);

Expand Down
7 changes: 3 additions & 4 deletions gulp/tasks/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ var stream = require('../utils/browserSync').stream;
var handleError = require('../utils/handleError');

module.exports = function (gulp, $, config) {
var srcFiles = config.appFiles.styles;
var destFiles = config.paths.styles.dest;
var bowerFiles = config.basePaths.bower;

return function () {
var srcFiles = config.appFiles.styles;
var destFiles = config.paths.styles.dest;
var bowerFiles = config.basePaths.bower;

return gulp.src(srcFiles)
.pipe($.plumber(handleError))
.pipe($.cssGlobbing({
Expand Down
2 changes: 1 addition & 1 deletion gulp/tasks/tasks.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

module.exports = function (gulp, $, config) {
return function () {
var gulpFiles = config.gulpFiles;

return function () {
return gulp.src(gulpFiles)
.pipe($.eslint({envs: ['node']}))
.pipe($.eslint.format());
Expand Down

0 comments on commit 68af114

Please sign in to comment.