From 9264222786d62729b474e5e8c501bf1696985b8f Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 10 Apr 2020 18:08:42 -0700 Subject: [PATCH] fix: remove eslint, update gax, fix generated protos, run the generator Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint. --- package.json | 10 +++------- protos/google/cloud/vision/v1/image_annotator.proto | 2 +- .../cloud/vision/v1p1beta1/image_annotator.proto | 2 +- .../cloud/vision/v1p2beta1/image_annotator.proto | 2 +- .../cloud/vision/v1p3beta1/image_annotator.proto | 2 +- .../cloud/vision/v1p4beta1/image_annotator.proto | 2 +- synth.metadata | 10 +--------- synth.py | 2 +- 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index eaf0459f..a893d63a 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "test-no-cover": "mocha test/*.js", "docs-test": "linkinator docs", "predocs-test": "npm run docs", - "prelint": "cd samples; npm link ../; npm i", + "prelint": "cd samples; npm link ../; npm install", "clean": "gts clean", "compile": "tsc -p . && cp -r protos build/", "compile-protos": "compileProtos src", @@ -44,7 +44,7 @@ }, "dependencies": { "@google-cloud/promisify": "^1.0.4", - "google-gax": "^2.0.1", + "google-gax": "^2.1.0", "is": "^3.3.0" }, "devDependencies": { @@ -56,11 +56,7 @@ "@types/uuid": "^3.4.7", "c8": "^7.1.0", "codecov": "^3.6.5", - "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.0", - "eslint-plugin-node": "^11.0.0", - "eslint-plugin-prettier": "^3.1.2", - "gts": "2.0.0", + "gts": "^2.0.0", "jsdoc": "^3.6.3", "jsdoc-fresh": "^1.0.2", "jsdoc-region-tag": "^1.0.4", diff --git a/protos/google/cloud/vision/v1/image_annotator.proto b/protos/google/cloud/vision/v1/image_annotator.proto index e75ca766..d2588604 100644 --- a/protos/google/cloud/vision/v1/image_annotator.proto +++ b/protos/google/cloud/vision/v1/image_annotator.proto @@ -676,7 +676,7 @@ message ImageContext { // setting a hint will help get better results (although it will be a // significant hindrance if the hint is wrong). Text detection returns an // error if one or more of the specified languages is not one of the - // [supported languages](https://cloud.google.com/vision/docs/languages). + // [supported languages](/vision/docs/languages). repeated string language_hints = 2; // Parameters for crop hints annotation request. diff --git a/protos/google/cloud/vision/v1p1beta1/image_annotator.proto b/protos/google/cloud/vision/v1p1beta1/image_annotator.proto index 4f5ada70..e9665c20 100644 --- a/protos/google/cloud/vision/v1p1beta1/image_annotator.proto +++ b/protos/google/cloud/vision/v1p1beta1/image_annotator.proto @@ -502,7 +502,7 @@ message ImageContext { // setting a hint will help get better results (although it will be a // significant hindrance if the hint is wrong). Text detection returns an // error if one or more of the specified languages is not one of the - // [supported languages](https://cloud.google.com/vision/docs/languages). + // [supported languages](/vision/docs/languages). repeated string language_hints = 2; // Parameters for crop hints annotation request. diff --git a/protos/google/cloud/vision/v1p2beta1/image_annotator.proto b/protos/google/cloud/vision/v1p2beta1/image_annotator.proto index 87ae9f2c..8b0756d2 100644 --- a/protos/google/cloud/vision/v1p2beta1/image_annotator.proto +++ b/protos/google/cloud/vision/v1p2beta1/image_annotator.proto @@ -533,7 +533,7 @@ message ImageContext { // setting a hint will help get better results (although it will be a // significant hindrance if the hint is wrong). Text detection returns an // error if one or more of the specified languages is not one of the - // [supported languages](https://cloud.google.com/vision/docs/languages). + // [supported languages](/vision/docs/languages). repeated string language_hints = 2; // Parameters for crop hints annotation request. diff --git a/protos/google/cloud/vision/v1p3beta1/image_annotator.proto b/protos/google/cloud/vision/v1p3beta1/image_annotator.proto index b63aa2b2..b1c5ee41 100644 --- a/protos/google/cloud/vision/v1p3beta1/image_annotator.proto +++ b/protos/google/cloud/vision/v1p3beta1/image_annotator.proto @@ -561,7 +561,7 @@ message ImageContext { // setting a hint will help get better results (although it will be a // significant hindrance if the hint is wrong). Text detection returns an // error if one or more of the specified languages is not one of the - // [supported languages](https://cloud.google.com/vision/docs/languages). + // [supported languages](/vision/docs/languages). repeated string language_hints = 2; // Parameters for crop hints annotation request. diff --git a/protos/google/cloud/vision/v1p4beta1/image_annotator.proto b/protos/google/cloud/vision/v1p4beta1/image_annotator.proto index 9c18cccd..623dfe0a 100644 --- a/protos/google/cloud/vision/v1p4beta1/image_annotator.proto +++ b/protos/google/cloud/vision/v1p4beta1/image_annotator.proto @@ -632,7 +632,7 @@ message ImageContext { // setting a hint will help get better results (although it will be a // significant hindrance if the hint is wrong). Text detection returns an // error if one or more of the specified languages is not one of the - // [supported languages](https://cloud.google.com/vision/docs/languages). + // [supported languages](/vision/docs/languages). repeated string language_hints = 2; // Parameters for crop hints annotation request. diff --git a/synth.metadata b/synth.metadata index 1f1bc083..ad227f18 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,14 +1,6 @@ { - "updateTime": "2020-04-10T20:00:59.209374Z", + "updateTime": "2020-04-11T01:08:42.418307Z", "sources": [ - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "cf18ab5200e41e9d0cfef88c6c4bcdd394faf1ca", - "internalRef": "305925954" - } - }, { "git": { "name": "synthtool", diff --git a/synth.py b/synth.py index f7c98186..8ef28aa2 100644 --- a/synth.py +++ b/synth.py @@ -54,5 +54,5 @@ # Node.js specific cleanup subprocess.run(['npm', 'install']) -subprocess.run(['npm', 'run', 'fix']) +subprocess.run(['npm', 'run', 'lint']) subprocess.run(['npx', 'compileProtos', 'src'])