From a1b2c43046562fef9ac53aaec9f095a763ad8995 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 6 Oct 2017 15:13:13 -0700 Subject: [PATCH 1/2] Update grpc/grpc submodule and package versions to 1.7.0-pre1 --- packages/grpc-health-check/package.json | 2 +- packages/grpc-native-core/deps/grpc | 2 +- packages/grpc-native-core/package.json | 2 +- packages/grpc-tools/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/grpc-health-check/package.json b/packages/grpc-health-check/package.json index 20c4584e..41a318bc 100644 --- a/packages/grpc-health-check/package.json +++ b/packages/grpc-health-check/package.json @@ -1,6 +1,6 @@ { "name": "grpc-health-check", - "version": "1.7.0-dev", + "version": "1.7.0-pre1", "author": "Google Inc.", "description": "Health check service for use with gRPC", "repository": { diff --git a/packages/grpc-native-core/deps/grpc b/packages/grpc-native-core/deps/grpc index 8d1dc219..6b69f2a1 160000 --- a/packages/grpc-native-core/deps/grpc +++ b/packages/grpc-native-core/deps/grpc @@ -1 +1 @@ -Subproject commit 8d1dc21994b2c8d4600db706b60b300c1a5a24a7 +Subproject commit 6b69f2a164c631fe4d14e799a6e7a20e560ce0aa diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 4a0c220d..2bd2ed70 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.7.0-dev", + "version": "1.7.0-pre1", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", diff --git a/packages/grpc-tools/package.json b/packages/grpc-tools/package.json index 7159010a..c1062c10 100644 --- a/packages/grpc-tools/package.json +++ b/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/", From 111ce77440be6672504bef228656a5a49b2d11f3 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 10 Oct 2017 18:27:01 -0700 Subject: [PATCH 2/2] Move more tests from native core to API test directory --- packages/grpc-native-core/package.json | 1 - .../templates/package.json.template | 2 +- .../test/math/node_modules/grpc.js | 22 ------------------- .../test => test/api}/async_test.js | 5 +++-- .../test => test/api}/math/math_grpc_pb.js | 0 .../test => test/api}/math/math_pb.js | 0 .../test => test/api}/math/math_server.js | 2 +- .../test => test/api}/math_client_test.js | 2 +- .../test => test/api}/metadata_test.js | 2 +- .../test => test/api}/numbers.txt | 0 test/package.json | 1 + 11 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 packages/grpc-native-core/test/math/node_modules/grpc.js rename {packages/grpc-native-core/test => test/api}/async_test.js (93%) rename {packages/grpc-native-core/test => test/api}/math/math_grpc_pb.js (100%) rename {packages/grpc-native-core/test => test/api}/math/math_pb.js (100%) rename {packages/grpc-native-core/test => test/api}/math/math_server.js (99%) rename {packages/grpc-native-core/test => test/api}/math_client_test.js (99%) rename {packages/grpc-native-core/test => test/api}/metadata_test.js (99%) rename {packages/grpc-native-core/test => test/api}/numbers.txt (100%) diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 90acad8c..91902a5c 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -36,7 +36,6 @@ }, "devDependencies": { "electron-mocha": "^3.1.1", - "google-protobuf": "^3.0.0", "istanbul": "^0.4.4" }, "engines": { diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template index 47efb460..4a119737 100644 --- a/packages/grpc-native-core/templates/package.json.template +++ b/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": { @@ -69,6 +68,7 @@ "binding.gyp" ], "main": "index.js", + "typings": "src/index.d.ts", "license": "Apache-2.0", "jshintConfig": { "bitwise": true, diff --git a/packages/grpc-native-core/test/math/node_modules/grpc.js b/packages/grpc-native-core/test/math/node_modules/grpc.js deleted file mode 100644 index b824d8dd..00000000 --- a/packages/grpc-native-core/test/math/node_modules/grpc.js +++ /dev/null @@ -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('../../..'); diff --git a/packages/grpc-native-core/test/async_test.js b/test/api/async_test.js similarity index 93% rename from packages/grpc-native-core/test/async_test.js rename to test/api/async_test.js index e2f124e5..e899da56 100644 --- a/packages/grpc-native-core/test/async_test.js +++ b/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; /** diff --git a/packages/grpc-native-core/test/math/math_grpc_pb.js b/test/api/math/math_grpc_pb.js similarity index 100% rename from packages/grpc-native-core/test/math/math_grpc_pb.js rename to test/api/math/math_grpc_pb.js diff --git a/packages/grpc-native-core/test/math/math_pb.js b/test/api/math/math_pb.js similarity index 100% rename from packages/grpc-native-core/test/math/math_pb.js rename to test/api/math/math_pb.js diff --git a/packages/grpc-native-core/test/math/math_server.js b/test/api/math/math_server.js similarity index 99% rename from packages/grpc-native-core/test/math/math_server.js rename to test/api/math/math_server.js index 4291ae18..05e30f72 100644 --- a/packages/grpc-native-core/test/math/math_server.js +++ b/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'); diff --git a/packages/grpc-native-core/test/math_client_test.js b/test/api/math_client_test.js similarity index 99% rename from packages/grpc-native-core/test/math_client_test.js rename to test/api/math_client_test.js index 11deda34..09265abf 100644 --- a/packages/grpc-native-core/test/math_client_test.js +++ b/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; diff --git a/packages/grpc-native-core/test/metadata_test.js b/test/api/metadata_test.js similarity index 99% rename from packages/grpc-native-core/test/metadata_test.js rename to test/api/metadata_test.js index 4ba54e0a..5e24f7ac 100644 --- a/packages/grpc-native-core/test/metadata_test.js +++ b/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'); diff --git a/packages/grpc-native-core/test/numbers.txt b/test/api/numbers.txt similarity index 100% rename from packages/grpc-native-core/test/numbers.txt rename to test/api/numbers.txt diff --git a/test/package.json b/test/package.json index e987314c..e3aa0eeb 100644 --- a/test/package.json +++ b/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"