Move to spago

.gitignore

@@ -1,9 +1,7 @@
 /bower_components/
 /node_modules/
-/.pulp-cache/
 /output/
 /generated-docs/
-/.psc-package/
+.psc-ide-pord
-/.psc*
+.purs-repl
-/.purs*
+/.spago
-/.psa*

.psc-ide-port

@@ -0,0 +1 @@
+15855

.purs-repl

@@ -0,0 +1 @@
+import Prelude

README.md

@@ -8,19 +8,25 @@ Basic bindings for [cheerio](https://cheerio.js.org/). Only includes read-only f
 
 Install [cheerio](https://www.npmjs.com/package/cheerio) dependency:
 
-    $ npm install --save cheerio
+```bash
+$ npm install --save cheerio
+```
 
-Install this package:
+Install this package using [spago](https://github.com/purescript/spago):
 
-* Using [bower](https://bower.io/):
+* Add package to your `spago.dhall`:
 
-      $ bower install --save purescript-cheerio
+```dhall
+...
+dependencies = [ ..., "cheerio" ]
+...
+```
 
-* Using [psc-package](https://github.com/purescript/psc-package):
+* Install packages by running:
 
-      $ psc-package install cheerio
+```bash
-
+$ spago install
-  You might need to set up a [custom package set](https://github.com/purescript/psc-package#add-a-package-to-the-package-set).
+```
 
 ## Example
 
@@ -28,29 +34,37 @@ From [basic example](examples/Basic.purs).
 
 Imports:
 
-    import Cheerio (Cheerio, find, length)
+```purescript
-    import Cheerio.Static (loadRoot)
+import Cheerio (Cheerio, find, length)
+import Cheerio.Static (loadRoot)
+```
 
 Example html:
 
-    htmlEx :: String
+```purescript
-    htmlEx = """
+htmlEx :: String
-      <ul id="fruits">
+htmlEx = """
-        <li class="apple">Apple</li>
+  <ul id="fruits">
-        <li class="orange">Orange</li>
+    <li class="apple">Apple</li>
-        <li class="pear">Pear</li>
+    <li class="orange">Orange</li>
-      </ul>
+    <li class="pear">Pear</li>
-    """
+  </ul>
+"""
+```
 
 Load it and get the root element:
 
-    root :: Cheerio
+```purescript
-    root = loadRoot htmlEx
+root :: Cheerio
+root = loadRoot htmlEx
+```
 
 Use the query functions:
 
-    let fruitCount = find "#fruits" root # length
+```purescript
-    in log $ "Number of fruits: " <> show fruitCount
+let fruitCount = root # find "#fruits" # find "li" # length
+in log $ "Number of fruits: " <> show fruitCount
+```
 
 For more examples, please take a look at the [unit tests](test/Test/Main.purs). They cover most of the read-only cheerio functions.
 

bower.json

@@ -18,13 +18,13 @@
     "test",
     "tests"
   ],
-  "dependencies": {
+  "dependencies":
-    "purescript-console": "^4.2.0",
+    { "purescript-console": "^4.4.0"
-    "purescript-effect": "^2.0.1",
+    , "purescript-effect": "^2.0.1"
-    "purescript-functions": "^4.0.0",
+    , "purescript-functions": "^4.0.0"
-    "purescript-prelude": "^4.1.1",
+    , "purescript-prelude": "^4.1.1"
-    "purescript-test-unit": "^15.0.0"
+    , "purescript-test-unit": "^15.0.0"
-  },
+    },
   "devDependencies": {
     "purescript-psci-support": "^4.0.0"
   }

examples/Basic.purs

@@ -4,8 +4,8 @@ import Prelude
 
 import Cheerio (Cheerio, find, length)
 import Cheerio.Static (loadRoot)
-import Control.Monad.Eff (Eff)
+import Effect (Effect)
-import Control.Monad.Eff.Console (CONSOLE, log)
+import Effect.Console (log)
 
 htmlEx :: String
 htmlEx = """
@@ -19,7 +19,7 @@ htmlEx = """
 root :: Cheerio
 root = loadRoot htmlEx
 
-example :: forall eff. Eff (console :: CONSOLE | eff) Unit
+main :: Effect Unit
-example =
+main =
-  let fruitCount = find "#fruits" root # length
+  let fruitCount = root # find "#fruits" # find "li" # length
   in log $ "Number of fruits: " <> show fruitCount

package.json

@@ -1,13 +1,13 @@
 {
   "name": "purescript-cheerio",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "PureScript bindings for Cheerio",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "test": "pulp test"
+    "test": "spago test"
   },
   "repository": {
     "type": "git",
@@ -20,8 +20,6 @@
   },
   "homepage": "https://github.com/icyrockcom/purescript-cheerio#readme",
   "dependencies": {
-    "cheerio": "^1.0.0-rc.3",
+    "cheerio": "^1.0.0-rc.3"
-    "lodash": "^4.17.15",
-    "npm": "^6.12.1"
   }
 }

packages.dhall

@@ -0,0 +1,8 @@
+let upstream =
+  https://github.com/purescript/package-sets/releases/download/psc-0.13.6-20200404/packages.dhall sha256:f239f2e215d0cbd5c203307701748581938f74c4c78f4aeffa32c11c131ef7b6
+
+let overrides = {=}
+
+let additions = {=}
+
+in  upstream // overrides // additions

psc-package.json

@@ -1,13 +1,13 @@
 {
     "name": "purescript-cheerio",
-    "set": "psc-0.12.0-20180704",
+    "set": "psc-0.13.6-20200404",
     "source": "https://github.com/purescript/package-sets.git",
-    "depends": [
+    "depends":
-        "functions",
+      [ "console"
-        "test-unit",
+      , "effect"
-        "psci-support",
+      , "functions"
-        "console",
+      , "prelude"
-        "effect",
+      , "psci-support"
-        "prelude"
+      , "test-unit"
-    ]
+      ]
 }

spago.dhall

@@ -0,0 +1,12 @@
+{ name = "purescript-cheerio"
+, dependencies =
+  [ "console"
+  , "effect"
+  , "functions"
+  , "prelude"
+  , "psci-support"
+  , "test-unit"
+  ]
+, packages = ./packages.dhall
+, sources = [ "src/**/*.purs", "test/**/*.purs" ]
+}

src/Cheerio.purs

@@ -1,20 +1,20 @@
-module Cheerio (
+module Cheerio
-    Cheerio,
+  ( Cheerio
-    attr,
+  , attr
-    children,
+  , children
-    eq,
+  , eq
-    first,
+  , first
-    find,
+  , find
-    hasClass,
+  , hasClass
-    html,
+  , html
-    last,
+  , last
-    length,
+  , length
-    next,
+  , next
-    parent,
+  , parent
-    prev,
+  , prev
-    siblings,
+  , siblings
-    text,
+  , text
-    toArray
+  , toArray
   ) where
 
 import Prelude hiding (eq)

src/Cheerio/Static.purs

@@ -1,11 +1,12 @@
-module Cheerio.Static (
+module Cheerio.Static
-  CheerioStatic,
+  ( CheerioStatic
-  html,
+  , html
-  load,
+  , load
-  loadRoot,
+  , loadRoot
-  select,
+  , select
-  selectDeep,
+  , selectDeep
-  root) where
+  , root
+  ) where
 
 import Prelude
 import Cheerio (Cheerio)