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

Commit 81038ac

Browse files
committed
Merge pull request #10 from purescript/0.8-updates
Updates for PureScript 0.8
2 parents cbacce2 + 301ab14 commit 81038ac

File tree

9 files changed

+41
-120
lines changed

9 files changed

+41
-120
lines changed

.jscsrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"preset": "grunt",
3+
"disallowSpacesInFunctionExpression": null,
4+
"requireSpacesInFunctionExpression": {
5+
"beforeOpeningRoundBrace": true,
6+
"beforeOpeningCurlyBrace": true
7+
},
38
"disallowSpacesInAnonymousFunctionExpression": null,
49
"requireSpacesInAnonymousFunctionExpression": {
510
"beforeOpeningRoundBrace": true,

.jshintrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"freeze": true,
66
"funcscope": true,
77
"futurehostile": true,
8-
"globalstrict": true,
8+
"strict": "global",
99
"latedef": true,
1010
"maxparams": 1,
1111
"noarg": true,
@@ -15,5 +15,6 @@
1515
"singleGroups": true,
1616
"undef": true,
1717
"unused": true,
18-
"eqnull": true
18+
"eqnull": true,
19+
"predef": ["exports"]
1920
}

.travis.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
language: node_js
2-
sudo: false
3-
node_js:
4-
- 0.10
2+
sudo: required
3+
dist: trusty
4+
node_js: 5
55
env:
66
- PATH=$HOME/purescript:$PATH
77
install:
88
- 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')
99
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
1010
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
1111
- chmod a+x $HOME/purescript
12+
- npm install -g bower
1213
- npm install
14+
- bower install
1315
script:
14-
- npm run build
16+
- npm test
17+
after_success:
18+
- >-
19+
test $TRAVIS_TAG &&
20+
psc-publish > .pursuit.json &&
21+
curl -X POST http://pursuit.purescript.org/packages \
22+
-d @.pursuit.json \
23+
-H 'Accept: application/json' \
24+
-H "Authorization: token ${GITHUB_TOKEN}"

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Typed definitions for standard Javascript globals.
1212
bower install purescript-globals
1313
```
1414

15-
## Module documentation
15+
## Documentation
16+
17+
Module documentation is [published on Pursuit](http://pursuit.purescript.org/packages/purescript-globals).
1618

17-
- [Global](docs/Global.md)

bower.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
"name": "purescript-globals",
33
"homepage": "https://github.com/purescript/purescript-globals",
44
"description": "Typed definitions for standard Javascript globals",
5-
"keywords": [
6-
"purescript"
7-
],
85
"license": "MIT",
96
"repository": {
107
"type": "git",
@@ -20,7 +17,7 @@
2017
"package.json"
2118
],
2219
"devDependencies": {
23-
"purescript-assert": "^0.1.0",
24-
"purescript-console": "^0.1.0"
20+
"purescript-assert": "^1.0.0-rc.1",
21+
"purescript-console": "^1.0.0-rc.1"
2522
}
2623
}

docs/Global.md

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

docs/Global/Unsafe.md

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

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"private": true,
33
"scripts": {
4-
"postinstall": "pulp dep install",
5-
"build": "jshint src && jscs src && pulp test && rimraf docs && pulp docs"
4+
"clean": "rimraf output && rimraf .pulp-cache",
5+
"build": "jshint src && jscs src && pulp build"
66
},
77
"devDependencies": {
8-
"jscs": "^1.13.1",
9-
"jshint": "^2.8.0",
10-
"pulp": "^4.0.2",
11-
"rimraf": "^2.4.1"
8+
"jscs": "^2.8.0",
9+
"jshint": "^2.9.1",
10+
"pulp": "^8.1.0",
11+
"rimraf": "^2.5.0"
1212
}
1313
}

test/Test/Main.purs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
module Test.Main where
22

3-
import Prelude
4-
import Control.Monad.Eff.Console (log)
3+
import Prelude (Unit, (==), ($), bind, not, negate, (<), (>), (/=))
4+
5+
import Control.Monad.Eff (Eff)
6+
import Control.Monad.Eff.Console (CONSOLE, log)
7+
58
import Global
6-
import Test.Assert (assert)
79

10+
import Test.Assert (ASSERT, assert)
11+
12+
main :: Eff (console :: CONSOLE, assert :: ASSERT) Unit
813
main = do
914

1015
log "nan /= nan"

0 commit comments

Comments
 (0)