Fix missing protobuf import in grpc files (#845)

Fixes #844.
google · Jun 16, 2023 · f4ffa1d · f4ffa1d
1 parent a9bf79f
commit f4ffa1d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/protoc_plugin/CHANGELOG.md b/protoc_plugin/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 21.0.1
+
+* Fix missing protobuf import in generated grpc files. ([#844])
+
+[#844]: https://github.com/google/protobuf.dart/issues/844
+
 ## 21.0.0
 
 * Identifiers `fromBuffer`, `fromJson`, `$_defaultFor`, `initByValue` are no

diff --git a/protoc_plugin/bin/protoc_plugin.exe b/protoc_plugin/bin/protoc_plugin.exe
diff --git a/protoc_plugin/lib/src/file_generator.dart b/protoc_plugin/lib/src/file_generator.dart
@@ -504,6 +504,7 @@ class FileGenerator extends ProtobufContainer {
     importWriter.addImport(_asyncImportUrl, prefix: asyncImportPrefix);
     importWriter.addImport(_coreImportUrl, prefix: coreImportPrefix);
     importWriter.addImport(_grpcImportUrl, prefix: grpcImportPrefix);
+    importWriter.addImport(_protobufImportUrl, prefix: protobufImportPrefix);
 
     // Import .pb.dart files needed for requests and responses.
     final imports = <FileGenerator>{};

diff --git a/protoc_plugin/pubspec.yaml b/protoc_plugin/pubspec.yaml
@@ -1,5 +1,5 @@
 name: protoc_plugin
-version: 21.0.0
+version: 21.0.1
 description: A protobuf protoc compiler plugin used to generate Dart code.
 repository: https://github.com/google/protobuf.dart/tree/master/protoc_plugin
 

diff --git a/protoc_plugin/test/goldens/grpc_service.pbgrpc b/protoc_plugin/test/goldens/grpc_service.pbgrpc
@@ -13,6 +13,7 @@ import 'dart:async' as $async;
 import 'dart:core' as $core;
 
 import 'package:grpc/service_api.dart' as $grpc;
+import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'test.pb.dart' as $0;