remove unused deps & move proto to protos

stephenplusplus · stephenplusplus · commit c33e5317f17b · 2017-09-18T17:50:52.000-04:00
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -51,12 +51,10 @@
   ],
   "dependencies": {
     "extend": "^3.0",
-    "google-gax": "^0.13.5",
-    "google-proto-files": "^0.12.0"
+    "google-gax": "^0.13.5"
   },
   "devDependencies": {
-    "mocha": "^3.2.0",
-    "through2": "^2.0.3"
+    "mocha": "^3.2.0"
   },
   "scripts": {
     "publish-module": "node ../../scripts/publish.js language",
diff --git a/packages/language/protos/google/cloud/language/v1/language_service.proto b/packages/language/protos/google/cloud/language/v1/language_service.proto
diff --git a/packages/language/protos/google/cloud/language/v1beta2/language_service.proto b/packages/language/protos/google/cloud/language/v1beta2/language_service.proto
diff --git a/packages/language/src/index.js b/packages/language/src/index.js
@@ -75,7 +75,7 @@ function languageV1(options) {
 var v1Protos = {};
 
 extend(v1Protos, gaxGrpc.loadProto(
-  path.join(__dirname, '..', 'proto',
+  path.join(__dirname, '..', 'protos',
     'google/cloud/language/v1/language_service.proto')
 ).google.cloud.language.v1);
 
@@ -125,7 +125,7 @@ function languageV1beta2(options) {
 var v1beta2Protos = {};
 
 extend(v1beta2Protos, gaxGrpc.loadProto(
-  path.join(__dirname, '..', 'proto',
+  path.join(__dirname, '..', 'protos',
     'google/cloud/language/v1beta2/language_service.proto')
 ).google.cloud.language.v1beta2);
 
diff --git a/packages/language/src/v1/language_service_client.js b/packages/language/src/v1/language_service_client.js
@@ -403,7 +403,7 @@ function LanguageServiceClientBuilder(gaxGrpc) {
   }
 
   var languageServiceStubProtos = gaxGrpc.loadProto(
-    path.join(__dirname, '..', '..', 'proto', 'google/cloud/language/v1/language_service.proto'));
+    path.join(__dirname, '..', '..', 'protos', 'google/cloud/language/v1/language_service.proto'));
   extend(this, languageServiceStubProtos.google.cloud.language.v1);
 
 
diff --git a/packages/language/src/v1beta2/language_service_client.js b/packages/language/src/v1beta2/language_service_client.js
@@ -454,7 +454,7 @@ function LanguageServiceClientBuilder(gaxGrpc) {
   }
 
   var languageServiceStubProtos = gaxGrpc.loadProto(
-    path.join(__dirname, '..', '..', 'proto', 'google/cloud/language/v1beta2/language_service.proto'));
+    path.join(__dirname, '..', '..', 'protos', 'google/cloud/language/v1beta2/language_service.proto'));
   extend(this, languageServiceStubProtos.google.cloud.language.v1beta2);
 
 

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ function LanguageServiceClientBuilder(gaxGrpc) {`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`var languageServiceStubProtos = gaxGrpc.loadProto(`
`406`		`- path.join(__dirname, '..', '..', 'proto', 'google/cloud/language/v1/language_service.proto'));`
	`406`	`+ path.join(__dirname, '..', '..', 'protos', 'google/cloud/language/v1/language_service.proto'));`
`407`	`407`	`extend(this, languageServiceStubProtos.google.cloud.language.v1);`
`408`	`408`
`409`	`409`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ function LanguageServiceClientBuilder(gaxGrpc) {`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`var languageServiceStubProtos = gaxGrpc.loadProto(`
`457`		`- path.join(__dirname, '..', '..', 'proto', 'google/cloud/language/v1beta2/language_service.proto'));`
	`457`	`+ path.join(__dirname, '..', '..', 'protos', 'google/cloud/language/v1beta2/language_service.proto'));`
`458`	`458`	`extend(this, languageServiceStubProtos.google.cloud.language.v1beta2);`
`459`	`459`
`460`	`460`