Skip to content

Commit 0fca9b2

Browse files
committed
Update for PureScript 0.11
1 parent 2098736 commit 0fca9b2

File tree

9 files changed

+43
-56
lines changed

9 files changed

+43
-56
lines changed

.eslintrc.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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],
25+
"quotes": [2, "double"],
26+
"semi": [2, "always"]
27+
}
28+
}

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js: 6
4+
node_js: stable
55
env:
66
- PATH=$HOME/purescript:$PATH
77
install:

bower.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
"package.json"
1717
],
1818
"dependencies": {
19-
"purescript-enums": "^2.0.0",
20-
"purescript-functions": "^2.0.0",
21-
"purescript-generics": "^3.0.0",
22-
"purescript-integers": "^2.0.0",
19+
"purescript-enums": "^3.0.0",
20+
"purescript-functions": "^3.0.0",
21+
"purescript-generics": "^4.0.0",
22+
"purescript-integers": "^3.0.0",
2323
"purescript-math": "^2.0.0"
2424
},
2525
"devDependencies": {
26-
"purescript-assert": "^2.0.0",
27-
"purescript-console": "^2.0.0"
26+
"purescript-assert": "^3.0.0",
27+
"purescript-console": "^3.0.0"
2828
}
2929
}

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
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.8.0",
10-
"jshint": "^2.9.1",
11-
"pulp": "^9.0.0",
12-
"purescript-psa": "^0.3.8",
13-
"rimraf": "^2.5.0"
9+
"eslint": "^3.17.1",
10+
"pulp": "^10.0.4",
11+
"purescript-psa": "^0.5.0-rc.1",
12+
"rimraf": "^2.6.1"
1413
}
1514
}

src/Data/DateTime/Instant.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ exports.fromDateTimeImpl = function (y, mo, d, h, mi, s, ms) {
77
exports.toDateTimeImpl = function (ctor) {
88
return function (instant) {
99
var dt = new Date(instant);
10-
return ctor
11-
(dt.getUTCFullYear())(dt.getUTCMonth() + 1)(dt.getUTCDate())
12-
(dt.getUTCHours())(dt.getUTCMinutes())(dt.getUTCSeconds())
13-
(dt.getUTCMilliseconds());
10+
return ctor (dt.getUTCFullYear())(dt.getUTCMonth() + 1)(dt.getUTCDate())(dt.getUTCHours())(dt.getUTCMinutes())(dt.getUTCSeconds())(dt.getUTCMilliseconds());
1411
};
1512
};

src/Data/Time/Duration.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Duration a where
7676
toDuration :: Milliseconds -> a
7777

7878
-- | Converts directly between durations of differing types.
79-
convertDuration :: forall a b. (Duration a, Duration b) => a -> b
79+
convertDuration :: forall a b. Duration a => Duration b => a -> b
8080
convertDuration = toDuration <<< fromDuration
8181

8282
instance durationMilliseconds :: Duration Milliseconds where

0 commit comments

Comments
 (0)