Fixed: Support node 4.2.0 to 4.4.7 buffers + travis case, see #665; O…

…ther: Added fetch test cases + some test cleanup
protobufjs · Jan 28, 2017 · 0be01a1 · 0be01a1
1 parent 942011d
commit 0be01a1
Show file tree

Hide file tree

Showing 35 changed files with 476 additions and 217 deletions.
diff --git a/.npmignore b/.npmignore
@@ -8,15 +8,5 @@ docs/
 coverage/
 sandbox/
 examples/
-src/util/aspromise/
-src/util/base64/
-src/util/codegen/
-src/util/eventemitter/
-src/util/extend/
-src/util/fetch/
-src/util/inquire/
-src/util/path/
-src/util/pool/
-src/util/utf8/
 pbjs.png
 pbjs.svg
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: node_js
 node_js:
   - 0.12
   - 4
+  - 4.3.2
   - 6
   - 7
 env: CXX=g++-4.8

diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
diff --git a/dist/light/protobuf.js.map b/dist/light/protobuf.js.map
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
diff --git a/dist/light/protobuf.min.js.gz b/dist/light/protobuf.min.js.gz
diff --git a/dist/light/protobuf.min.js.map b/dist/light/protobuf.min.js.map
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js
diff --git a/dist/minimal/protobuf.js.map b/dist/minimal/protobuf.js.map
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
diff --git a/dist/minimal/protobuf.min.js.gz b/dist/minimal/protobuf.min.js.gz
diff --git a/dist/minimal/protobuf.min.js.map b/dist/minimal/protobuf.min.js.map
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/index.d.ts b/index.d.ts
@@ -2222,7 +2222,7 @@ export namespace util {
     function lazyResolve(root: Root, lazyTypes: { [k: number]: (string|ReflectionObject) }): void;
 
     /**
-     * Default conversion options used for toJSON implementations.
+     * Default conversion options used for toJSON implementations. Converts longs, enums and bytes to strings.
      * @type {ConversionOptions}
      */
     var toJSONOptions: ConversionOptions;

diff --git a/lib/fetch/package.json b/lib/fetch/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@protobufjs/fetch",
   "description": "Fetches the contents of a file accross node and browsers.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Daniel Wirtz <[email protected]>",
   "repository": {
     "type": "git",

diff --git a/lib/fetch/tests/data/file.txt b/lib/fetch/tests/data/file.txt
@@ -0,0 +1 @@
+file.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ language: node_js @@
     node_js:
       - 0.12
       - 4
+      - 4.3.2
       - 6
       - 7
     env: CXX=g++-4.8
@@ Expand Down @@