Merge pull request #17 from garyb/0.9-updates

garyb · web-flow · commit d4c2081e814b · 2016-07-22T11:58:33.000+01:00
Update for PureScript 0.9
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
 /.*
 !/.gitignore
+!/.jscsrc
+!/.jshintrc
 !/.travis.yml
 bower_components/
 node_modules/
 output/
-/example/example.js
+example/example.js
+example/.*
diff --git a/.jscsrc b/.jscsrc
@@ -0,0 +1,17 @@
+{
+  "preset": "grunt",
+  "disallowSpacesInFunctionExpression": null,
+  "requireSpacesInFunctionExpression": {
+    "beforeOpeningRoundBrace": true,
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInAnonymousFunctionExpression": null,
+  "requireSpacesInAnonymousFunctionExpression": {
+    "beforeOpeningRoundBrace": true,
+    "beforeOpeningCurlyBrace": true
+  },
+  "disallowSpacesInsideObjectBrackets": null,
+  "requireSpacesInsideObjectBrackets": "all",
+  "validateQuoteMarks": "\"",
+  "requireCurlyBraces": null
+}
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,20 @@
+{
+  "bitwise": true,
+  "eqeqeq": true,
+  "forin": true,
+  "freeze": true,
+  "funcscope": true,
+  "futurehostile": true,
+  "strict": "global",
+  "latedef": true,
+  "maxparams": 1,
+  "noarg": true,
+  "nocomma": true,
+  "nonew": true,
+  "notypeof": true,
+  "singleGroups": true,
+  "undef": true,
+  "unused": true,
+  "eqnull": true,
+  "predef": ["exports"]
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,14 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 5
+node_js: 6
 install:
-  - npm install
   - npm install -g bower
+  - npm install
   - bower install
 script:
-  - npm run example
+  - npm run -s build
+  - npm run -s example
 after_success:
 - >-
   test $TRAVIS_TAG &&
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/slamdata/purescript-ace-halogen.svg?branch=master)](https://travis-ci.org/slamdata/purescript-ace-halogen)
 [![Dependency Status](https://www.versioneye.com/user/projects/563a1eda1d47d4001500088b/badge.svg?style=flat)](https://www.versioneye.com/user/projects/563a1eda1d47d4001500088b)
 
-A [Halogen](https://github.com/slamdata/purescript-halogen) component for the Ace editor.
+[Halogen](https://github.com/slamdata/purescript-halogen) component for the [Ace editor](https://ace.c9.io).
 
 ## Installation
 
diff --git a/bower.json b/bower.json
@@ -5,7 +5,7 @@
     "Gary Burgess <gary.burgess@gmail.com>",
     "Maxim Zimaliev <zimaliev@gmail.com>"
   ],
-  "description": "A Halogen component for the Ace editor",
+  "description": "Halogen component for the Ace editor",
   "keywords": [
     "purescript",
     "halogen",
@@ -18,15 +18,19 @@
   "license": "Apache-2.0",
   "ignore": [
     "**/.*",
-    "node_modules",
     "bower_components",
-    "test"
+    "node_modules",
+    "example",
+    "output",
+    "test",
+    "bower.json",
+    "package.json"
   ],
   "dependencies": {
-    "purescript-ace": "^0.11.0",
-    "purescript-datetime": "^0.9.1",
-    "purescript-halogen": "^0.8.0",
-    "purescript-random": "^0.2.3",
-    "purescript-refs": "^0.2.0"
+    "purescript-ace": "^1.0.0",
+    "purescript-halogen": "^0.9.0",
+    "purescript-now": "^1.0.0",
+    "purescript-random": "^1.0.0",
+    "purescript-refs": "^1.0.0"
   }
 }
diff --git a/example/package.json b/example/package.json
@@ -8,8 +8,8 @@
     "virtual-dom": "^2.1.1"
   },
   "devDependencies": {
-    "pulp": "^8.1.0",
-    "purescript": "^0.7.6",
+    "pulp": "^9.0.1",
+    "purescript": "^0.9.1",
     "rimraf": "^2.5.2"
   }
 }
diff --git a/example/src/Main.purs b/example/src/Main.purs
@@ -2,26 +2,24 @@ module Main where
 
 import Prelude
 
-import Control.Bind ((=<<))
-import Control.Monad.Aff (Aff())
-import Control.Monad.Eff (Eff())
+import Control.Monad.Aff (Aff)
+import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Class (liftEff)
-import Control.Monad.Eff.Random (RANDOM())
-import Control.Monad.Eff.Ref (REF())
+import Control.Monad.Eff.Random (RANDOM)
+import Control.Monad.Eff.Ref (REF)
+import Control.Monad.Eff.Now (NOW)
 
-import Data.Date (Now())
-import Data.Functor.Coproduct (Coproduct())
+import Data.Functor.Coproduct (Coproduct)
 import Data.Maybe (Maybe (..), fromMaybe)
-import Data.NaturalTransformation (Natural())
 
 import Halogen as H
 import Halogen.HTML.Indexed as HH
 import Halogen.Util (runHalogenAff, awaitBody)
 
 import Ace.Editor as Editor
 import Ace.EditSession as Session
-import Ace.Halogen.Component (AceState(), AceQuery (TextChanged, GetText), aceConstructor)
-import Ace.Types (ACE(), Editor())
+import Ace.Halogen.Component (AceState, AceQuery (TextChanged, GetText), aceConstructor)
+import Ace.Types (ACE, Editor)
 
 data Query a
   = UpdateText a
@@ -40,7 +38,7 @@ type AceSlot = Unit
 type StateP g = H.ParentState State AceState Query AceQuery g AceSlot
 type QueryP = Coproduct Query (H.ChildF AceSlot AceQuery)
 type MainHtml g = H.ParentHTML AceState Query AceQuery g AceSlot
-type MainEffects = H.HalogenEffects (random :: RANDOM, now :: Now, ref :: REF, ace :: ACE)
+type MainEffects = H.HalogenEffects (random :: RANDOM, now :: NOW, ref :: REF, ace :: ACE)
 type MainAff = Aff MainEffects
 type MainDSL = H.ParentDSL State AceState Query AceQuery MainAff AceSlot
 
@@ -62,7 +60,7 @@ ui = H.parentComponent { render, eval, peek: Just (peek <<< H.runChildF) }
     Editor.setValue state.text Nothing editor
     pure unit
 
-  eval :: Natural Query MainDSL
+  eval :: Query ~> MainDSL
   eval (UpdateText next) =
     pure next
 
diff --git a/package.json b/package.json
@@ -2,16 +2,15 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "pulp build --censor-lib --strict",
-    "example": "bower link && cd example && bower link purescript-ace-halogen && npm run build"
-  },
-  "dependencies": {
-    "virtual-dom": "^2.1.1"
+    "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"
   },
   "devDependencies": {
-    "pulp": "^8.2.0",
-    "purescript-psa": "^0.3.8",
-    "purescript": "^0.8.5",
-    "rimraf": "^2.5.2"
+    "jscs": "^2.8.0",
+    "jshint": "^2.9.1",
+    "pulp": "^9.0.1",
+    "purescript": "^0.9.1",
+    "purescript-psa": "^0.3.9",
+    "rimraf": "^2.5.0"
   }
 }
diff --git a/src/Ace/Halogen/Component.js b/src/Ace/Halogen/Component.js
@@ -1,13 +1,13 @@
-// module Ace.Halogen.Component
+"use strict";
 
-exports.completeFns = {value: {}};
+exports.completeFns = { value: {} };
 
-exports.initialized = {value: false};
+exports.initialized = { value: false };
 
-exports.focused = {value: ""};
+exports.focused = { value: "" };
 
-exports.dataset = function(node) {
-    return function() {
-        return node.dataset;
-    };
+exports.dataset = function (node) {
+  return function () {
+    return node.dataset;
+  };
 };
diff --git a/src/Ace/Halogen/Component.purs b/src/Ace/Halogen/Component.purs

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`"virtual-dom": "^2.1.1"`
`9`	`9`	`},`
`10`	`10`	`"devDependencies": {`
`11`		`- "pulp": "^8.1.0",`
`12`		`- "purescript": "^0.7.6",`
	`11`	`+ "pulp": "^9.0.1",`
	`12`	`+ "purescript": "^0.9.1",`
`13`	`13`	`"rimraf": "^2.5.2"`
`14`	`14`	`}`
`15`	`15`	`}`