Skip to content

Commit 62d4891

Browse files
committed
Sync from Piper @328224070
PROTOBUF_SYNC_PIPER
2 parents bb77855 + 7d0d997 commit 62d4891

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

binary/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ jspb.utils.splitFloat64 = function(value) {
258258
// Compute the least significant exponent needed to represent the magnitude of
259259
// the value by repeadly dividing/multiplying by 2 until the magnitude
260260
// crosses 2. While tempting to use log math to find the exponent, at the
261-
// bounadaries of precision, the result can be off by one.
261+
// boundaries of precision, the result can be off by one.
262262
var maxDoubleExponent = 1023;
263263
var minDoubleExponent = -1022;
264264
var x = value;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "google-protobuf",
3-
"version": "3.12.3",
3+
"version": "3.13.0",
44
"description": "Protocol Buffers for JavaScript",
55
"main": "google-protobuf.js",
66
"files": [

src/google/protobuf/compiler/js/js_generator.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,6 +1654,8 @@ void Generator::GenerateHeader(const GeneratorOptions& options,
16541654
" * @public\n"
16551655
" */\n"
16561656
"// GENERATED CODE -- DO NOT EDIT!\n"
1657+
"/* eslint-disable */\n"
1658+
"// @ts-nocheck\n"
16571659
"\n");
16581660
}
16591661

src/google/protobuf/compiler/js/js_generator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ struct GeneratorOptions {
125125
std::string extension;
126126
// Create a separate output file for each input file?
127127
bool one_output_file_per_input_file;
128-
// If true, we should append annotations as commen on the last line for
128+
// If true, we should append annotations as comments on the last line for
129129
// generated .js file. Annotations used by tools like https://kythe.io
130130
// to provide cross-references between .js and .proto files. Annotations
131-
// are enced as base64 proto of GeneratedCodeInfo message (see
131+
// are encoded as base64 proto of GeneratedCodeInfo message (see
132132
// descriptor.proto).
133133
bool annotate_code;
134134
};

0 commit comments

Comments
 (0)