aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/js/js_generator.h
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2018-07-02 13:58:42 -0700
committerGitHub <noreply@github.com>2018-07-02 13:58:42 -0700
commit0ea3d74c3d01736ed8e4ee05a235f024ad56cb42 (patch)
treef94971f6698a2d1753582699a52b4acfef0e244e /src/google/protobuf/compiler/js/js_generator.h
parente00266a74ee0eb95cc745fdf4f346b28d2018332 (diff)
parente479adf394dae62b6ddd82675d840d24c3431b83 (diff)
downloadprotobuf-0ea3d74c3d01736ed8e4ee05a235f024ad56cb42.tar.gz
protobuf-0ea3d74c3d01736ed8e4ee05a235f024ad56cb42.tar.bz2
protobuf-0ea3d74c3d01736ed8e4ee05a235f024ad56cb42.zip
Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-style
Feat: add import-style=commonjs_strict option to the compiler
Diffstat (limited to 'src/google/protobuf/compiler/js/js_generator.h')
-rw-r--r--src/google/protobuf/compiler/js/js_generator.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/js/js_generator.h b/src/google/protobuf/compiler/js/js_generator.h
index 3cc60e22..b50ef7fd 100644
--- a/src/google/protobuf/compiler/js/js_generator.h
+++ b/src/google/protobuf/compiler/js/js_generator.h
@@ -63,10 +63,11 @@ struct GeneratorOptions {
bool binary;
// What style of imports should be used.
enum ImportStyle {
- kImportClosure, // goog.require()
- kImportCommonJs, // require()
- kImportBrowser, // no import statements
- kImportEs6, // import { member } from ''
+ kImportClosure, // goog.require()
+ kImportCommonJs, // require()
+ kImportCommonJsStrict, // require() with no global export
+ kImportBrowser, // no import statements
+ kImportEs6, // import { member } from ''
} import_style;
GeneratorOptions()