Update for changes in EventTypes

Author: garyb

src/Routing/Hash.purs

@@ -11,18 +11,18 @@ module Routing.Hash
 
 import Prelude
 
+import Data.Foldable (class Foldable, indexl)
+import Data.Maybe (Maybe(..), fromMaybe, maybe)
+import Data.String (Pattern(..), stripPrefix)
 import Effect (Effect)
 import Effect.Ref as Ref
+import Routing (match, matchWith)
+import Routing.Match (Match)
 import Web.Event.EventTarget (addEventListener, eventListener, removeEventListener)
 import Web.HTML (window)
+import Web.HTML.Event.HashChangeEvent.EventTypes as ET
 import Web.HTML.Location as L
 import Web.HTML.Window as Window
-import Web.HTML.Window.EventTypes as WET
-import Data.Foldable (class Foldable, indexl)
-import Data.Maybe (Maybe(..), fromMaybe, maybe)
-import Data.String (Pattern(..), stripPrefix)
-import Routing (match, matchWith)
-import Routing.Match (Match)
 
 -- | Gets the global location hash.
 getHash :: Effect String
@@ -48,8 +48,8 @@ foldHashes cb init = do
   ref <- Ref.new =<< init =<< getHash
   win <- Window.toEventTarget <$> window
   listener <- eventListener \_ -> flip Ref.write ref =<< join (cb <$> Ref.read ref <*> getHash)
-  addEventListener WET.hashchange listener false win
-  pure $ removeEventListener WET.hashchange listener false win
+  addEventListener ET.hashchange listener false win
+  pure $ removeEventListener ET.hashchange listener false win
 
 -- | Runs the callback on every hash change providing the previous hash and the
 -- | latest hash. The provided String is the hash portion of the `Location` with

src/Routing/PushState.purs

@@ -27,11 +27,11 @@ import Web.DOM.Node (setNodeValue) as DOM
 import Web.DOM.Text as Text
 import Web.Event.EventTarget (addEventListener, eventListener) as DOM
 import Web.HTML (window) as DOM
+import Web.HTML.Event.PopStateEvent.EventTypes as ET
 import Web.HTML.HTMLDocument as HTMLDocument
 import Web.HTML.History as History
 import Web.HTML.Location (hash, pathname, search) as DOM
 import Web.HTML.Window as Window
-import Web.HTML.Window.EventTypes as WET
 
 -- | A `PushStateInterface` is a localized instance for making location changes
 -- | and consuming the events. Since the DOM API does not provide a general
@@ -102,7 +102,7 @@ makeInterface = do
 
   DOM.window
     >>= Window.toEventTarget
-    >>> DOM.addEventListener WET.popstate listener false
+    >>> DOM.addEventListener ET.popstate listener false
 
   pure
     { pushState: stateFn History.pushState