2a564e0 · obelisk · git.iko.soy

git.iko.soy/obelisk

Make obelisk-frontend load in ghci better by disambiguating module import

commit2a564e0ff66013b8394f1ed6053ab8b1eae6ac7e authorElliot Cameron <eacameron@gmail.com> dateWed 15 Jan 2020, 21:42 (7 years ago) parentcf40f2e

2 files changed+4−2

unifiedsplit

lib/frontend/src/Obelisk/Frontend.hs+2−1

@@ -5,6 +5,7 @@

55{-# LANGUAGE LambdaCase #-}

66{-# LANGUAGE MultiParamTypeClasses #-}

77{-# LANGUAGE OverloadedStrings #-}

8+{-# LANGUAGE PackageImports #-}

89{-# LANGUAGE RankNTypes #-}

910{-# LANGUAGE RecursiveDo #-}

1011{-# LANGUAGE ScopedTypeVariables #-}

@@ -45,7 +46,7 @@ import qualified GHCJS.DOM.History as DOM

4546import qualified GHCJS.DOM.Window as DOM

4647import Language.Javascript.JSaddle (MonadJSM, JSM, jsNull)

4748import GHCJS.DOM (currentDocument)

48−import GHCJS.DOM.Document (getHead)

49+import "ghcjs-dom" GHCJS.DOM.Document (getHead)

4950import GHCJS.DOM.Node (Node, removeChild_)

5051import GHCJS.DOM.NodeList (IsNodeList, item, getLength)

5152import GHCJS.DOM.ParentNode (querySelectorAll)

lib/frontend/src/Obelisk/Frontend/Cookie.hs+2−1

@@ -6,6 +6,7 @@

66{-# LANGUAGE FlexibleInstances #-}

77{-# LANGUAGE GeneralizedNewtypeDeriving #-}

88{-# LANGUAGE MultiParamTypeClasses #-}

9+{-# LANGUAGE PackageImports #-}

910{-# LANGUAGE RankNTypes #-}

1011{-# LANGUAGE TypeFamilies #-}

1112{-# LANGUAGE UndecidableInstances #-}

@@ -22,7 +23,7 @@ import Data.Text.Encoding (encodeUtf8)

2223import Reflex

2324import Reflex.Host.Class

2425import Reflex.Dom.Core

25−import GHCJS.DOM.Document (getCookie, Document)

26+import "ghcjs-dom" GHCJS.DOM.Document (getCookie, Document)

2627import GHCJS.DOM.Types (MonadJSM)

2728import Web.Cookie

2829