Skip to content

Commit

Permalink
Other: Updated depdendencies / rebuilt dist files
Browse files Browse the repository at this point in the history
  • Loading branch information
dcodeIO committed Feb 23, 2017
1 parent 50e82fa commit 487f892
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 34 deletions.
23 changes: 13 additions & 10 deletions cli/targets/proto.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,13 @@ function proto_target(root, options, callback) {

function push(line) {
if (line === "")
return out.push("");
var ind = "";
for (var i = 0; i < indent; ++i)
ind += " ";
out.push(ind + line);
out.push("");
else {
var ind = "";
for (var i = 0; i < indent; ++i)
ind += " ";
out.push(ind + line);
}
}

function escape(str) {
Expand All @@ -84,16 +86,17 @@ function buildRoot(root) {
root.resolveAll();
var pkg = [];
var ptr = root;
var repeat = true;
do {
var nested = ptr.nestedArray;
if (nested.length === 1 && nested[0] instanceof Namespace && !(nested[0] instanceof Type || nested[0] instanceof Service)) {
ptr = nested[0];
if (ptr !== root)
pkg.push(ptr.name);
} else
break;
} while (true);
out.push('syntax = "proto' + syntax + '";');
repeat = false;
} while (repeat);
out.push("syntax = \"proto" + syntax + "\";");
if (pkg.length)
out.push("", "package " + pkg.join(".") + ";");

Expand Down Expand Up @@ -216,14 +219,14 @@ function buildFieldOptions(field) {
if (!field.options || !(keys = Object.keys(field.options)).length)
return null;
var sb = [];
Object.keys(field.options).forEach(function(key) {
keys.forEach(function(key) {
var val = field.options[key];
var wireType = types.packed[field.resolvedType instanceof Enum ? "uint32" : field.type];
switch (key) {
case "packed":
val = Boolean(val);
// skip when not packable or syntax default
if (wireType === undefined || (syntax === 3) === val)
if (wireType === undefined || syntax === 3 === val)
return;
break;
case "default":
Expand Down
8 changes: 4 additions & 4 deletions dist/light/protobuf.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/light/protobuf.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/light/protobuf.min.js

Large diffs are not rendered by default.

Binary file modified dist/light/protobuf.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/light/protobuf.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/minimal/protobuf.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/minimal/protobuf.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified dist/minimal/protobuf.min.js.gz
Binary file not shown.
8 changes: 4 additions & 4 deletions dist/protobuf.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/protobuf.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/protobuf.min.js

Large diffs are not rendered by default.

Binary file modified dist/protobuf.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/protobuf.min.js.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,23 @@
"@protobufjs/eventemitter": "^1.1.0",
"@protobufjs/fetch": "^1.1.0",
"@protobufjs/inquire": "^1.1.0",
"@protobufjs/path": "^1.1.1",
"@protobufjs/path": "^1.1.2",
"@protobufjs/pool": "^1.1.0",
"@protobufjs/utf8": "^1.1.0",
"@types/node": "7.0.4"
"@types/node": "7.0.5"
},
"optionalDependencies": {
"long": "^3.2.0",
"@types/long": "^3.0.31"
},
"devDependencies": {
"benchmark": "^2.1.3",
"browserify": "^14.0.0",
"browserify": "^14.1.0",
"browserify-wrap": "^1.0.2",
"bundle-collapser": "^1.2.1",
"chalk": "^1.1.3",
"escodegen": "^1.8.1",
"eslint": "^3.14.1",
"eslint": "^3.16.1",
"espree": "^3.1.3",
"estraverse": "^4.2.0",
"gh-pages": "^0.12.0",
Expand All @@ -75,7 +75,7 @@
"gulp": "^3.9.1",
"gulp-header": "^1.8.8",
"gulp-if": "^2.0.1",
"gulp-sourcemaps": "^2.4.0",
"gulp-sourcemaps": "^2.4.1",
"gulp-uglify": "^2.0.1",
"istanbul": "^0.4.5",
"jaguarjs-jsdoc": "dcodeIO/jaguarjs-jsdoc",
Expand All @@ -86,7 +86,7 @@
"tap-spec": "^4.1.1",
"tape": "^4.6.3",
"tmp": "0.0.31",
"typescript": "^2.2.0",
"typescript": "^2.2.1",
"uglify-js": "^2.7.5",
"vinyl-buffer": "^1.0.0",
"vinyl-fs": "^2.4.4",
Expand Down

0 comments on commit 487f892

Please sign in to comment.