Skip to content

Commit

Permalink
Merge branch 'yarn-fixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
clayzermk1 committed May 22, 2018
2 parents 2127026 + efa391d commit 369c79d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
language: node_js
node_js:
- '6'
- '7'
- '8'
- '9'
- '10'
after_script:
- npm run coverage && npm run codecov
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.3.1
- Fixed package.json node engine version to permit newer versions of node for `yarn` users (https://github.com/clayzermk1/node-marshal/commit/4f89c88d6e91bcad54f1e008ce2cf108c18f3598#commitcomment-29083094). Thank you @xzyfer!
- Added node versions 7, 9, and 10 to Travis.

# 0.3.0
- Added support for floats (#8). Thank you @tgriesser!
- Added support for ISO-8859-1 encoded strings (#8, parsed as "binary"). Thank you @tgriesser!
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "marshal",
"version": "0.3.0",
"version": "0.3.1",
"description": "Parse Ruby's Marshal strings into JavaScript objects/JSON.",
"main": "index.js",
"scripts": {
Expand All @@ -25,7 +25,7 @@
},
"homepage": "https://github.com/clayzermk1/node-marshal",
"engines": {
"node": "^6.11.5"
"node": ">=6.11.5"
},
"dependencies": {
"debug": "3.1.0"
Expand Down

0 comments on commit 369c79d

Please sign in to comment.