Skip to content

Commit

Permalink
updated dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
oguilleux committed Jul 19, 2019
1 parent 71ae46a commit 4840749
Show file tree
Hide file tree
Showing 10 changed files with 720 additions and 564 deletions.
1 change: 0 additions & 1 deletion gulp/core/config/scripts.js
@@ -1,6 +1,5 @@
var path = require('path');
var webpack = require('webpack-stream').webpack;
var UglifyJsPlugin = require('uglifyjs-webpack-plugin');

// utils
var deepMerge = require('../utils/deepMerge');
Expand Down
8 changes: 4 additions & 4 deletions gulp/core/recipes/scripts/dev.js
Expand Up @@ -9,6 +9,7 @@ var deepMerge = require('../../utils/deepMerge');
var logStats = require('../../utils/webpackLogStats');
var notifaker = require('../../utils/notifaker');
var pumped = require('../../utils/pumped');
var notify = require('gulp-notify');

// config
var config = require('../../config/scripts');
Expand All @@ -24,20 +25,19 @@ module.exports = function () {
return gulp.src(config.paths.src)
.pipe(plumber())

.pipe(named()) // vinyl-named is used to allow for
// multiple entry files
.pipe(named()) // vinyl-named is used to allow for
// multiple entry files
.pipe(gulpWebpack(
deepMerge(
config.options.webpack.defaults,
config.options.webpack.dev
), null, function (err, stats) {
logStats(err, stats);

// reload browser-sync when
// a package is updated
browserSync.reload();
notifaker(pumped('JS Packaged'));
})
})
)

.pipe(gulp.dest(config.paths.dest));
Expand Down
9 changes: 7 additions & 2 deletions gulp/core/recipes/sprite/dev.js
Expand Up @@ -2,7 +2,7 @@ var gulp = require('gulp');
var plumber = require('gulp-plumber');
var svgSprite = require('gulp-svg-sprite');
var svgmin = require('gulp-svgmin');
var gutil = require('gulp-util');
var log = require('fancy-log');
var path = require('path');
var mergeStream = require('merge-stream');
var notify = require('gulp-notify');
Expand All @@ -29,7 +29,12 @@ function spriteTask(name, src) {
.pipe(plumber())

.pipe(svgSprite(config.options.svgSprite(name)))
.on('error', gutil.log)
.on('error', function(error) {
notify({
message: 'Error on Sprite creation'
});
log.error(error);
})

.pipe(svgmin(config.options.svgmin))

Expand Down
6 changes: 5 additions & 1 deletion gulp/core/recipes/styles/dev.js
Expand Up @@ -28,7 +28,11 @@ module.exports = function (cb) {
.pipe(plumber())

.pipe(sourcemaps.init())
.pipe(sass.sync(config.options.sass).on('error', sass.logError))
.pipe(sass.sync(config.options.sass))
.on('error', function(error) {
notify().write(error);
this.emit('end');
})
.pipe(autoprefixer(config.options.autoprefixer))
.pipe(sourcemaps.write('./'))

Expand Down
12 changes: 6 additions & 6 deletions gulp/core/utils/notifaker.js
@@ -1,6 +1,6 @@
var gutil = require('gulp-util');
var notifier = require('node-notifier');

var log = require('fancy-log');
var c = require('ansi-colors');

/**
* Fake the gulp-notfy functionality
Expand All @@ -11,10 +11,10 @@ var notifier = require('node-notifier');
*/
module.exports = function (message) {

gutil.log(
gutil.colors.cyan('gulp-notifier'),
'[' + gutil.colors.blue('Gulp notification') + ']',
gutil.colors.green(message)
log(
c.cyan('gulp-notifier'),
'[' + c.blue('Gulp notification') + ']',
c.green(message)
);

notifier.notify({
Expand Down
13 changes: 7 additions & 6 deletions gulp/core/utils/validateConfig.js
@@ -1,5 +1,6 @@
var gutil = require('gulp-util');
var path = require('path');
var log = require('fancy-log');
var path = require('path');
var c = require('ansi-colors');

/**
* Validate the options passed
Expand All @@ -19,12 +20,12 @@ module.exports = function (project) {
if (!project.name) {
validationFailed = true;

gutil.log('Project Config Error:', gutil.colors.red('The \"name\" option in your project.config.js configuration cannot be empty'));
log('Project Config Error:', c.red('The \"name\" option in your project.config.js configuration cannot be empty'));
}
if (!project.prettyName) {
validationFailed = true;

gutil.log('Project Config Error:', gutil.colors.red('The \"prettyName\" option in your project.config.js configuration cannot be empty'));
log('Project Config Error:', c.red('The \"prettyName\" option in your project.config.js configuration cannot be empty'));
}


Expand All @@ -36,12 +37,12 @@ module.exports = function (project) {
if (project.name === devThemeRoot) {
validationFailed = true;

gutil.log('Project Config Error:', gutil.colors.red(
log('Project Config Error:', c.red(
'The \"name\" value in your project.config.js configuration \'' + project.name + '\' ' +
'cannot be the same as the directory name of the development theme \'' + devThemeRoot + '\'.'
));

gutil.log(
log(
'Please either rename the development theme directory (to \'' + project.name + '_dev\' for example) ' +
'or change the name value in your project.config.js to something else.'
);
Expand Down
11 changes: 6 additions & 5 deletions gulp/core/utils/webpackLogStats.js
@@ -1,8 +1,9 @@
var gutil = require('gulp-util');
var log = require('fancy-log');
var supportsColor = require('supports-color');

var callingDone = false;
var defaultStatsOptions = {
colors: gutil.colors.supportsColor,
colors: supportsColor,
hash: false,
timings: false,
chunks: false,
Expand Down Expand Up @@ -41,8 +42,8 @@ module.exports = function (err, stats, options) {
}

if (options.verbose) {
gutil.log(stats.toString({
colors: gutil.colors.supportsColor
log(stats.toString({
colors: supportsColor
}));
} else {
var statsOptions = options && options.stats || {};
Expand All @@ -53,6 +54,6 @@ module.exports = function (err, stats, options) {
}
});

gutil.log(stats.toString(statsOptions));
log(stats.toString(statsOptions));
}
};
2 changes: 1 addition & 1 deletion gulpfile.js
Expand Up @@ -7,7 +7,7 @@ no-multiple-empty-lines: 0

var gulp = require('gulp');
var log = require('fancy-log');
const c = require('ansi-colors');
var c = require('ansi-colors');

// utils
var lazyQuire = require('./gulp/core/utils/lazyQuire');
Expand Down

0 comments on commit 4840749

Please sign in to comment.