Skip to content

Commit

Permalink
Other: Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dcodeIO committed May 16, 2018
1 parent a063171 commit 1a522f7
Show file tree
Hide file tree
Showing 20 changed files with 4,107 additions and 2,220 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ node_js:
- 4.3.2
- 6
- 8
- 10
branches:
only: master
script: npm test && npm run bench
Expand Down
2 changes: 1 addition & 1 deletion cli/targets/proto.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function escape(str) {
return str.replace(/[\\"']/g, "\\$&")
.replace(/\r/g, "\\r")
.replace(/\n/g, "\\n")
.replace(/\u0000/g, "\\0");
.replace(/\u0000/g, "\\0"); // eslint-disable-line no-control-regex
}

function value(v) {
Expand Down
2 changes: 1 addition & 1 deletion config/eslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"no-undefined": 0, // produces shorter code when testing against this
"no-use-before-define": 0, // can actually be used for a better overview, i.e. with module.exports
"no-unused-vars": 1, // a warning is sufficient

// Node.js and CommonJS
"callback-return": 1,
"global-require": 0, // only way to resolve cyclic references
Expand Down
8 changes: 3 additions & 5 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.

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

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions 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.js.map

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

8 changes: 3 additions & 5 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.

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

Large diffs are not rendered by default.

Loading

3 comments on commit 1a522f7

@SlyryD
Copy link
Contributor

@SlyryD SlyryD commented on 1a522f7 May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New uglify-js causes big issues in beautifyCode:

UglifyJS.minify(code, ...).code turns the following into undefined

"function ConfigTicket(p) { if (p) for (var ks = Object.keys(p), i = 0; i < ks.length; ++i) if (p[ks[i]] != null) this[ks[i]] = p[ks[i]]; }"

@dcodeIO
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems the fromString option has been removed in uglifyjs3 and causes an error. Removing it worked for me with the snippet you provided. Can you confirm?

@SlyryD
Copy link
Contributor

@SlyryD SlyryD commented on 1a522f7 May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it works without the fromString option. Thanks!

Please sign in to comment.