chore(): resolve merge conflicts

nestjs · Jan 27, 2021 · 036a9fb · 036a9fb
2 parents 1320f4e + 1e0852f
commit 036a9fb
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 11,586 deletions.
diff --git a/integration/microservices/e2e/orders-grpc.spec.ts b/integration/microservices/e2e/orders-grpc.spec.ts
@@ -6,7 +6,7 @@ import { Test } from '@nestjs/testing';
 import { fail } from 'assert';
 import { expect } from 'chai';
 import * as express from 'express';
-import * as GRPC from 'grpc';
+import * as GRPC from '@grpc/grpc-js';
 import { join } from 'path';
 import * as request from 'supertest';
 import { AdvancedGrpcController } from '../src/grpc-advanced/advanced.grpc.controller';

diff --git a/integration/microservices/e2e/sum-grpc.spec.ts b/integration/microservices/e2e/sum-grpc.spec.ts
@@ -4,7 +4,7 @@ import { Transport } from '@nestjs/microservices';
 import { Test } from '@nestjs/testing';
 import { fail } from 'assert';
 import { expect } from 'chai';
-import * as GRPC from 'grpc';
+import * as GRPC from '@grpc/grpc-js';
 import { join } from 'path';
 import * as request from 'supertest';
 import { GrpcController } from '../src/grpc/grpc.controller';