Skip to content

Commit

Permalink
Merge pull request #25 from garyb/ps-0.11
Browse files Browse the repository at this point in the history
Update for PureScript 0.11
  • Loading branch information
garyb authored Apr 21, 2017
2 parents e5d01eb + bcaaeb3 commit 691982f
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 53 deletions.
28 changes: 28 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parserOptions": {
"ecmaVersion": 5
},
"extends": "eslint:recommended",
"env": {
"commonjs": true
},
"rules": {
"strict": [2, "global"],
"block-scoped-var": 2,
"consistent-return": 2,
"eqeqeq": [2, "smart"],
"guard-for-in": 2,
"no-caller": 2,
"no-extend-native": 2,
"no-loop-func": 2,
"no-new": 2,
"no-param-reassign": 2,
"no-return-assign": 2,
"no-unused-expressions": 2,
"no-use-before-define": 2,
"radix": [2, "always"],
"indent": [2, 2],
"quotes": [2, "double"],
"semi": [2, "always"]
}
}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/.*
!/.gitignore
!/.jscsrc
!/.jshintrc
!/.eslintrc.json
!/.travis.yml
bower_components/
node_modules/
Expand Down
17 changes: 0 additions & 17 deletions .jscsrc

This file was deleted.

20 changes: 0 additions & 20 deletions .jshintrc

This file was deleted.

10 changes: 5 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"package.json"
],
"dependencies": {
"purescript-ace": "^3.0.0",
"purescript-halogen": "^1.0.0",
"purescript-now": "^2.0.0",
"purescript-random": "^2.0.0",
"purescript-refs": "^2.0.0"
"purescript-ace": "^4.0.0",
"purescript-halogen": "^2.0.0",
"purescript-now": "^3.0.0",
"purescript-random": "^3.0.0",
"purescript-refs": "^3.0.0"
}
}
2 changes: 1 addition & 1 deletion example/src/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ ui =
initEditor state editor = liftEff $ do
session ← Editor.getSession editor
Session.setMode "ace/mode/yaml" session
Editor.setValue state.text Nothing editor
_ ← Editor.setValue state.text Nothing editor
pure unit

eval Query ~> MainDSL
Expand Down
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
"private": true,
"scripts": {
"clean": "rimraf output && rimraf .pulp-cache",
"build": "jshint src && jscs src && pulp build -- --censor-lib --strict",
"example": "bower link && cd example && bower link purescript-ace-halogen && npm i --production && npm run -s build"
"build": "eslint src && pulp build -- --censor-lib --strict",
"example": "bower link && cd example && bower link purescript-ace-halogen && npm run -s build"
},
"devDependencies": {
"jscs": "^3.0.7",
"jshint": "^2.9.4",
"pulp": "^10.0.0",
"purescript": "^0.10.5",
"purescript-psa": "^0.4.0",
"rimraf": "^2.5.4"
"eslint": "^3.19.0",
"pulp": "^11.0.0",
"purescript": "^0.11.4",
"purescript-psa": "^0.5.1",
"rimraf": "^2.6.1"
}
}

0 comments on commit 691982f

Please sign in to comment.