diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-06-20 10:48:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 10:48:08 -0700 |
| commit | e3ea413ab076c8f6250efe32e1c793c90e8e3992 (patch) | |
| tree | 33850001a5e9f4dbde098003780d06e7a16c7e50 | |
| parent | 761a6275d4b7089db50dda22eb4241ba7f923769 (diff) | |
| parent | 6074aaa988742a8d6de7010e7971c360689a67d6 (diff) | |
| download | protobuf-e3ea413ab076c8f6250efe32e1c793c90e8e3992.tar.gz protobuf-e3ea413ab076c8f6250efe32e1c793c90e8e3992.tar.bz2 protobuf-e3ea413ab076c8f6250efe32e1c793c90e8e3992.zip | |
Merge pull request #4780 from mwei0210/master
check provided size to check whether to export
| -rwxr-xr-x | src/google/protobuf/compiler/js/js_generator.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index d8282e40..7109ed5b 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -3477,7 +3477,8 @@ void Generator::GenerateFile(const GeneratorOptions& options, GenerateExtension(options, printer, *it); } - if (options.import_style == GeneratorOptions::kImportCommonJs) { + // if provided is empty, do not export anything + if (options.import_style == GeneratorOptions::kImportCommonJs && !provided.empty()) { printer->Print("goog.object.extend(exports, $package$);\n", "package", GetFilePath(options, file)); } |