Merge branch 'master' of https://github.com/nestjs/nest

nestjs · Nov 18, 2021 · ba128b6 · ba128b6
2 parents c36a3bf + 8f2a785
commit ba128b6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/Readme.md b/Readme.md
@@ -113,6 +113,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
   <td align="center" valign="middle"><a href="https://studyclerk.com/pay-for-research-paper" target="_blank"><img src="https://nestjs.com/img/studyclerk-logo.png" width="125" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://xyndata.com" target="_blank"><img src="https://nestjs.com/img/xyndata-logo.png" width="125" valign="middle" /></a></td></tr><tr>
   <td align="center" valign="middle"><a href="https://www.anonymistic.com/" target="_blank"><img src="https://nestjs.com/img/anonymistic-logo.png" width="125" valign="middle" /></a></td>
 <td align="center" valign="middle"><a href="https://www.naologic.com/" target="_blank"><img src="https://nestjs.com/img/naologic-logo.svg" width="125" valign="middle" /></a></td>
+  <td align="center" valign="middle"><a href="https://messaged.com/" target="_blank"><img src="https://nestjs.com/img/messaged-logo.png" width="50" valign="middle" /></a></td>
+  <td align="center" valign="middle"><a href="https://triplecore.io" target="_blank"><img src="https://nestjs.com/img/triplecore-logo.svg" width="50" valign="middle" /></a></td>
   </tr></table>
 
 ## Backers

diff --git a/packages/core/injector/injector.ts b/packages/core/injector/injector.ts
@@ -800,7 +800,8 @@ export class Injector {
       return;
     }
     const tokenName = this.getTokenName(token);
-    const dependentName = inquirer?.name ?? 'unknown';
+    const dependentName =
+      (inquirer?.name && inquirer.name.toString?.()) ?? 'unknown';
     const isAlias = dependentName === tokenName;
 
     const messageToPrint = `Resolving dependency ${clc.cyanBright(

diff --git a/packages/microservices/client/client-grpc.ts b/packages/microservices/client/client-grpc.ts
@@ -31,7 +31,14 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
       require('@grpc/grpc-js'),
     );
 
-    grpcProtoLoaderPackage = loadPackage(protoLoader, ClientGrpcProxy.name);
+    grpcProtoLoaderPackage = loadPackage(
+      protoLoader,
+      ClientGrpcProxy.name,
+      () =>
+        protoLoader === GRPC_DEFAULT_PROTO_LOADER
+          ? require('@grpc/proto-loader')
+          : require(protoLoader),
+    );
     this.grpcClients = this.createClients();
   }
 
@@ -278,7 +285,7 @@ export class ClientGrpcProxy extends ClientProxy implements ClientGrpc {
       const packageDefinition =
         this.getOptionsProp(this.options, 'packageDefinition') ||
         grpcProtoLoaderPackage.loadSync(file, loader);
-      
+
       const packageObject =
         grpcPackage.loadPackageDefinition(packageDefinition);
       return packageObject;

diff --git a/packages/microservices/server/server-grpc.ts b/packages/microservices/server/server-grpc.ts
@@ -48,7 +48,14 @@ export class ServerGrpc extends Server implements CustomTransportStrategy {
     grpcPackage = this.loadPackage('@grpc/grpc-js', ServerGrpc.name, () =>
       require('@grpc/grpc-js'),
     );
-    grpcProtoLoaderPackage = this.loadPackage(protoLoader, ServerGrpc.name);
+    grpcProtoLoaderPackage = this.loadPackage(
+      protoLoader,
+      ServerGrpc.name,
+      () =>
+        protoLoader === GRPC_DEFAULT_PROTO_LOADER
+          ? require('@grpc/proto-loader')
+          : require(protoLoader),
+    );
   }
 
   public async listen(