Skip to content
This repository has been archived by the owner on Aug 4, 2021. It is now read-only.

Commit

Permalink
Merge branch 'real-ast'
Browse files Browse the repository at this point in the history
  • Loading branch information
lukastaegert committed May 11, 2018
2 parents 50db997 + 82ed3f2 commit 6fbcf89
Show file tree
Hide file tree
Showing 20 changed files with 3,854 additions and 1,413 deletions.
3 changes: 3 additions & 0 deletions .eslintrc
Expand Up @@ -3,8 +3,11 @@
"rules": {
"indent": [ 2, "tab", { "SwitchCase": 1 } ],
"semi": [ 2, "always" ],
"quotes": [ 2, "single" ],
"linebreak-style": [ 2, "unix" ],
"keyword-spacing": [ 2, { "before": true, "after": true } ],
"space-before-blocks": [ 2, "always" ],
"space-before-function-paren": [ 2, "always" ],
"no-mixed-spaces-and-tabs": [ 2, "smart-tabs" ],
"no-cond-assign": 0,
"no-unused-vars": 2,
Expand Down
10 changes: 10 additions & 0 deletions .lintstagedrc
@@ -0,0 +1,10 @@
{
"src/**/*.js": [
"eslint --fix",
"git add"
],
"test/test.js": [
"eslint --fix",
"git add"
]
}
13 changes: 11 additions & 2 deletions .travis.yml
@@ -1,4 +1,13 @@
sudo: false
language: node_js
node_js:
- "4.0"
- "stable"
- "4"
- "6"
- "8"
- "10"
env:
global:
- BUILD_TIMEOUT=10000
install: npm install --ignore-scripts
before_install:
- if [[ $TRAVIS_NODE_VERSION -lt 7 ]]; then npm install --global npm@4; fi
22 changes: 13 additions & 9 deletions CHANGELOG.md
@@ -1,43 +1,47 @@
# rollup-plugin-json changelog

## 3.0.0
*2018-05-11*
* No longer create a fake AST to support tree-shaking with upcoming versions of rollup ([#41](https://github.com/rollup/rollup-plugin-json/issues/41))

## 2.3.1
*2018-05-11*
* Update example in readme ([#38](https://github.com/rollup/rollup-plugin-json/issues/38))
* Warn when using this version with upcoming rollup versions

## 2.3.0

*2017-06-03*
* Always parse JSON, so malformed JSON is identified at bundle time ([#27](https://github.com/rollup/rollup-plugin-json/issues/27))

## 2.2.0

*2017-06-03*
* Add `indent` option ([#24](https://github.com/rollup/rollup-plugin-json/issues/24))

## 2.1.1

*2017-04-09*
* Add license to package.json ([#25](https://github.com/rollup/rollup-plugin-json/pull/25))

## 2.1.0

*2016-12-15*
* Add support for `preferConst` option ([#16](https://github.com/rollup/rollup-plugin-json/pull/16))
* Handle JSON files with no valid identifier keys ([#19](https://github.com/rollup/rollup-plugin-json/issues/19))

## 2.0.2

*2016-09-07*
* Generate correct fake AST

## 2.0.1

*2016-06-23*
* Return a `name`

## 2.0.0

*2015-11-05*
* Generate fake AST to avoid unnecessary traversals within Rollup

## 1.1.0

*unpublished*
* Generate named exports alongside default exports

## 1.0.0

*2015-10-25*
* First release

0 comments on commit 6fbcf89

Please sign in to comment.