Skip to content

Commit

Permalink
fixes for jshint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@VikramTiwari
VikramTiwari committed Apr 27, 2016
1 parent 61c7b2a commit a077d36
Show file tree
Hide file tree
Showing 8 changed files with 217 additions and 203 deletions.
4 changes: 2 additions & 2 deletions app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ function processModules(modules) {
packageModules.push(mn);
}

var req = require.context("./packages", true, /\/public\/(?!tests|assets|views)(.*)\.js$/);
var req = require.context('./packages', true, /\/public\/(?!tests|assets|views)(.*)\.js$/);
req.keys().map(req);
var req = require.context("./node_modules", true, /\/meanio-(admin|system|users|circles)\/public\/(?!tests|assets|views)(.*)\.js$/);
req = require.context('./node_modules', true, /\/meanio-(admin|system|users|circles)\/public\/(?!tests|assets|views)(.*)\.js$/);
req.keys().map(req);

angular.module('mean', packageModules);
Expand Down
194 changes: 100 additions & 94 deletions gulp/development.js
View file
Original file line number Diff line number Diff line change
@@ -1,128 +1,134 @@
'use strict';

var gulp = require('gulp'),
gulpLoadPlugins = require('gulp-load-plugins'),
through = require('through'),
gutil = require('gulp-util'),
plugins = gulpLoadPlugins(),
paths = {
js: ['./*.js', 'config/**/*.js', 'gulp/**/*.js', 'tools/**/*.js', 'packages/**/*.js', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**', '!packages/**/assets/**/js/**'],
html: ['packages/**/*.html', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**'],
css: ['packages/**/*.css', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**', '!packages/core/**/public/assets/css/*.css'],
less: ['packages/**/*.less', '!packages/**/_*.less', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**'],
sass: ['packages/**/*.scss', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**'],
webpack: ['./app.js', 'packages/**/public/**/*.css', 'packages/**/public/**/*.js', '!packages/**/public/assets/lib/**', '!packages/**/node_modules/**']
};
var webpack = require("webpack");
var webpackConfig = require("../webpack.config.js");
gulpLoadPlugins = require('gulp-load-plugins'),
through = require('through'),
gutil = require('gulp-util'),
plugins = gulpLoadPlugins(),
paths = {
js: ['./*.js', 'config/**/*.js', 'gulp/**/*.js', 'tools/**/*.js', 'packages/**/*.js', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**', '!packages/**/assets/**/js/**'],
html: ['packages/**/*.html', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**'],
css: ['packages/**/*.css', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**', '!packages/core/**/public/assets/css/*.css'],
less: ['packages/**/*.less', '!packages/**/_*.less', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**'],
sass: ['packages/**/*.scss', '!packages/**/node_modules/**', '!packages/**/assets/**/lib/**'],
webpack: ['./app.js', 'packages/**/public/**/*.css', 'packages/**/public/**/*.js', '!packages/**/public/assets/lib/**', '!packages/**/node_modules/**']
};
var webpack = require('webpack');
var webpackConfig = require('../webpack.config.js');

/*var defaultTasks = ['clean', 'jshint', 'less', 'csslint', 'devServe', 'watch'];*/
var defaultTasks = ['webpack:build-dev','clean', 'less', 'sass', 'csslint', 'devServe', 'watch'];
var defaultTasks = ['webpack:build-dev', 'clean', 'less', 'sass', 'csslint', 'devServe', 'watch'];

gulp.task('env:development', function () {
process.env.NODE_ENV = 'development';
gulp.task('env:development', function() {
process.env.NODE_ENV = 'development';
});

gulp.task('jshint', function () {
return gulp.src(paths.js)
.pipe(plugins.jshint())
.pipe(plugins.jshint.reporter('jshint-stylish'))
// .pipe(plugins.jshint.reporter('fail')) to avoid shutdown gulp by warnings
.pipe(count('jshint', 'files lint free'));
function count(taskName, message) {
var fileCount = 0;

function countFiles(file) {
fileCount++; // jshint ignore:line
}

function endStream() {
gutil.log(gutil.colors.cyan(taskName + ': ') + fileCount + ' ' + message || 'files processed.');
this.emit('end'); // jshint ignore:line
}

return through(countFiles, endStream);
}

gulp.task('jshint', function() {
return gulp.src(paths.js)
.pipe(plugins.jshint())
.pipe(plugins.jshint.reporter('jshint-stylish'))
// .pipe(plugins.jshint.reporter('fail')) to avoid shutdown gulp by warnings
.pipe(count('jshint', 'files lint free'));
});

gulp.task('csslint', function () {
return gulp.src(paths.css)
.pipe(plugins.csslint('.csslintrc'))
.pipe(plugins.csslint.reporter())
.pipe(count('csslint', 'files lint free'));
gulp.task('csslint', function() {
return gulp.src(paths.css)
.pipe(plugins.csslint('.csslintrc'))
.pipe(plugins.csslint.reporter())
.pipe(count('csslint', 'files lint free'));
});

gulp.task('less', function () {
return gulp.src(paths.less)
.pipe(plugins.less())
.pipe(gulp.dest('./packages'));
gulp.task('less', function() {
return gulp.src(paths.less)
.pipe(plugins.less())
.pipe(gulp.dest('./packages'));
});

gulp.task('sass', function () {
return gulp.src(paths.sass)
.pipe(plugins.sass().on('error', plugins.sass.logError))
.pipe(gulp.dest('./packages'));
gulp.task('sass', function() {
return gulp.src(paths.sass)
.pipe(plugins.sass().on('error', plugins.sass.logError))
.pipe(gulp.dest('./packages'));
});

gulp.task('devServe', ['env:development'], function () {

plugins.nodemon({
script: 'server.js',
ext: 'html js',
env: {'NODE_ENV': 'development'},
ignore: [
'node_modules/',
'bower_components/',
'logs/',
'packages/*/*/public/assets/lib/',
'packages/*/*/node_modules/',
'.DS_Store', '**/.DS_Store',
'.bower-*',
'**/.bower-*',
'**/tests'
],
nodeArgs: ['--debug'],
stdout: false
}).on('readable', function () {
this.stdout.on('data', function (chunk) {
if (/Mean app started/.test(chunk)) {
setTimeout(function () {
plugins.livereload.reload();
}, 500);
}
process.stdout.write(chunk);
});
this.stderr.pipe(process.stderr);
gulp.task('devServe', ['env:development'], function() {

plugins.nodemon({
script: 'server.js',
ext: 'html js',
env: {
'NODE_ENV': 'development'
},
ignore: [
'node_modules/',
'bower_components/',
'logs/',
'packages/*/*/public/assets/lib/',
'packages/*/*/node_modules/',
'.DS_Store', '**/.DS_Store',
'.bower-*',
'**/.bower-*',
'**/tests'
],
nodeArgs: ['--debug'],
stdout: false
}).on('readable', function() {
this.stdout.on('data', function(chunk) {
if (/Mean app started/.test(chunk)) {
setTimeout(function() {
plugins.livereload.reload();
}, 500);
}
process.stdout.write(chunk);
});
this.stderr.pipe(process.stderr);
});
});


// modify some webpack config options
var myDevConfig = Object.create(webpackConfig);
myDevConfig.devtool = "sourcemap";
myDevConfig.devtool = 'sourcemap';
myDevConfig.debug = true;
// create a single instance of the compiler to allow caching
var devCompiler = webpack(myDevConfig);
gulp.task('webpack:build-dev', function(callback) {
// run webpack
devCompiler.run(function(err, stats) {
if(err) throw new gutil.PluginError("webpack:build-dev", err);
gutil.log("[webpack:build-dev]", stats.toString({
colors: true
}));
callback();
});
// run webpack
devCompiler.run(function(err, stats) {
if (err) throw new gutil.PluginError('webpack:build-dev', err);
gutil.log('[webpack:build-dev]', stats.toString({
colors: true
}));
callback();
});
});

gulp.task('watch', function () {
plugins.livereload.listen({interval: 500});
gulp.task('watch', function() {
plugins.livereload.listen({
interval: 500
});

gulp.watch(paths.js, ['jshint']);
gulp.watch(paths.css, ['csslint']).on('change', plugins.livereload.changed);
gulp.watch(paths.less, ['less']);
gulp.watch(paths.sass, ['sass']);
gulp.watch(paths.webpack, ['webpack:build-dev']);
gulp.watch(paths.js, ['jshint']);
gulp.watch(paths.css, ['csslint']).on('change', plugins.livereload.changed);
gulp.watch(paths.less, ['less']);
gulp.watch(paths.sass, ['sass']);
gulp.watch(paths.webpack, ['webpack:build-dev']);
});

function count(taskName, message) {
var fileCount = 0;

function countFiles(file) {
fileCount++; // jshint ignore:line
}

function endStream() {
gutil.log(gutil.colors.cyan(taskName + ': ') + fileCount + ' ' + message || 'files processed.');
this.emit('end'); // jshint ignore:line
}

return through(countFiles, endStream);
}

gulp.task('development', defaultTasks);
42 changes: 24 additions & 18 deletions gulp/production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,50 +8,56 @@ var plugins = gulpLoadPlugins();
var defaultTasks = ['clean', 'cssmin', 'uglify', 'prodServe'];
var assets = require('../config/assets.json');

gulp.task('env:production', function () {
gulp.task('env:production', function() {
process.env.NODE_ENV = 'production';
});

gulp.task('cssmin', function () {
function tokenizeConfig(config) {
var destTokens = _.keys(config)[0].split('/');

return {
srcGlob: _.flatten(_.values(config)),
destDir: destTokens[destTokens.length - 2],
destFile: destTokens[destTokens.length - 1]
};
}

gulp.task('cssmin', function() {
console.log('in cssmin');
var config = tokenizeConfig(assets.core.css);

if (config.srcGlob.length) {
return gulp.src(config.srcGlob)
.pipe(plugins.cssmin({keepBreaks: true}))
.pipe(plugins.cssmin({
keepBreaks: true
}))
.pipe(plugins.concat(config.destFile))
.pipe(gulp.dest(path.join('bower_components/build', config.destDir)));
}
});

gulp.task('uglify', function () {
gulp.task('uglify', function() {
console.log('in uglify');
var config = tokenizeConfig(assets.core.js);

if (config.srcGlob.length) {
return gulp.src(config.srcGlob)
.pipe(plugins.concat(config.destFile))
.pipe(plugins.uglify({mangle: false}))
.pipe(plugins.uglify({
mangle: false
}))
.pipe(gulp.dest(path.join('bower_components/build', config.destDir)));
}
});

function tokenizeConfig(config) {
var destTokens = _.keys(config)[0].split('/');

return {
srcGlob: _.flatten(_.values(config)),
destDir: destTokens[destTokens.length - 2],
destFile: destTokens[destTokens.length - 1]
};
}

gulp.task('prodServe', ['env:production'], function () {
gulp.task('prodServe', ['env:production'], function() {
plugins.nodemon({
script: 'server.js',
ext: 'html js',
env: { 'NODE_ENV': 'production' } ,
env: {
'NODE_ENV': 'production'
},
ignore: ['./node_modules/**']
});
});
gulp.task('production',defaultTasks);
gulp.task('production', defaultTasks);
Loading

0 comments on commit a077d36

Please sign in to comment.