fix: deprecated grpc and replace with @grpc/grpc-js (#362)

* fix depricated grpc and replace with @grpc/grpc-js * Update codegen. Co-authored-by: Stephen Haberman <stephen.haberman@gmail.com>
stephenh · Sep 17, 2021 · 1a11b97 · 1a11b97
1 parent f636655
commit 1a11b97
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/integration/nestjs-metadata-observables/hero.ts b/integration/nestjs-metadata-observables/hero.ts
@@ -3,7 +3,7 @@ import { GrpcMethod, GrpcStreamMethod } from '@nestjs/microservices';
 import { util, configure } from 'protobufjs/minimal';
 import * as Long from 'long';
 import { Observable } from 'rxjs';
-import { Metadata } from 'grpc';
+import { Metadata } from '@grpc/grpc-js';
 
 export const protobufPackage = 'hero';
 

diff --git a/integration/nestjs-metadata-restparameters/hero.ts b/integration/nestjs-metadata-restparameters/hero.ts
@@ -3,7 +3,7 @@ import { GrpcMethod, GrpcStreamMethod } from '@nestjs/microservices';
 import { util, configure } from 'protobufjs/minimal';
 import * as Long from 'long';
 import { Observable } from 'rxjs';
-import { Metadata } from 'grpc';
+import { Metadata } from '@grpc/grpc-js';
 
 export const protobufPackage = 'hero';
 

diff --git a/integration/nestjs-metadata/hero.ts b/integration/nestjs-metadata/hero.ts
@@ -3,7 +3,7 @@ import { GrpcMethod, GrpcStreamMethod } from '@nestjs/microservices';
 import { util, configure } from 'protobufjs/minimal';
 import * as Long from 'long';
 import { Observable } from 'rxjs';
-import { Metadata } from 'grpc';
+import { Metadata } from '@grpc/grpc-js';
 
 export const protobufPackage = 'hero';
 

diff --git a/integration/only-types-grpc-metadata/only-types-grpc-metadata.ts b/integration/only-types-grpc-metadata/only-types-grpc-metadata.ts
@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { Metadata } from 'grpc';
+import { Metadata } from '@grpc/grpc-js';
 
 export const protobufPackage = 'basic';
 

diff --git a/src/generate-nestjs.ts b/src/generate-nestjs.ts
@@ -24,7 +24,7 @@ export function generateNestjsServiceController(
  const { options } = ctx;
  const chunks: Code[] = [];
 
- const Metadata = options.outputServices === ServiceOption.GRPC ? imp('Metadata@@grpc/grpc-js') : imp('Metadata@grpc');
+ const Metadata = imp('Metadata@@grpc/grpc-js');
 
  maybeAddComment(sourceInfo, chunks, serviceDesc.options?.deprecated);
  const t = options.context ? `<${contextTypeVar}>` : '';
@@ -97,7 +97,7 @@ export function generateNestjsServiceClient(
  const { options } = ctx;
  const chunks: Code[] = [];
 
- const Metadata = options.outputServices === ServiceOption.GRPC ? imp('Metadata@@grpc/grpc-js') : imp('Metadata@grpc');
+ const Metadata = imp('Metadata@@grpc/grpc-js');
 
  maybeAddComment(sourceInfo, chunks);
  const t = options.context ? `<${contextTypeVar}>` : ``;

diff --git a/src/generate-services.ts b/src/generate-services.ts
@@ -64,7 +64,7 @@ export function generateService(
  // We have to use grpc.Metadata where grpc will come from @improbable-eng
  params.push(code`metadata?: grpc.Metadata`);
  } else if (options.addGrpcMetadata) {
- const Metadata = imp('Metadata@grpc');
+ const Metadata = imp('Metadata@@grpc/grpc-js');
  const q = options.addNestjsRestParameter ? '' : '?';
  params.push(code`metadata${q}: ${Metadata}`);
  }