Merge branch '[email protected]' of https://github.com/grpc/grpc-node into node-12

Author: nicolasnoble

gulpfile.ts

@@ -15,96 +15,55 @@
  *
  */
 
-import * as _gulp from 'gulp';
-import * as help from 'gulp-help';
-
-// gulp-help monkeypatches tasks to have an additional description parameter
-const gulp = help(_gulp);
-
-const runSequence = require('run-sequence');
-
-/**
- * Require a module at the given path with a patched gulp object that prepends
- * the given prefix to each task name.
- * @param path The path to require.
- * @param prefix The string to use as a prefix. This will be prepended to a task
- *               name with a '.' separator.
- */
-function loadGulpTasksWithPrefix(path: string, prefix: string) {
-  const gulpTask = gulp.task;
-  gulp.task = ((taskName: string, ...args: any[]) => {
-    // Don't create a task for ${prefix}.help
-    if (taskName === 'help') {
-      return;
-    }
-    // The only array passed to gulp.task must be a list of dependent tasks.
-    const newArgs = args.map(arg => Array.isArray(arg) ?
-      arg.map(dep => `${prefix}.${dep}`) : arg);
-    gulpTask(`${prefix}.${taskName}`, ...newArgs);
-  });
-  const result = require(path);
-  gulp.task = gulpTask;
-  return result;
-}
-
-[
-  ['./packages/grpc-health-check/gulpfile', 'health-check'],
-  ['./packages/grpc-js/gulpfile', 'js.core'],
-  ['./packages/grpc-native-core/gulpfile', 'native.core'],
-  ['./packages/proto-loader/gulpfile', 'protobuf'],
-  ['./test/gulpfile', 'internal.test'],
-].forEach((args) => loadGulpTasksWithPrefix(args[0], args[1]));
+import * as gulp from 'gulp';
+import * as healthCheck from './packages/grpc-health-check/gulpfile';
+import * as jsCore from './packages/grpc-js/gulpfile';
+import * as nativeCore from './packages/grpc-native-core/gulpfile';
+import * as protobuf from './packages/proto-loader/gulpfile';
+import * as internalTest from './test/gulpfile';
 
 const root = __dirname;
 
-gulp.task('install.all', 'Install dependencies for all subdirectory packages',
-          ['js.core.install', 'native.core.install', 'health-check.install', 'protobuf.install', 'internal.test.install']);
+const installAll = gulp.parallel(jsCore.install, nativeCore.install, healthCheck.install, protobuf.install, internalTest.install);
 
-gulp.task('install.all.windows', 'Install dependencies for all subdirectory packages for MS Windows',
-          ['js.core.install', 'native.core.install.windows', 'health-check.install', 'protobuf.install', 'internal.test.install']);
+const installAllWindows = gulp.parallel(jsCore.install, nativeCore.installWindows, healthCheck.install, protobuf.install, internalTest.install);
 
-gulp.task('lint', 'Emit linting errors in source and test files',
-          ['js.core.lint', 'native.core.lint']);
+const lint = gulp.parallel(jsCore.lint, nativeCore.lint);
 
-gulp.task('build', 'Build packages', ['js.core.compile', 'native.core.build', 'protobuf.compile']);
+const build = gulp.parallel(jsCore.compile, nativeCore.build, protobuf.compile);
 
-gulp.task('link.surface', 'Link to surface packages',
-          ['health-check.link.add']);
+const link = gulp.series(healthCheck.linkAdd);
 
-gulp.task('link', 'Link together packages', (callback) => {
-  /**
-   * We use workarounds for linking in some modules. See npm/npm#18835
-   */
-  runSequence('link.surface', callback);
-});
+const setup = gulp.series(installAll, link);
 
-gulp.task('setup', 'One-time setup for a clean repository', (callback) => {
-  runSequence('install.all', 'link', callback);
-});
-gulp.task('setup.windows', 'One-time setup for a clean repository for MS Windows', (callback) => {
-  runSequence('install.all.windows', 'link', callback);
-});
+const setupWindows = gulp.series(installAllWindows, link);
 
-gulp.task('clean', 'Delete generated files', ['js.core.clean', 'native.core.clean', 'protobuf.clean']);
+const clean = gulp.parallel(jsCore.clean, nativeCore.clean, protobuf.clean);
 
-gulp.task('clean.all', 'Delete all files created by tasks',
-	  ['js.core.clean.all', 'native.core.clean.all', 'health-check.clean.all',
-	   'internal.test.clean.all', 'protobuf.clean.all']);
+const cleanAll = gulp.parallel(jsCore.cleanAll, nativeCore.cleanAll, healthCheck.cleanAll, internalTest.cleanAll, protobuf.cleanAll);
 
-gulp.task('native.test.only', 'Run tests of native code without rebuilding anything',
-          ['native.core.test', 'health-check.test']);
+const nativeTestOnly = gulp.parallel(nativeCore.test, healthCheck.test);
 
-gulp.task('native.test', 'Run tests of native code', (callback) => {
-  runSequence('build', 'native.test.only', callback);
-});
+const nativeTest = gulp.series(build, nativeTestOnly);
 
-gulp.task('test.only', 'Run tests without rebuilding anything',
-          ['js.core.test', 'native.test.only', 'protobuf.test']);
+const testOnly = gulp.parallel(jsCore.test, nativeTestOnly, protobuf.test);
 
-gulp.task('test', 'Run all tests', (callback) => {
-  runSequence('build', 'test.only', 'internal.test.test', callback);
-});
+const test = gulp.series(build, testOnly, internalTest.test);
 
-gulp.task('doc.gen', 'Generate documentation', ['native.core.doc.gen']);
+const docGen = gulp.series(nativeCore.docGen);
 
-gulp.task('default', ['help']);
+export {
+  installAll,
+  installAllWindows,
+  lint,
+  build,
+  link,
+  setup,
+  setupWindows,
+  clean,
+  cleanAll,
+  nativeTestOnly,
+  nativeTest,
+  test,
+  docGen
+};

package.json

@@ -11,7 +11,6 @@
   "devDependencies": {
     "@types/execa": "^0.8.0",
     "@types/gulp": "^4.0.5",
-    "@types/gulp-help": "0.0.34",
     "@types/gulp-mocha": "0.0.31",
     "@types/ncp": "^2.0.1",
     "@types/node": "^8.0.32",
@@ -20,8 +19,7 @@
     "coveralls": "^3.0.1",
     "del": "^3.0.0",
     "execa": "^0.8.0",
-    "gulp": "^3.9.1",
-    "gulp-help": "^1.6.1",
+    "gulp": "^4.0.1",
     "gulp-jsdoc3": "^1.0.1",
     "gulp-jshint": "^2.0.4",
     "gulp-mocha": "^4.3.1",
@@ -42,7 +40,7 @@
     "semver": "^5.5.0",
     "symlink": "^2.1.0",
     "through2": "^2.0.3",
-    "ts-node": "^3.3.0",
+    "ts-node": "^8.1.0",
     "tslint": "^5.5.0",
     "typescript": "~3.3.3333",
     "xml2js": "^0.4.19"

packages/grpc-health-check/gulpfile.js

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2019 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import * as gulp from 'gulp';
+import * as mocha from 'gulp-mocha';
+import * as execa from 'execa';
+import * as path from 'path';
+import * as del from 'del';
+import {linkSync} from '../../util';
+
+const healthCheckDir = __dirname;
+const baseDir = path.resolve(healthCheckDir, '..', '..');
+const testDir = path.resolve(healthCheckDir, 'test');
+
+const cleanLinks = () => del(path.resolve(healthCheckDir, 'node_modules/grpc'));
+
+const cleanAll = gulp.parallel(cleanLinks);
+
+const runInstall = () => execa('npm', ['install', '--unsafe-perm'], {cwd: healthCheckDir, stdio: 'inherit'});
+
+const install = gulp.series(cleanLinks, runInstall);
+
+const linkAdd = (callback) => {
+  linkSync(healthCheckDir, './node_modules/grpc', '../grpc-native-core');
+  callback();
+}
+
+const test = () => gulp.src(`${testDir}/*.js`).pipe(mocha({reporter: 'mocha-jenkins-reporter'}));
+
+export {
+  cleanLinks,
+  cleanAll,
+  install,
+  linkAdd,
+  test
+}

packages/grpc-health-check/gulpfile.ts

@@ -15,8 +15,7 @@
  *
  */
 
-import * as _gulp from 'gulp';
-import * as help from 'gulp-help';
+import * as gulp from 'gulp';
 
 import * as fs from 'fs';
 import * as mocha from 'gulp-mocha';
@@ -26,9 +25,6 @@ import * as pify from 'pify';
 import * as semver from 'semver';
 import { ncp } from 'ncp';
 
-// gulp-help monkeypatches tasks to have an additional description parameter
-const gulp = help(_gulp);
-
 const ncpP = pify(ncp);
 
 Error.stackTraceLimit = Infinity;
@@ -44,34 +40,28 @@ const execNpmVerb = (verb: string, ...args: string[]) =>
   execa('npm', [verb, ...args], {cwd: jsCoreDir, stdio: 'inherit'});
 const execNpmCommand = execNpmVerb.bind(null, 'run');
 
-gulp.task('install', 'Install native core dependencies', () =>
-  execNpmVerb('install', '--unsafe-perm'));
+const install = () => execNpmVerb('install', '--unsafe-perm');
 
 /**
  * Runs tslint on files in src/, with linting rules defined in tslint.json.
  */
-gulp.task('lint', 'Emits linting errors found in src/ and test/.', () =>
-  execNpmCommand('check'));
+const lint = () => execNpmCommand('check');
+
+const cleanFiles = () => execNpmCommand('clean');
 
-gulp.task('clean', 'Deletes transpiled code.', ['install'],
-  () => execNpmCommand('clean'));
+const clean = gulp.series(install, cleanFiles);
 
-gulp.task('clean.all', 'Deletes all files added by targets', ['clean']);
+const cleanAll = gulp.parallel(clean);
 
 /**
  * Transpiles TypeScript files in src/ to JavaScript according to the settings
  * found in tsconfig.json.
  */
-gulp.task('compile', 'Transpiles src/.', () => execNpmCommand('compile'));
+const compile = () => execNpmCommand('compile');
 
-gulp.task('copy-test-fixtures', 'Copy test fixtures.', () => {
-  return ncpP(`${jsCoreDir}/test/fixtures`, `${outDir}/test/fixtures`);
-});
+const copyTestFixtures = () => ncpP(`${jsCoreDir}/test/fixtures`, `${outDir}/test/fixtures`);
 
-/**
- * Transpiles src/ and test/, and then runs all tests.
- */
-gulp.task('test', 'Runs all tests.', ['lint', 'copy-test-fixtures'], () => {
+const runTests = () => {
   if (semver.satisfies(process.version, '^8.11.2 || >=9.4')) {
     return gulp.src(`${outDir}/test/**/*.js`)
       .pipe(mocha({reporter: 'mocha-jenkins-reporter',
@@ -80,4 +70,15 @@ gulp.task('test', 'Runs all tests.', ['lint', 'copy-test-fixtures'], () => {
     console.log(`Skipping grpc-js tests for Node ${process.version}`);
     return Promise.resolve(null);
   }
-});
+};
+
+const test = gulp.series(install, copyTestFixtures, runTests);
+
+export {
+  install,
+  lint,
+  clean,
+  cleanAll,
+  compile,
+  test
+}