Skip to content

Commit

Permalink
v2.3.0-beta.2
Browse files Browse the repository at this point in the history
  • Loading branch information
aMarCruz committed Oct 19, 2015
1 parent bf6faa4 commit 9b0be50
Show file tree
Hide file tree
Showing 50 changed files with 2,216 additions and 1,251 deletions.
7 changes: 4 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ env:
###########################################################################

browser: true
node: true
es6: false

ecmaFeatures:
modules: true
modules: false

globals:

Expand Down Expand Up @@ -75,13 +76,13 @@ rules:
###########################################################################

block-scoped-var: 0 # treat var statements as if they were block scoped
complexity: [1, 250] # specify the maximum cyclomatic complexity allowed in a program
complexity: [1, 10] # specify the maximum cyclomatic complexity allowed in a program
consistent-return: 0 # require return statements to either always or never specify values
curly: 0 # specify curly brace conventions for all control
# statements
default-case: 2 # require default case in switch statements
dot-notation: 1 # encourages use of dot notation whenever possible
eqeqeq: 0 # require the use of === and !==
eqeqeq: [2, "smart"] # require the use of === and !==
guard-for-in: 1 # make sure for-in loops have an if statement
no-alert: 2 # disallow the use of alert, confirm, and prompt
no-caller: 2 # disallow use of arguments.caller or arguments.callee
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ branches:
- dev

before_install:
npm install coffee-script && npm install babel-core && npm install livescript && npm install jade && npm install stylus && npm install nib && npm install
npm install coffee-script && npm install babel-core && npm install livescript && npm install typescript-simple && npm install jade && npm install stylus && npm install nib && npm install

after_success:
make test-coveralls
Expand Down
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# jspp flags
#JSPP_FLAGS = "-D DEBUG"
JSPP_FLAGS =
JSPP_FLAGS = -F istanbul --custom-filter "@module\b"
JSPP_RIOT_FLAGS = $(JSPP_FLAGS) -D RIOT
JSPP_NODE_FLAGS = $(JSPP_FLAGS) -D NODE --indent 2s

# Command line paths
ISTANBUL = ./node_modules/.bin/istanbul
ESLINT = ./node_modules/eslint/bin/eslint.js
MOCHA = ./node_modules/mocha/bin/_mocha
COVERALLS = ./node_modules/coveralls/bin/coveralls.js
JSPP = ./node_modules/.bin/jspp $(JSPP_FLAGS)
JSPP = ./node_modules/jspreproc/bin/jspp.js

# folders
DIST = "./dist/"
Expand All @@ -19,8 +20,8 @@ test: build
build: eslint
# rebuild all
@ mkdir -p $(DIST)
@ $(JSPP) lib/index.js > $(DIST)riot.compiler.js
@ $(JSPP) lib/index.js -D RIOT_CLI > $(DIST)compiler.js
@ $(JSPP) $(JSPP_RIOT_FLAGS) lib/index.js > $(DIST)riot.compiler.js
@ $(JSPP) $(JSPP_NODE_FLAGS) lib/index.js > $(DIST)compiler.js

eslint:
# check code style
Expand Down

0 comments on commit 9b0be50

Please sign in to comment.