Skip to content

Commit 5007fb6

Browse files
committed
Merge pull request #8 from garyb/update-halogen
Update Halogen & build
2 parents 64ab32c + d75ebf2 commit 5007fb6

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

.travis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
language: node_js
2-
node_js:
3-
- 5
2+
dist: trusty
3+
sudo: required
4+
node_js: 5
45
install:
5-
- npm install bower -g
66
- npm install
7+
- npm install -g bower
8+
- bower install
79
script:
8-
- npm test
10+
- npm run build
911
after_success:
1012
- >-
1113
test $TRAVIS_TAG &&
12-
./node_modules/.bin/psc-publish > .pursuit.json &&
14+
node_modules/.bin/psc-publish > .pursuit.json &&
1315
curl -X POST http://pursuit.purescript.org/packages \
1416
-d @.pursuit.json \
1517
-H 'Accept: application/json' \

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"test"
2121
],
2222
"dependencies": {
23-
"purescript-css": "^0.5.2",
24-
"purescript-halogen": "^0.5.3"
23+
"purescript-css": "^0.6.0",
24+
"purescript-halogen": "^0.6.1"
2525
}
2626
}

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"private": true,
33
"scripts": {
4-
"postinstall": "pulp dep install",
5-
"test": "pulp build"
4+
"clean": "rimraf output && rimraf .pulp-cache",
5+
"build": "pulp build"
66
},
77
"devDependencies": {
8-
"pulp": "^6.0.0",
9-
"purescript": "^0.7.6"
8+
"pulp": "^8.1.0",
9+
"purescript": "^0.7.6",
10+
"rimraf": "^2.5.2"
1011
}
1112
}

src/Halogen/HTML/CSS.purs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import Data.Either (Either(), either)
1212
import Data.List (fromList, toList)
1313
import Data.Maybe (Maybe(..), fromMaybe)
1414
import Data.String (joinWith)
15+
import Data.StrMap as SM
1516
import Data.Tuple (Tuple(..))
16-
import qualified Data.StrMap as SM
1717

1818
import CSS.Property (Key(), Value())
1919
import CSS.Render (render, renderedSheet, collect)
2020
import CSS.Stylesheet (CSS(), Rule(..), runS)
2121

22+
import Halogen.HTML as H
2223
import Halogen.HTML.Core (HTML(), Prop(), IsProp, prop, propName, attrName)
23-
import qualified Halogen.HTML as H
24-
import qualified Halogen.HTML.Properties as P
24+
import Halogen.HTML.Properties as P
2525

2626
-- | A newtype for CSS styles
2727
newtype Styles = Styles (SM.StrMap String)

src/Halogen/HTML/CSS/Indexed.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import CSS.Stylesheet (CSS())
66

77
import Halogen.HTML.Elements.Indexed (NoninteractiveNode())
88
import Halogen.HTML.Properties.Indexed (IProp(), I())
9-
import qualified Halogen.HTML.CSS as CSS
9+
import Halogen.HTML.CSS as CSS
1010

1111
style :: forall i r. CSS -> IProp (style :: I | r) i
1212
style = unsafeCoerce CSS.style

0 commit comments

Comments
 (0)