Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.3.15 with Rollup support, fix parsers #33

Merged
merged 8 commits into from Dec 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions .eslintignore
@@ -1,6 +1,7 @@
coverage/
dist/**
**/test/**
!**/test/*.js
!**/test/server-specs/*.js
!**/test/server-specs/parsers/*.js
test/**
!test/*.js
!test/server-specs/*.js
!test/server-specs/parsers/*.js
lib/_es6.js
5 changes: 4 additions & 1 deletion CHANGELOG.md
@@ -1,7 +1,10 @@
# Compiler Changes

## v2.3.15
- Correction for fix [riot#1120](https://github.com/riot/riot/issues/1120), `tmpl` can parse double-quotes within expressions, encoding the quotes generates issues.

- Added dist/es6.compiler.js which uses es6 exports.
- Update devDependencies, including jspreproc v0.2.5 with an important fix.
- Partial regression of fix [riot#1120](https://github.com/riot/riot/issues/1120), `tmpl` can parse double-quotes within expressions, encoding double-quotes generates issues.

## v2.3.14

Expand Down
8 changes: 5 additions & 3 deletions Makefile
Expand Up @@ -2,7 +2,8 @@
#JSPP_DEBUG = -D DEBUG
JSPP_FLAGS = -F istanbul -F eslint --custom-filter "\s@(module|version)\b" --headers ""
JSPP_RIOT_FLAGS = $(JSPP_FLAGS) -D RIOT
JSPP_NODE_FLAGS = $(JSPP_FLAGS) -D NODE --indent 2
JSPP_NODE_FLAGS = $(JSPP_FLAGS) -D NODE
JSPP_ES6_FLAGS = $(JSPP_FLAGS)

# Code Climate only accepts the first job of default branch
TESTCOVER = $(TRAVIS_BRANCH) $(TRAVIS_NODE_VERSION)
Expand All @@ -29,8 +30,9 @@ test: build test-mocha
build: eslint
# rebuild all
@ mkdir -p $(DIST)
@ $(JSPP) $(JSPP_RIOT_FLAGS) lib/index.js > $(DIST)riot.compiler.js
@ $(JSPP) $(JSPP_NODE_FLAGS) lib/index.js > $(DIST)compiler.js
@ $(JSPP) $(JSPP_RIOT_FLAGS) lib/_riot.js > $(DIST)riot.compiler.js
@ $(JSPP) $(JSPP_NODE_FLAGS) lib/_node.js > $(DIST)compiler.js
@ $(JSPP) $(JSPP_ES6_FLAGS) lib/_es6.js > $(DIST)es6.compiler.js

bump:
# Bump a new release
Expand Down