Skip to content

Commit 0be01a1

Browse files
committed
Fixed: Support node 4.2.0 to 4.4.7 buffers + travis case, see #665; Other: Added fetch test cases + some test cleanup
1 parent 942011d commit 0be01a1

35 files changed

+476
-217
lines changed

.npmignore

-10
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,5 @@ docs/
88
coverage/
99
sandbox/
1010
examples/
11-
src/util/aspromise/
12-
src/util/base64/
13-
src/util/codegen/
14-
src/util/eventemitter/
15-
src/util/extend/
16-
src/util/fetch/
17-
src/util/inquire/
18-
src/util/path/
19-
src/util/pool/
20-
src/util/utf8/
2111
pbjs.png
2212
pbjs.svg

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: node_js
22
node_js:
33
- 0.12
44
- 4
5+
- 4.3.2
56
- 6
67
- 7
78
env: CXX=g++-4.8

dist/light/protobuf.js

+34-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/light/protobuf.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/light/protobuf.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/light/protobuf.min.js.gz

31 Bytes
Binary file not shown.

dist/light/protobuf.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/minimal/protobuf.js

+34-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/minimal/protobuf.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/minimal/protobuf.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/minimal/protobuf.min.js.gz

28 Bytes
Binary file not shown.

dist/minimal/protobuf.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.js

+34-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js.gz

38 Bytes
Binary file not shown.

dist/protobuf.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,7 @@ export namespace util {
22222222
function lazyResolve(root: Root, lazyTypes: { [k: number]: (string|ReflectionObject) }): void;
22232223

22242224
/**
2225-
* Default conversion options used for toJSON implementations.
2225+
* Default conversion options used for toJSON implementations. Converts longs, enums and bytes to strings.
22262226
* @type {ConversionOptions}
22272227
*/
22282228
var toJSONOptions: ConversionOptions;

lib/fetch/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@protobufjs/fetch",
33
"description": "Fetches the contents of a file accross node and browsers.",
4-
"version": "1.1.0",
4+
"version": "1.1.1",
55
"author": "Daniel Wirtz <[email protected]>",
66
"repository": {
77
"type": "git",

lib/fetch/tests/data/file.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
file.txt

0 commit comments

Comments
 (0)