a945901 · obelisk · git.iko.soy

git.iko.soy/obelisk

route: Sort imports

commita9459011fd6c6c9b96aac124766c10095c0b08e5 authorElliot Cameron <eacameron@gmail.com> dateWed 17 Jun 2020, 17:30 (6 years ago) parent86545e2

2 files changed+23−24

compare with master

unifiedsplit

lib/route/src/Obelisk/Route.hs+7−6 lib/route/src/Obelisk/Route/Frontend.hs+16−18

lib/route/src/Obelisk/Route.hs+7−6

@@ -140,15 +140,18 @@ import Control.Lens

140140 , view

141141 , Wrapped (..)

142142 )

143+

143144import Control.Monad.Except

144−import Control.Monad.Writer (execWriter, tell)

145145import qualified Control.Monad.State.Strict as State

146146import Control.Monad.Trans (lift)

147+import Control.Monad.Writer (execWriter, tell)

148+import Data.Aeson (FromJSON, ToJSON)

149+import qualified Data.Aeson as Aeson

147150import qualified Data.ByteString as BS

148151import qualified Data.ByteString.Lazy as BSL

149−import Data.Dependent.Sum (DSum (..))

150152import Data.Dependent.Map (DMap)

151153import qualified Data.Dependent.Map as DMap

154+import Data.Dependent.Sum (DSum (..))

152155import Data.Either.Validation (Validation (..))

153156import Data.Foldable

154157import Data.Functor.Sum

@@ -163,19 +166,17 @@ import Data.Monoid ((<>))

163166import Data.Set (Set)

164167import qualified Data.Set as Set

165168import Data.Some (Some(Some))

169+import Data.Tabulation

166170import Data.Text (Text)

167−import Data.Text.Lens (IsText, packed, unpacked)

168171import qualified Data.Text as T

169172import qualified Data.Text.Encoding as T

173+import Data.Text.Lens (IsText, packed, unpacked)

170174import Data.Universe

171175import Data.Universe.Some

172176import Network.HTTP.Types.URI

173177import qualified Numeric.Lens

174178import Obelisk.Route.TH

175179import Text.Read (readMaybe)

176−import Data.Tabulation

177−import qualified Data.Aeson as Aeson

178−import Data.Aeson (FromJSON, ToJSON)

179180

180181-- Design goals:

181182-- No start-up time on the frontend (not yet met)

lib/route/src/Obelisk/Route/Frontend.hs+16−18

@@ -57,8 +57,6 @@ module Obelisk.Route.Frontend

5757

5858import Prelude hiding ((.), id)

5959

60−import Obelisk.Route

61−

6260import Control.Category (Category (..), (.))

6361import Control.Category.Cartesian ((&&&))

6462import Control.Lens hiding (Bifunctor, bimap, universe, element)

@@ -70,36 +68,36 @@ import Control.Monad.Ref

7068import Control.Monad.Trans.Control

7169import Data.Coerce

7270import Data.Dependent.Sum (DSum (..))

71+import Data.Functor.Compose

72+import Data.Functor.Misc

7373import Data.GADT.Compare

74+import qualified Data.List as L

7475import Data.Map (Map)

76+import Data.Maybe (fromMaybe)

7577import Data.Monoid

7678import Data.Proxy

7779import Data.Text (Text)

7880import qualified Data.Text as T

79−import Data.Functor.Compose

80−import Data.Functor.Misc

81−import Reflex.Class

82−import Reflex.Host.Class

83−import Reflex.PostBuild.Class

84−import Reflex.TriggerEvent.Class

85−import Reflex.PerformEvent.Class

86−import Reflex.EventWriter.Class

87−import Reflex.EventWriter.Base

88−import Reflex.Dynamic

89−import Reflex.Dom.Builder.Class

9081import Data.Type.Coercion

91−import Language.Javascript.JSaddle --TODO: Get rid of this - other platforms can also be routed

92−import Reflex.Dom.Core

9382import qualified GHCJS.DOM as DOM

9483import qualified GHCJS.DOM.Types as DOM

9584import qualified GHCJS.DOM.Window as Window

85+import Language.Javascript.JSaddle --TODO: Get rid of this - other platforms can also be routed

9686import Network.URI

97−import Data.Maybe (fromMaybe)

98−import qualified Data.List as L

99−

87+import Reflex.Class

88+import Reflex.Dom.Builder.Class

89+import Reflex.Dom.Core

90+import Reflex.Dynamic

91+import Reflex.EventWriter.Base

92+import Reflex.EventWriter.Class

93+import Reflex.Host.Class

94+import Reflex.PerformEvent.Class

95+import Reflex.PostBuild.Class

96+import Reflex.TriggerEvent.Class

10097import Unsafe.Coerce

10198

10299import Obelisk.Configs

100+import Obelisk.Route

103101

104102infixr 5 :~

105103pattern (:~) :: Reflex t => f a -> Dynamic t a -> DSum f (Compose (Dynamic t) Identity)