Skip to content
This repository was archived by the owner on Oct 4, 2020. It is now read-only.

Commit fab73c7

Browse files
authored
Merge pull request #17 from purescript/ps-0.11
Update for PureScript 0.11
2 parents f72d54d + 254502e commit fab73c7

File tree

8 files changed

+50
-49
lines changed

8 files changed

+50
-49
lines changed

.eslintrc.json

+28
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, { "SwitchCase": 1 }],
25+
"quotes": [2, "double"],
26+
"semi": [2, "always"]
27+
}
28+
}

.gitignore

+1-2
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

-17
This file was deleted.

.jshintrc

-20
This file was deleted.

.travis.yml

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"package.json"
1818
],
1919
"dependencies": {
20-
"purescript-prelude": "^2.1.0"
20+
"purescript-prelude": "^3.0.0"
2121
}
2222
}

package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
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
},
77
"devDependencies": {
8-
"jscs": "^2.8.0",
9-
"jshint": "^2.9.1",
10-
"pulp": "^9.0.1",
11-
"purescript-psa": "^0.3.9",
12-
"rimraf": "^2.5.0"
8+
"eslint": "^3.17.1",
9+
"pulp": "^10.0.4",
10+
"purescript-psa": "^0.5.0-rc.1",
11+
"rimraf": "^2.6.1"
1312
}
1413
}

src/Control/Monad/Eff.purs

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module Control.Monad.Eff
2-
( Eff
2+
( kind Effect
3+
, Eff
34
, Pure
45
, runPure
56
, untilE, whileE, forE, foreachE
@@ -13,6 +14,17 @@ import Control.Monad (class Monad, ap)
1314
import Data.Functor (class Functor)
1415
import Data.Unit (Unit)
1516

17+
-- | The kind of all effect types.
18+
-- |
19+
-- | Declare new effect types using `foreign data` declarations, as follows:
20+
-- |
21+
-- | ```purescript
22+
-- | import Control.Monad.Eff (kind Effect)
23+
-- |
24+
-- | foreign import data MyEffect :: Effect
25+
-- | ```
26+
foreign import kind Effect
27+
1628
-- | The `Eff` type constructor is used to represent _native_ effects.
1729
-- |
1830
-- | See [Handling Native Effects with the Eff Monad](http://www.purescript.org/learn/eff/)
@@ -21,7 +33,7 @@ import Data.Unit (Unit)
2133
-- | The first type parameter is a row of effects which represents the contexts
2234
-- | in which a computation can be run, and the second type parameter is the
2335
-- | return type.
24-
foreign import data Eff :: # ! -> * -> *
36+
foreign import data Eff :: # Effect -> Type -> Type
2537

2638
instance functorEff :: Functor (Eff e) where
2739
map = liftA1

0 commit comments

Comments
 (0)