Merge pull request #1097 from murgatroid99/electron_7_node_13_backport

Backport "Add Electron 7 and Node 13 to the build" to 1.24.x
grpc · Nov 1, 2019 · 48a6e1c · 48a6e1c
2 parents 69b19df + 6c41f6b
commit 48a6e1c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp
@@ -91,7 +91,7 @@
       'GPR_BACKWARDS_COMPATIBILITY_MODE',
       'GRPC_ARES=1',
       'GRPC_UV',
-      'GRPC_NODE_VERSION="1.24.1"',
+      'GRPC_NODE_VERSION="1.24.2"',
       'CARES_STATICLIB',
       'CARES_SYMBOL_HIDING'
     ],

diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml
@@ -1,3 +1,3 @@
 settings:
   '#': It's possible to have node_version here as a key to override the core's version.
-  node_version: 1.24.1
+  node_version: 1.24.2
diff --git a/packages/grpc-native-core/ext/call.cc b/packages/grpc-native-core/ext/call.cc
@@ -101,7 +101,7 @@ bool CreateMetadataArray(Local<Object> metadata_obj, grpc_metadata_array *array)
   array->metadata = reinterpret_cast<grpc_metadata *>(
       gpr_zalloc(array->capacity * sizeof(grpc_metadata)));
   for (unsigned int i = 0; i < keys->Length(); i++) {
-    Local<String> current_key(Nan::To<String>(keys->Get(i)).ToLocalChecked());
+    Local<String> current_key(Nan::To<String>(Nan::Get(keys, i).ToLocalChecked()).ToLocalChecked());
     Local<Array> values =
         Local<Array>::Cast(Nan::Get(metadata, current_key).ToLocalChecked());
     grpc_slice key_slice = CreateSliceFromString(current_key);
@@ -678,7 +678,7 @@ NAN_METHOD(Call::StartBatch) {
       default:
         return Nan::ThrowError("Argument object had an unrecognized key");
     }
-    if (!op->ParseOp(obj->Get(type), &ops[i])) {
+    if (!op->ParseOp(Nan::Get(obj, type).ToLocalChecked(), &ops[i])) {
       return Nan::ThrowTypeError("Incorrectly typed arguments to startBatch");
     }
     op_vector->push_back(std::move(op));

diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",
@@ -33,7 +33,7 @@
     "lodash.camelcase": "^4.3.0",
     "lodash.clone": "^4.5.0",
     "nan": "^2.13.2",
-    "node-pre-gyp": "^0.13.0",
+    "node-pre-gyp": "^0.14.0",
     "protobufjs": "^5.0.3"
   },
   "devDependencies": {

diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template
@@ -35,7 +35,7 @@
       "lodash.camelcase": "^4.3.0",
       "lodash.clone": "^4.5.0",
       "nan": "^2.13.2",
-      "node-pre-gyp": "^0.13.0",
+      "node-pre-gyp": "^0.14.0",
       "protobufjs": "^5.0.3"
     },
     "devDependencies": {

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.bat
@@ -14,7 +14,7 @@
 
 set arch_list=ia32 x64
 
-set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 4.2.0 5.0.0 6.0.0
+set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 4.2.0 5.0.0 6.0.0 7.0.0
 
 set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
 

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_electron.sh
@@ -16,7 +16,7 @@
 set -ex
 
 arch_list=( ia32 x64 )
-electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 4.2.0 5.0.0 6.0.0 )
+electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 1.7.0 1.8.0 2.0.0 3.0.0 3.1.0 4.1.0 4.2.0 5.0.0 6.0.0 7.0.0 )
 
 umask 022
 

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.bat
@@ -14,7 +14,7 @@
 
 set arch_list=ia32 x64
 
-set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0
+set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0 13.0.0
 
 set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
 

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh
@@ -16,7 +16,7 @@
 set -ex
 
 arch_list=( ia32 x64 )
-node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0 13.0.0 )
 
 while true ; do
   case $1 in

diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node_arm.sh
@@ -26,7 +26,7 @@ mkdir -p "${ARTIFACTS_OUT}"
 
 npm update
 
-node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0 )
+node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 9.0.0 10.0.0 11.0.0 12.0.0 13.0.0 )
 
 for version in ${node_versions[@]}
 do