Skip to content

Commit 6440f95

Browse files
committed
Compatibility with stock Android 4.0, trying sauce again with ngrok
1 parent 9a762e4 commit 6440f95

File tree

10 files changed

+33
-18
lines changed

10 files changed

+33
-18
lines changed

.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ node_js:
55
- 4
66
- 6
77
- 7
8+
9+
branches:
10+
only:
11+
- master
12+
13+
matrix:
14+
include:
15+
- node_js: 6
16+
script: npm run zuul

.zuul.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ browsers:
1818
version: [8.1, 9.0, latest]
1919
scripts:
2020
- scripts/polyfill.js
21+
tunnel:
22+
type: ngrok
23+
proto: tcp

dist/protobuf.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js.gz

-1 Bytes
Binary file not shown.

dist/protobuf.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"types": "jsdoc -c jsdoc.types.json && node scripts/types.js",
3131
"lint": "eslint src",
3232
"test": "tape tests/*.js | tap-spec",
33-
"zuul": "zuul --ui tape --no-coverage --concurrency 9000 -- tests/*.js",
33+
"zuul": "zuul --ui tape --no-coverage --concurrency 1 -- tests/*.js",
34+
"zuul-local": "zuul --ui tape --no-coverage --concurrency 1 --local 8080 --disable-tunnel -- tests/*.js",
3435
"bench": "node bench",
3536
"all": "npm run lint && npm run test && npm run build && npm run docs && npm run types && npm run bench"
3637
},
@@ -60,7 +61,9 @@
6061
"tsd-jsdoc": "dcodeIO/tsd-jsdoc",
6162
"vinyl-buffer": "^1.0.0",
6263
"vinyl-fs": "^2.4.4",
63-
"vinyl-source-stream": "^1.1.0"
64+
"vinyl-source-stream": "^1.1.0",
65+
"zuul": "^3.11.1",
66+
"zuul-ngrok": "^4.0.0"
6467
},
6568
"browser": {
6669
"process": false,

src/parse.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,10 +547,10 @@ function parse(source, root) {
547547
}
548548

549549
return {
550-
package : pkg,
551-
imports : imports,
552-
weakImports : weakImports,
553-
syntax : syntax,
554-
root : root
550+
'package' : pkg,
551+
'imports' : imports,
552+
'weakImports' : weakImports,
553+
'syntax' : syntax,
554+
'root' : root
555555
};
556556
}

src/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ util.merge = function merge(dst, src, ifNotSet) {
278278
* @returns {string} Safe accessor
279279
*/
280280
util.safeProp = function safeProp(prop) {
281-
// NOTE: While dot notation looks cleaner it doesn't seem to have a significant difference on performance.
281+
// NOTE: While dot notation looks cleaner it doesn't seem to have a significant impact on performance.
282282
// Hence, we can safe the extra bytes from providing the reserved keywords above for pre-ES5 envs.
283283
return /* /^[a-z_$][a-z0-9_$]*$/i.test(prop) && !reserved.indexOf(prop) ? "." + prop : */ "['" + prop.replace(/\\/g, "\\\\").replace(/'/g, "\\'") + "']";
284284
};

0 commit comments

Comments
 (0)