Skip to content

Commit 1aadf04

Browse files
authored
Merge pull request #4 from purescript-contrib/update-build
Update build
2 parents 18b871c + b967ae6 commit 1aadf04

File tree

6 files changed

+41
-50
lines changed

6 files changed

+41
-50
lines changed

.eslintrc.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parserOptions": {
3+
"ecmaVersion": 5
4+
},
5+
"extends": "eslint:recommended",
6+
"env": {
7+
"commonjs": true
8+
},
9+
"rules": {
10+
"strict": [2, "global"],
11+
"block-scoped-var": 2,
12+
"consistent-return": 2,
13+
"eqeqeq": [2, "smart"],
14+
"guard-for-in": 2,
15+
"no-caller": 2,
16+
"no-extend-native": 2,
17+
"no-loop-func": 2,
18+
"no-new": 2,
19+
"no-param-reassign": 2,
20+
"no-return-assign": 2,
21+
"no-unused-expressions": 2,
22+
"no-use-before-define": 2,
23+
"radix": [2, "always"],
24+
"indent": [2, 2, { "SwitchCase": 1 }],
25+
"quotes": [2, "double"],
26+
"semi": [2, "always"]
27+
},
28+
"globals": {
29+
"setTimeout": true,
30+
"clearTimeout": true,
31+
"setInterval": true,
32+
"clearInterval": true
33+
}
34+
}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/.*
22
!/.gitignore
3-
!/.jscsrc
4-
!/.jshintrc
3+
!/.eslintrc.json
54
!/.travis.yml
65
/bower_components/
76
/node_modules/

.jscsrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 19 deletions
This file was deleted.

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js: 6
5-
env:
6-
- PATH=$HOME/purescript:$PATH
4+
node_js: stable
75
install:
8-
- TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
9-
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
10-
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
11-
- chmod a+x $HOME/purescript
126
- npm install -g bower
137
- npm install
14-
script:
158
- bower install --production
9+
script:
1610
- npm run -s build
1711
- bower install
18-
- npm run -s test
12+
- npm -s test
1913
after_success:
2014
- >-
2115
test $TRAVIS_TAG &&

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "jshint src && jscs src && pulp build -- --censor-lib --strict",
5+
"build": "eslint src && pulp build -- --censor-lib --strict",
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"jscs": "^2.11.0",
10-
"jshint": "^2.9.4",
9+
"eslint": "^3.19.0",
1110
"pulp": "^11.0.0",
1211
"purescript-psa": "^0.5.0",
12+
"purescript": "^0.11.1",
1313
"rimraf": "^2.6.1"
1414
}
1515
}

0 commit comments

Comments
 (0)