slight gulpfile changes (#16)

gulpfile.js

@@ -4,7 +4,7 @@ const help = require('gulp-help');
 // gulp-help monkeypatches tasks to have an additional description parameter
 const gulp = help(_gulp);
 
-require('./packages/grpc-js-core/gulpfile')(gulp);
+require('./packages/grpc-js-core/gulpfile');
 
 gulp.task('lint', 'Emit linting errors in source and test files', ['js.core.lint']);
 

packages/grpc-js-core/gulpfile.js

@@ -1,3 +1,9 @@
+const _gulp = require('gulp');
+const help = require('gulp-help');
+
+// gulp-help monkeypatches tasks to have an additional description parameter
+const gulp = help(_gulp);
+
 const del = require('del');
 const mocha = require('gulp-mocha');
 const sourcemaps = require('gulp-sourcemaps');
@@ -10,24 +16,22 @@ const through = require('through2');
 
 Error.stackTraceLimit = Infinity;
 
-module.exports = function(gulp) {
+const jsCoreDir = __dirname;
+const tslintPath = path.resolve(jsCoreDir, 'node_modules/google-ts-style/tslint.json');
+const tsconfigPath = path.resolve(jsCoreDir, 'tsconfig.json');
+const outDir = path.resolve(jsCoreDir, 'build');
+const srcDir = path.resolve(jsCoreDir, 'src');
+const testDir = path.resolve(jsCoreDir, 'test');
 
-  const jsCoreDir = __dirname;
-  const tslintPath = path.resolve(jsCoreDir, 'node_modules/google-ts-style/tslint.json');
-  const tsconfigPath = path.resolve(jsCoreDir, 'tsconfig.json');
-  const outDir = path.resolve(jsCoreDir, 'build');
-  const srcDir = path.resolve(jsCoreDir, 'src');
-  const testDir = path.resolve(jsCoreDir, 'test');
+function onError() {}
 
-  function onError() {}
-
-  // Coalesces all specified --file parameters into a single array
-  const files = !util.env.file ? [] :
+// Coalesces all specified --file parameters into a single array
+const files = !util.env.file ? [] :
       Array.isArray(util.env.file) ? util.env.file : [util.env.file];
 
-  // If --dev is passed, override certain ts config options
-  let tsDevOptions = {};
-  if (util.env.dev) {
+// If --dev is passed, override certain ts config options
+let tsDevOptions = {};
+if (util.env.dev) {
   tsDevOptions = {
     allowUnreachableCode: true,
     noUnusedParameters: false,
@@ -35,9 +39,9 @@ module.exports = function(gulp) {
     noImplicitThis: false,
     noEmitOnError: false
   };
-  }
+}
 
-  /**
+/**
  * Helper function that creates a gulp task function that opens files in a
  * directory that match a certain glob pattern, transpiles them, and writes them
  * to an output directory.
@@ -48,7 +52,7 @@ module.exports = function(gulp) {
  *   Defaults to match all but *.ts files in baseDir (incl. subdirectories).
  * @return A gulp task function.
  */
-  function makeCompileFn(globs) {
+function makeCompileFn(globs) {
   const transpileGlob = globs.transpile || `${srcDir}/**/*.ts`;
   const copyGlob = globs.copy || '!(**/*)';
   return () => {
@@ -69,12 +73,12 @@ module.exports = function(gulp) {
       copy.pipe(gulp.dest(`${outDir}`))
     ]);
   };
-  }
+}
 
-  /**
+/**
  * Runs tslint on files in src/, with linting rules defined in tslint.json.
  */
-  gulp.task('js.core.lint', 'Emits linting errors found in src/ and test/.', () => {
+gulp.task('js.core.lint', 'Emits linting errors found in src/ and test/.', () => {
   const program = require('tslint').Linter.createProgram(tsconfigPath);
   gulp.src([`${srcDir}/**/*.ts`, `${srcDir}/**/*.ts`])
       .pipe(tslint({
@@ -84,54 +88,54 @@ module.exports = function(gulp) {
       }))
       .pipe(tslint.report())
       .on('warning', onError);
-  });
+});
 
-  gulp.task('js.core.clean', 'Deletes transpiled code.', () => {
+gulp.task('js.core.clean', 'Deletes transpiled code.', () => {
   return del(outDir);
-  });
+});
 
-  /**
+/**
  * Transpiles TypeScript files in src/ to JavaScript according to the settings
  * found in tsconfig.json.
  * Currently, all errors are emitted twice. This is being tracked here:
  * https://github.com/ivogabe/gulp-typescript/issues/438
  */
-  gulp.task('js.core.compile', 'Transpiles src/.',
+gulp.task('js.core.compile', 'Transpiles src/.',
           makeCompileFn({ transpile: [`${srcDir}/**/*.ts`] }));
 
-  /**
+/**
  * Transpiles TypeScript files in both src/ and test/.
  */
-  gulp.task('js.core.test.compile', 'After dep tasks, transpiles test/.', ['js.core.compile'],
+gulp.task('js.core.test.compile', 'After dep tasks, transpiles test/.', ['js.core.compile'],
           makeCompileFn({ transpile: [`${testDir}/**/*.ts`], copy: `${testDir}/**/!(*.ts)` }));
 
-  /**
+/**
  * Transpiles src/ and test/, and then runs all tests.
  */
-  gulp.task('js.core.test', 'After dep tasks, runs all tests.',
+gulp.task('js.core.test', 'After dep tasks, runs all tests.',
           ['js.core.test.compile'], () => {
             return gulp.src(`${outDir}/test/**/*.js`)
                 .pipe(mocha());
           }
           );
 
-  /**
+/**
  * Transpiles individual files, specified by the --file flag.
  */
-  gulp.task('js.core.compile.single', 'Transpiles individual files specified by --file.',
+gulp.task('js.core.compile.single', 'Transpiles individual files specified by --file.',
           makeCompileFn({
             transpile: files.map(f => path.relative('.', f))
           })
           );
 
-  /**
+/**
  * Run individual tests, specified by their pre-transpiled source path (as
  * supplied through the '--file' flag). This is intended to be used as part of a
  * VS Code "Gulp task" launch configuration; setting the "args" field to
  * ["test.single", "--file", "${file}"] makes it possible for one to debug the
  * currently open TS mocha test file in one step.
  */
-  gulp.task('js.core.test.single', 'After dep tasks, runs individual files specified ' +
+gulp.task('js.core.test.single', 'After dep tasks, runs individual files specified ' +
           'by --file.', ['js.core.compile', 'js.core.compile.single'], () => {
             // util.env contains CLI arguments for the gulp task.
             // Determine the path to the transpiled version of this TS file.
@@ -160,5 +164,3 @@ module.exports = function(gulp) {
                 }));
           }
           );
-
-};