gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

style(gulp): Linted gulpfile (#13978)

Browse Source
This commit is contained in:
Berkeley Martinez
2017-03-28 11:25:08 -07:00
committed by Quincy Larson
parent 662ab00d6b
commit a2998c4b9c
2 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
gulpfile.js
View File

@ -1,8 +1,9 @@
// enable debug for gulp // enable debug for gulp
/* eslint-disable prefer-object-spread/prefer-object-spread */
process.env.DEBUG = process.env.DEBUG || 'fcc:*'; process.env.DEBUG = process.env.DEBUG || 'fcc:*';
require('babel-core/register'); require('babel-core/register');
var Rx = require('rx'), const Rx = require('rx'),
gulp = require('gulp'), gulp = require('gulp'),
path = require('path'), path = require('path'),
debug = require('debug')('fcc:gulp'), debug = require('debug')('fcc:gulp'),
@ -49,18 +50,26 @@ var Rx = require('rx'),
tapSpec = require('tap-spec'); tapSpec = require('tap-spec');
Rx.config.longStackSupport = true; Rx.config.longStackSupport = true;
var sync = browserSync.create('fcc-sync-server'); const sync = browserSync.create('fcc-sync-server');
function resolve(filepath, thisString, withThisString) {
const newPath = require.resolve(filepath);
if (thisString && withThisString) {
return newPath.replace(thisString, withThisString);
}
return newPath;
}
// user definable // user definable
var __DEV__ = !yargs.argv.p; const __DEV__ = !yargs.argv.p;
var port = yargs.argv.port || process.env.PORT || '3001'; const port = yargs.argv.port || process.env.PORT || '3001';
var syncPort = yargs.argv['sync-port'] || process.env.SYNC_PORT || '3000'; const syncPort = yargs.argv['sync-port'] || process.env.SYNC_PORT || '3000';
// make sure sync ui port does not interfere with proxy port // make sure sync ui port does not interfere with proxy port
var syncUIPort = yargs.argv['sync-ui-port'] || const syncUIPort = yargs.argv['sync-ui-port'] ||
process.env.SYNC_UI_PORT || process.env.SYNC_UI_PORT ||
parseInt(syncPort, 10) + 2; parseInt(syncPort, 10) + 2;
var paths = { const paths = {
server: './server/server.js', server: './server/server.js',
serverIgnore: [ serverIgnore: [
'gulpfile.js', 'gulpfile.js',
@ -87,32 +96,36 @@ var paths = {
}, },
vendorChallenges: [ vendorChallenges: [
require.resolve('jshint').replace('src', 'dist'), resolve('jshint', 'src', 'dist'),
require.resolve('chai').replace('index.js', 'chai.js'), resolve('chai', 'index.js', 'chai.js'),
require.resolve('codemirror'), resolve('codemirror'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/comment/comment.js'), resolve('codemirror', 'lib/codemirror.js', 'addon/comment/comment.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/edit/closebrackets.js'), resolve('codemirror', 'lib/codemirror.js', 'addon/edit/closebrackets.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/edit/matchbrackets.js'), resolve('codemirror', 'lib/codemirror.js', 'addon/edit/matchbrackets.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/lint/lint.js'), resolve('codemirror', 'lib/codemirror.js', 'addon/lint/lint.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/lint/javascript-lint.js'), resolve('codemirror', 'lib/codemirror.js', 'addon/lint/javascript-lint.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/javascript/javascript.js'), resolve('codemirror', 'lib/codemirror.js', 'mode/javascript/javascript.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/xml/xml.js'), resolve('codemirror', 'lib/codemirror.js', 'mode/xml/xml.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/css/css.js'), resolve('codemirror', 'lib/codemirror.js', 'mode/css/css.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/htmlmixed/htmlmixed.js'), resolve('codemirror', 'lib/codemirror.js', 'mode/htmlmixed/htmlmixed.js'),
require.resolve('emmet-codemirror'), resolve('emmet-codemirror'),
'public/js/lib/loop-protect/loop-protect.js' 'public/js/lib/loop-protect/loop-protect.js'
], ],
vendorMain: [ vendorMain: [
require.resolve('jquery').replace('.js', '.min.js'), resolve('jquery', '.js', '.min.js'),
require.resolve('bootstrap').replace('npm.js', 'bootstrap.min.js'), resolve('bootstrap', 'npm.js', 'bootstrap.min.js'),
require.resolve('d3').replace('.js', '.min.js'), resolve('d3', '.js', '.min.js'),
require.resolve('cal-heatmap'), resolve('cal-heatmap'),
require.resolve('moment').replace('.js', '.min.js'), resolve('moment', '.js', '.min.js'),
require.resolve('moment-timezone').replace('index.js', 'builds/moment-timezone-with-data.min.js'), resolve(
require.resolve('mousetrap').replace('.js', '.min.js'), 'moment-timezone',
require.resolve('lightbox2').replace('.js', '.min.js'), 'index.js',
require.resolve('rx').replace('index.js', 'dist/rx.all.min.js') 'builds/moment-timezone-with-data.min.js'
),
resolve('mousetrap', '.js', '.min.js'),
resolve('lightbox2', '.js', '.min.js'),
resolve('rx', 'index.js', 'dist/rx.all.min.js')
], ],
js: [ js: [
@ -143,19 +156,18 @@ var paths = {
] ]
}; };
var webpackOptions = { const webpackOptions = {
devtool: 'inline-source-map' devtool: 'inline-source-map'
}; };
function errorHandler() { const errorNotifier = notify.onError({
var args = Array.prototype.slice.call(arguments);
// Send error to notification center with gulp-notify
notify.onError({
title: 'Compile Error', title: 'Compile Error',
message: '<%= error %>' message: '<%= error %>'
}).apply(this, args); });
function errorHandler(...args) {
// Send error to notification center with gulp-notify
errorNotifier.apply(this, args);
// Keep gulp from hanging on this task // Keep gulp from hanging on this task
this.emit('end'); this.emit('end');
} }
@ -172,7 +184,7 @@ function delRev(dest, manifestName) {
} }
gulp.task('serve', function(cb) { gulp.task('serve', function(cb) {
var called = false; const called = false;
nodemon({ nodemon({
script: paths.server, script: paths.server,
ext: '.jsx .js .json', ext: '.jsx .js .json',
@ -197,7 +209,7 @@ gulp.task('serve', function(cb) {
}); });
}); });
var syncDepenedents = [ const syncDepenedents = [
'serve', 'serve',
'js', 'js',
'less' 'less'
@ -209,7 +221,7 @@ gulp.task('dev-server', syncDepenedents, function() {
'webpack-hot-middleware/client' 'webpack-hot-middleware/client'
].concat(webpackConfig.entry.bundle); ].concat(webpackConfig.entry.bundle);
var bundler = webpack(webpackConfig); const bundler = webpack(webpackConfig);
sync.init(null, { sync.init(null, {
ui: { ui: {
port: syncUIPort port: syncUIPort
@ -259,14 +271,14 @@ gulp.task('pack-client', function() {
if (!__DEV__) { console.log('\n\nbundling production\n\n'); } if (!__DEV__) { console.log('\n\nbundling production\n\n'); }
function condition(file) { function condition(file) {
var filepath = file.relative; const filepath = file.relative;
return __DEV__ || (/json$/).test('' + filepath); return __DEV__ || (/json$/).test('' + filepath);
} }
var dest = webpackConfig.output.path; const dest = webpackConfig.output.path;
return gulp.src(webpackConfig.entry.bundle) return gulp.src(webpackConfig.entry.bundle)
.pipe(plumber({ errorHandler: errorHandler })) .pipe(plumber({ errorHandler }))
.pipe(webpackStream(Object.assign( .pipe(webpackStream(Object.assign(
{}, {},
webpackConfig, webpackConfig,
@ -276,15 +288,15 @@ gulp.task('pack-client', function() {
.pipe(gulp.dest(dest)); .pipe(gulp.dest(dest));
}); });
var webpackManifestFiles = [ 'react-manifest.json', 'chunk-manifest.json' ]; const webpackManifestFiles = [ 'react-manifest.json', 'chunk-manifest.json' ];
gulp.task('move-webpack-manifest', ['pack-client'], function() { gulp.task('move-webpack-manifest', ['pack-client'], function() {
var files = webpackManifestFiles.map(function(filename) { const files = webpackManifestFiles.map(function(filename) {
return path.join(webpackConfig.output.path, filename); return path.join(webpackConfig.output.path, filename);
}); });
return gulp.src(files).pipe(gulp.dest(paths.manifest)); return gulp.src(files).pipe(gulp.dest(paths.manifest));
}); });
var cleanDeps = ['pack-client', 'move-webpack-manifest']; const cleanDeps = ['pack-client', 'move-webpack-manifest'];
gulp.task('clean-webpack-manifest', cleanDeps, function() { gulp.task('clean-webpack-manifest', cleanDeps, function() {
return del(webpackManifestFiles.map(function(filename) { return del(webpackManifestFiles.map(function(filename) {
return path.join(webpackConfig.output.path, filename); return path.join(webpackConfig.output.path, filename);
@ -298,10 +310,10 @@ gulp.task('clean-webpack-manifest', cleanDeps, function() {
}); });
gulp.task('less', function() { gulp.task('less', function() {
var manifestName = 'css-manifest.json'; const manifestName = 'css-manifest.json';
var dest = paths.css; const dest = paths.css;
return gulp.src(paths.less) return gulp.src(paths.less)
.pipe(plumber({ errorHandler: errorHandler })) .pipe(plumber({ errorHandler }))
.pipe(__DEV__ ? sourcemaps.init() : gutil.noop()) .pipe(__DEV__ ? sourcemaps.init() : gutil.noop())
// compile // compile
.pipe(less({ .pipe(less({
@ -341,10 +353,10 @@ function getFilesGlob(files) {
} }
gulp.task('js', function() { gulp.task('js', function() {
var manifestName = 'js-manifest.json'; const manifestName = 'js-manifest.json';
var dest = paths.publicJs; const dest = paths.publicJs;
var jsFiles = merge( const jsFiles = merge(
gulp.src(getFilesGlob(paths.vendorMain)) gulp.src(getFilesGlob(paths.vendorMain))
.pipe(__DEV__ ? sourcemaps.init() : gutil.noop()) .pipe(__DEV__ ? sourcemaps.init() : gutil.noop())
@ -366,7 +378,7 @@ gulp.task('js', function() {
), ),
gulp.src(paths.js) gulp.src(paths.js)
.pipe(plumber({ errorHandler: errorHandler })) .pipe(plumber({ errorHandler }))
.pipe(babel()) .pipe(babel())
.pipe(__DEV__ ? gutil.noop() : uglify()) .pipe(__DEV__ ? gutil.noop() : uglify())
); );
@ -396,7 +408,7 @@ function done(manifest) {
return sortKeys(manifest); return sortKeys(manifest);
} }
var buildDependents = [ const buildDependents = [
'less', 'less',
'js', 'js',
'pack-client', 'pack-client',
@ -418,7 +430,7 @@ gulp.task('build', [
'build-manifest' 'build-manifest'
]); ]);
var watchDependents = [ const watchDependents = [
'less', 'less',
'js', 'js',
'serve', 'serve',

2
package.json
View File

@ -15,7 +15,7 @@
"lint-resources": "jsonlint-cli server/resources/*.json", "lint-resources": "jsonlint-cli server/resources/*.json",
"lint-utils": "jsonlint-cli server/utils/*.json", "lint-utils": "jsonlint-cli server/utils/*.json",
"prelint-js": "npm run create-rev", "prelint-js": "npm run create-rev",
"lint-js": "eslint --ext=.js,.jsx server/ common/ config/ client/", "lint-js": "eslint --ext=.js,.jsx gulpfile.js server/ common/ config/ client/",
"lint-json": "npm run lint-server && npm run lint-challenges && npm run lint-resources && npm run lint-utils", "lint-json": "npm run lint-server && npm run lint-challenges && npm run lint-resources && npm run lint-utils",
"pretest": "npm run create-rev && npm run lint", "pretest": "npm run create-rev && npm run lint",
"snyk-protect": "snyk protect", "snyk-protect": "snyk protect",