Skip to content

Commit

Permalink
v5.1.0. CoffeeScript v2 only for compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Jan 25, 2018
1 parent 0534926 commit dca58b0
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 89 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# History

## v5.1.0 2018 January 25
- Revert CSON's use of CoffeeScript v2, as it [broke support for Node 4 and below](https://travis-ci.org/bevry/cson/builds/333130290)
- Use of CoffeeScript v2 is now limited to compilation of this project only

## v5.0.0 2018 January 25
- Now uses CoffeeScript v2
- Now uses [editions](https://github.com/bevry/editions) to use the ESNext compiled edition for environments that support it, otherwise use the ES2015 compiled edition
Expand Down
145 changes: 61 additions & 84 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "CSON",
"name": "cson",
"version": "5.0.0",
"version": "5.1.0",
"description": "CoffeeScript-Object-Notation Parser. Same as JSON but for CoffeeScript objects.",
"homepage": "https://github.com/bevry/cson",
"license": "MIT",
Expand Down Expand Up @@ -107,7 +107,7 @@
},
"main": "index.js",
"dependencies": {
"coffeescript": "^2.1.1",
"coffee-script": "^1.12.7",
"cson-parser": "^1.3.4",
"editions": "^1.3.3",
"extract-opts": "^3.3.1",
Expand All @@ -119,6 +119,7 @@
"babel-core": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"biscotto": "emmenko/biscotto#v2.4.0",
"coffeescript": "^2.1.1",
"coffeelint": "^2.0.7",
"joe": "^2.0.2",
"joe-reporter-console": "^2.0.1",
Expand Down
6 changes: 3 additions & 3 deletions source/index.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ class CSON
# Public: Parses a CoffeeScript {String} into an {Object}
#
# data - The CoffeeScript {String} to parse
# opts - {Object} The options, forwarded onto `require('coffeescript').eval`
# opts - {Object} The options, forwarded onto `require('coffee-script').eval`
#
# Returns {Object} or {Error}
parseCSString: (data, opts, next) ->
Expand All @@ -389,7 +389,7 @@ class CSON

# Parse
try
result = require('coffeescript').eval(data, opts)
result = require('coffee-script').eval(data, opts)
catch err
result = @ensureErrorType(err)

Expand Down Expand Up @@ -537,7 +537,7 @@ class CSON
[opts, next] = extractOptsAndCallback(opts, next)

# Require
require('coffeescript/register')
require('coffee-script/register')
try
result = requireFresh(file)
catch err
Expand Down

0 comments on commit dca58b0

Please sign in to comment.