move Svg to Halogen.Svg, update to halogen v5

.gitignore

@@ -4,4 +4,10 @@
 /output/
 /.psci*
 package-lock.json
+yarn.lock
 .psc-package
+*.swp
+/.psc-ide-port
+/.spago/
+/examples/circle/dist/app.js
+*.log

.travis.yml

@@ -1,10 +1,11 @@
 language: node_js
-dist: trusty
-sudo: required
-node_js: 8
+
+node_js: stable
+
 install:
-  - npm install -g psc-package pulp purescript@">=0.12 <0.13"
+  - npm install -g purescript spago
   - npm install
+
 script:
-  - pulp --version
-  - npm test
+  - npm run -s test
+  - npm run -s examples:circle:bundle-app

bower.json

@@ -11,12 +11,12 @@
     "output"
   ],
   "dependencies": {
-    "purescript-strings": "^3.3.1",
-    "purescript-halogen": "^3.0.1",
-    "purescript-dom-indexed": "^5.0.0"
+    "purescript-strings": "^4.0.1",
+    "purescript-halogen": "^5.0.0-rc.7",
+    "purescript-dom-indexed": "^7.0.0"
   },
   "devDependencies": {
-    "purescript-psci-support": "^3.0.0"
+    "purescript-psci-support": "^4.0.0"
   },
   "repository": {
     "type": "git",

examples/circle/README.md

@@ -7,7 +7,7 @@ This is a minimal example to show (and test) SVG usage.
 From the current directory:
 
     > npm install
-    > npm run build
-    
+    > npm run examples:circle:bundle-app
+
 The code will be build as `./dist/app.js`, runnable by opening
 `./dist/index.html`.

examples/circle/spago.dhall

@@ -0,0 +1,9 @@
+{-
+Welcome to a Spago project!
+You can edit this file as you like.
+-}
+{ name = "halogen-svg-example"
+, dependencies = (../../spago.dhall).dependencies
+, packages = (../../spago.dhall).packages
+, sources = (../../spago.dhall).sources # ["examples/circle/**/*.purs"]
+}

examples/circle/src/Main.purs

@@ -1,6 +1,7 @@
 module Main where
 
 import Prelude
+import Data.Const (Const)
 import Data.Maybe (Maybe(..))
 
 import Effect (Effect)
@@ -11,39 +12,43 @@ import Halogen.HTML.Events as HE
 import Halogen.Aff (awaitBody, runHalogenAff)
 import Halogen.VDom.Driver (runUI)
 
-import Svg.Elements as SE
-import Svg.Attributes as SA
+import Halogen.SVG.Elements as SE
+import Halogen.SVG.Attributes as SA
 
-data Query a = ToggleState a
+data Action = ToggleState
 
 type State = { on :: Boolean }
 
 initialState :: forall t . t -> State
 initialState = const { on: false }
 
-ui :: forall g. H.Component HTML Query Unit Void g
-ui = H.component { initialState, render, eval, receiver: const Nothing }
+ui :: forall g. H.Component HTML (Const Void) Unit Void g
+ui = H.mkComponent { initialState
+                   , render
+                   , eval: H.mkEval H.defaultEval
+                           { handleAction = handleAction }
+                   }
   where
-  render :: State -> H.ComponentHTML Query
+  render :: State -> H.ComponentHTML Action () g
   render state =
-    SE.svg [SA.viewBox x y w h]
-    [ SE.circle
-      [ SA.r (if state.on then w/6.0 else w/3.0)
-      , SA.fill $ Just (SA.RGB 0 0 100)
-      , HE.onClick (HE.input_ ToggleState)
+    SE.svg
+      [ SA.viewBox x y w h ]
+      [ SE.circle
+        [ SA.r (if state.on then w/6.0 else w/3.0)
+        , SA.fill $ Just (SA.RGB 0 0 100)
+        , HE.onClick (const $ Just ToggleState)
+        ]
+        []
       ]
-    ]
-
     where
     h = 150.0
     w = 150.0
     x = -(w / 2.0)
     y = -(h / 2.0)
 
-  eval :: Query ~> H.ComponentDSL State Query Void g
-  eval (ToggleState next) = do
-    _ <- H.modify (\state -> state { on = not state.on })
-    pure next
+  handleAction :: Action -> H.HalogenM State Action () Void g Unit
+  handleAction ToggleState =
+    H.modify_ (\state -> state { on = not state.on })
 
 main :: Effect Unit
 main = runHalogenAff do

package.json

@@ -1,17 +1,13 @@
 {
   "private": true,
   "scripts": {
-    "postinstall": "psc-package install",
-    "build": "pulp --psc-package browserify --optimise --to dist/app.js",
-    "watch": "pulp --psc-package -w browserify --to dist/app.js",
-    "test": "pulp --psc-package test"
-  },
-  "dependencies": {
-    "virtual-dom": "^2.1.1"
+    "postinstall": "spago install",
+    "build": "spago build --purs-args '--strict'",
+    "test": "spago test --purs-args '--strict'",
+    "examples:circle:build": "spago --config examples/circle/spago.dhall build",
+    "examples:circle:bundle-app": "spago --config examples/circle/spago.dhall bundle-app --to examples/circle/dist/app.js"
   },
   "devDependencies": {
-    "pulp": "^12.0.1",
-    "psc-package": "^0.3.1",
-    "purescript": "^0.12.0"
+    "purescript-psa": "^0.7.3"
   }
 }

packages.dhall

@@ -0,0 +1,128 @@
+{-
+Welcome to your new Dhall package-set!
+
+Below are instructions for how to edit this file for most use
+cases, so that you don't need to know Dhall to use it.
+
+## Warning: Don't Move This Top-Level Comment!
+
+Due to how `dhall format` currently works, this comment's
+instructions cannot appear near corresponding sections below
+because `dhall format` will delete the comment. However,
+it will not delete a top-level comment like this one.
+
+## Use Cases
+
+Most will want to do one or both of these options:
+1. Override/Patch a package's dependency
+2. Add a package not already in the default package set
+
+This file will continue to work whether you use one or both options.
+Instructions for each option are explained below.
+
+### Overriding/Patching a package
+
+Purpose:
+- Change a package's dependency to a newer/older release than the
+    default package set's release
+- Use your own modified version of some dependency that may
+    include new API, changed API, removed API by
+    using your custom git repo of the library rather than
+    the package set's repo
+
+Syntax:
+Replace the overrides' "{=}" (an empty record) with the following idea
+The "//" or "⫽" means "merge these two records and
+  when they have the same value, use the one on the right:"
+-------------------------------
+let override =
+  { packageName =
+      upstream.packageName // { updateEntity1 = "new value", updateEntity2 = "new value" }
+  , packageName =
+      upstream.packageName // { version = "v4.0.0" }
+  , packageName =
+      upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" }
+  }
+-------------------------------
+
+Example:
+-------------------------------
+let overrides =
+  { halogen =
+      upstream.halogen // { version = "master" }
+  , halogen-vdom =
+      upstream.halogen-vdom // { version = "v4.0.0" }
+  }
+-------------------------------
+
+### Additions
+
+Purpose:
+- Add packages that aren't already included in the default package set
+
+Syntax:
+Replace the additions' "{=}" (an empty record) with the following idea:
+-------------------------------
+let additions =
+  { package-name =
+       { dependencies =
+           [ "dependency1"
+           , "dependency2"
+           ]
+       , repo =
+           "https://example.com/path/to/git/repo.git"
+       , version =
+           "tag ('v4.0.0') or branch ('master')"
+       }
+  , package-name =
+       { dependencies =
+           [ "dependency1"
+           , "dependency2"
+           ]
+       , repo =
+           "https://example.com/path/to/git/repo.git"
+       , version =
+           "tag ('v4.0.0') or branch ('master')"
+       }
+  , etc.
+  }
+-------------------------------
+
+Example:
+-------------------------------
+let additions =
+  { benchotron =
+      { dependencies =
+          [ "arrays"
+          , "exists"
+          , "profunctor"
+          , "strings"
+          , "quickcheck"
+          , "lcg"
+          , "transformers"
+          , "foldable-traversable"
+          , "exceptions"
+          , "node-fs"
+          , "node-buffer"
+          , "node-readline"
+          , "datetime"
+          , "now"
+          ]
+      , repo =
+          "https://github.com/hdgarrood/purescript-benchotron.git"
+      , version =
+          "v7.0.0"
+      }
+  }
+-------------------------------
+-}
+
+
+let upstream =
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200724/packages.dhall sha256:bb941d30820a49345a0e88937094d2b9983d939c9fd3a46969b85ce44953d7d9
+
+let overrides = {=}
+
+let additions = {=}
+
+in  upstream // overrides // additions

spago.dhall

@@ -0,0 +1,20 @@
+{-
+Welcome to a Spago project!
+You can edit this file as you like.
+-}
+{ name =
+    "halogen-svg"
+, dependencies =
+    [ "console"
+    , "effect"
+    , "halogen"
+    , "prelude"
+    , "psci-support"
+    , "strings"
+    , "web-uievents"
+    ]
+, packages =
+    ./packages.dhall
+, sources =
+    [ "src/**/*.purs", "test/**/*.purs" ]
+}