From 3ecb385366495df4e06c34e818d88c1eab213af4 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Tue, 19 Sep 2017 13:03:58 -0700
Subject: [PATCH] Change package.json file list to globs for granularity

---
 packages/grpc-native-core/package.json        | 27 +++++++++----------
 .../templates/package.json.template           | 25 ++++++++---------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json
index dd8e75f6..4baa04da 100644
--- a/packages/grpc-native-core/package.json
+++ b/packages/grpc-native-core/package.json
@@ -45,7 +45,9 @@
     "google-protobuf": "^3.0.0",
     "istanbul": "^0.4.4",
     "jsdoc": "^3.3.2",
+    "jshint": "^2.5.0",
     "minimist": "^1.1.0",
+    "mocha": "^3.0.2",
     "mocha-jenkins-reporter": "^0.2.3",
     "poisson-process": "^0.2.1"
   },
@@ -62,21 +64,18 @@
   "files": [
     "LICENSE",
     "README.md",
-    "deps/grpc/etc",
+    "deps/grpc/etc/",
     "index.js",
-    "src",
-    "ext",
-    "deps/grpc/include/grpc",
-    "deps/grpc/src/core",
-    "deps/grpc/src/boringssl",
-    "deps/grpc/src/zlib",
-    "deps/grpc/third_party/nanopb/pb_common.c",
-    "deps/grpc/third_party/nanopb/pb_decode.c",
-    "deps/grpc/third_party/nanopb/pb_encode.c",
-    "deps/grpc/third_party/zlib",
-    "deps/grpc/third_party/boringssl/crypto",
-    "deps/grpc/third_party/boringssl/include",
-    "deps/grpc/third_party/boringssl/ssl",
+    "src/*.js",
+    "ext/*.{cc,h}",
+    "deps/grpc/include/grpc/**/*.h",
+    "deps/grpc/src/core/**/*.{c,h}",
+    "deps/grpc/src/boringssl/*.{c,h}",
+    "deps/grpc/third_party/nanopb/*.{c,h}",
+    "deps/grpc/third_party/zlib/**/*.{c,h}",
+    "deps/grpc/third_party/boringssl/crypto/**/*.{c,h}",
+    "deps/grpc/third_party/boringssl/include/**/*.{c,h}",
+    "deps/grpc/third_party/boringssl/ssl/**/*.{c,h}",
     "binding.gyp"
   ],
   "main": "index.js",
diff --git a/packages/grpc-native-core/templates/package.json.template b/packages/grpc-native-core/templates/package.json.template
index 263e7484..034eb5f4 100644
--- a/packages/grpc-native-core/templates/package.json.template
+++ b/packages/grpc-native-core/templates/package.json.template
@@ -66,21 +66,18 @@
     "files": [
       "LICENSE",
       "README.md",
-      "deps/grpc/etc",
+      "deps/grpc/etc/",
       "index.js",
-      "src",
-      "ext",
-      "deps/grpc/include/grpc",
-      "deps/grpc/src/core",
-      "deps/grpc/src/boringssl",
-      "deps/grpc/src/zlib",
-      "deps/grpc/third_party/nanopb/pb_common.c",
-      "deps/grpc/third_party/nanopb/pb_decode.c",
-      "deps/grpc/third_party/nanopb/pb_encode.c",
-      "deps/grpc/third_party/zlib",
-      "deps/grpc/third_party/boringssl/crypto",
-      "deps/grpc/third_party/boringssl/include",
-      "deps/grpc/third_party/boringssl/ssl",
+      "src/*.js",
+      "ext/*.{cc,h}",
+      "deps/grpc/include/grpc/**/*.h",
+      "deps/grpc/src/core/**/*.{c,h}",
+      "deps/grpc/src/boringssl/*.{c,h}",
+      "deps/grpc/third_party/nanopb/*.{c,h}",
+      "deps/grpc/third_party/zlib/**/*.{c,h}",
+      "deps/grpc/third_party/boringssl/crypto/**/*.{c,h}",
+      "deps/grpc/third_party/boringssl/include/**/*.{c,h}",
+      "deps/grpc/third_party/boringssl/ssl/**/*.{c,h}",
       "binding.gyp"
     ],
     "main": "index.js",