Merge remote-tracking branch 'upstream/v1.7.x' into v1.7_upmerge

packages/grpc-health-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grpc/health-check",
-  "version": "1.7.0-dev",
+  "version": "1.8.0-dev",
   "author": "Google Inc.",
   "description": "Health check service for use with gRPC",
   "repository": {

packages/grpc-native-core/package.json

@@ -29,15 +29,14 @@
   ],
   "dependencies": {
     "arguejs": "^0.2.3",
-    "lodash": "^4.17.4",
-    "nan": "^2.7.0",
-    "node-pre-gyp": "^0.6.38",
-    "protobufjs": "^5.0.2"
+    "lodash": "^4.15.0",
+    "nan": "^2.0.0",
+    "node-pre-gyp": "^0.6.35",
+    "protobufjs": "^5.0.0"
   },
   "devDependencies": {
-    "electron-mocha": "^3.5.0",
-    "google-protobuf": "^3.4.0",
-    "istanbul": "^0.4.5"
+    "electron-mocha": "^3.1.1",
+    "istanbul": "^0.4.4"
   },
   "engines": {
     "node": ">=4"
@@ -67,6 +66,7 @@
     "binding.gyp"
   ],
   "main": "index.js",
+  "typings": "src/index.d.ts",
   "license": "Apache-2.0",
   "jshintConfig": {
     "bitwise": true,

packages/grpc-native-core/templates/package.json.template

@@ -38,7 +38,6 @@
     },
     "devDependencies": {
       "electron-mocha": "^3.1.1",
-      "google-protobuf": "^3.0.0",
       "istanbul": "^0.4.4"
     },
     "engines": {

packages/grpc-native-core/test/math/node_modules/grpc.js

@@ -1,22 +0,0 @@
-/*
- *
- * Copyright 2016 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.
- *
- */
-
-/* This exists solely to allow the generated code to import the grpc module
- * without using a relative path */
-
-module.exports = require('../../..');

packages/grpc-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grpc-tools",
-  "version": "1.7.0-dev",
+  "version": "1.7.0-pre1",
   "author": "Google Inc.",
   "description": "Tools for developing with gRPC on Node.js",
   "homepage": "https://grpc.io/",

test/api/async_test.js

@@ -20,8 +20,9 @@
 
 var assert = require('assert');
 
-var grpc = require('..');
-var math = grpc.load(__dirname + '/../deps/grpc/src/proto/math/math.proto').math;
+var grpc = require('grpc');
+var math = grpc.load(
+    __dirname + '/../../packages/grpc-native-core/deps/grpc/src/proto/math/math.proto').math;
 
 
 /**

test/api/math/math_server.js

@@ -18,7 +18,7 @@
 
 'use strict';
 
-var grpc = require('../..');
+var grpc = require('grpc');
 var grpcMath = require('./math_grpc_pb');
 var math = require('./math_pb');
 

test/api/math_client_test.js

@@ -20,7 +20,7 @@
 
 var assert = require('assert');
 
-var grpc = require('..');
+var grpc = require('grpc');
 var math = require('./math/math_pb');
 var MathClient = require('./math/math_grpc_pb').MathClient;
 

test/api/metadata_test.js

@@ -18,7 +18,7 @@
 
 'use strict';
 
-var Metadata = require('../src/metadata.js');
+var Metadata = require('grpc').Metadata;
 
 var assert = require('assert');
 

test/package.json

@@ -18,6 +18,7 @@
     "body-parser": "^1.15.2",
     "express": "^4.14.0",
     "google-auth-library": "^0.9.2",
+    "google-protobuf": "^3.0.0",
     "lodash": "^4.17.4",
     "minimist": "^1.1.0",
     "poisson-process": "^0.2.1"