develop..a3dd46e · reflex-dom

git.iko.soy/reflex-dom

on a3dd46e help sign in

.github/workflows/haskell.ymldeleted−47

since splitsnapshots

unifiedsplit

@@ -1,47 +0,0 @@

1−name: github-action

2−

3−on: [push, pull_request]

4−

5−jobs:

6− build:

7− strategy:

8− matrix:

9− ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']

10− os: ['ubuntu-latest', 'macos-latest']

11− exclude:

12− # There are some linker warnings in 802 on darwin that

13− # cause compilation to fail

14− # See https://github.com/NixOS/nixpkgs/issues/25139

15− - ghc: '8.0.2'

16− os: 'macos-latest'

17− runs-on: ${{ matrix.os }}

18−

19− name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}

20− steps:

21− - uses: actions/checkout@v2

22− - uses: actions/setup-haskell@v1

23− with:

24− ghc-version: ${{ matrix.ghc }}

25− - name: Cache

26− uses: actions/cache@v1

27− env:

28− cache-name: cache-cabal

29− with:

30− path: ~/.cabal

31− key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}

32− restore-keys: |

33− ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-

34− ${{ runner.os }}-${{ matrix.ghc }}-build-

35− ${{ runner.os }}-${{ matrix.ghc }}-

36− ${{ runner.os }}

37−

38− - name: Set up cabal project file to avoid webkit2gtk

39− run: cp cabal.project-nogtk cabal.project

40− - name: Install dependencies

41− run: |

42− cabal update

43− cabal build --only-dependencies --enable-tests --enable-benchmarks all

44− - name: Build

45− run: cabal build --enable-tests --enable-benchmarks all

46− - name: Run tests

47− run: cabal test all

cabal.project+1−10

@@ -1,10 +1 @@

1−packages:

2− reflex-dom-core/

3− reflex-dom/

4− chrome-test-utils/

5− reflex-dom-test-selenium/

1+packages: chrome-test-utils, reflex-dom-core, reflex-dom, reflex-dom-test-selenium

6−

7−source-repository-package

8− type: git

9− location: https://github.com/dfordivam/hspec-webdriver-clone

10− tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8

cabal.project-nogtkdeleted−14

@@ -1,14 +0,0 @@

1−packages:

2− reflex-dom-core/

3− reflex-dom/

4−

5−package reflex-dom-core

6− flags: -hydration-tests -gc-tests

7−

8−package reflex-dom

9− flags: +use-warp -webkit2gtk

10−

11−source-repository-package

12− type: git

13− location: https://github.com/dfordivam/hspec-webdriver-clone

14− tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8

reflex-dom-core/ChangeLog.md−8

@@ -1,13 +1,5 @@

1# Revision history for reflex-dom-core

3−## 0.6.2.1

4−

5−* Fix hlint complaints with newer GHC.

6−

7−## 0.6.2.0

8−

9−* ([#400](https://github.com/reflex-frp/reflex-dom/pull/400/files)) Set value of input elements in static renderer

10−

11## 0.6.1.0

3## 0.6.1.0

13* Bump version bounds

5* Bump version bounds

reflex-dom-core/reflex-dom-core.cabal+7−19

@@ -1,6 +1,6 @@

1cabal-version: 1.24

2Name: reflex-dom-core

3−Version: 0.6.2.1

3+Version: 0.6.1.0

4Synopsis: Functional Reactive Web Apps with Reflex

5Description:

6 Web applications without callbacks or side-effects.

@@ -54,21 +54,11 @@ flag split-these

54 manual: False

55 default: True

57−flag hydration-tests

58− description: Whether to run the hydration tests (currently only available on linux)

59− default: True

60− manual: True

61−

62−flag gc-tests

63− description: Whether to run the gc tests (currently only available on linux)

64− default: True

65− manual: True

66−

67library

57library

68 hs-source-dirs: src

58 hs-source-dirs: src

69 build-depends:

59 build-depends:

70− aeson >= 0.8 && < 1.6,

60+ aeson >= 0.8 && < 1.5,

71− base >= 4.7 && < 4.15,

61+ base >= 4.7 && < 4.14,

72 bifunctors >= 4.2 && < 6,

62 bifunctors >= 4.2 && < 6,

73 bimap >= 0.3 && < 0.5,

63 bimap >= 0.3 && < 0.5,

74 blaze-builder >= 0.4.1 && < 0.5,

64 blaze-builder >= 0.4.1 && < 0.5,

@@ -169,16 +159,14 @@ library

169 if flag(use-template-haskell)

159 if flag(use-template-haskell)

170 build-depends:

160 build-depends:

171 dependent-sum-template >= 0.1 && < 0.2,

161 dependent-sum-template >= 0.1 && < 0.2,

172− template-haskell >= 2.12.0 && < 2.17

162+ template-haskell >= 2.12.0 && < 2.16

173 other-extensions: TemplateHaskell

163 other-extensions: TemplateHaskell

174 cpp-options: -DUSE_TEMPLATE_HASKELL

164 cpp-options: -DUSE_TEMPLATE_HASKELL

175 other-modules:

165 other-modules:

176 Reflex.Dom.Builder.Class.TH

166 Reflex.Dom.Builder.Class.TH

177

167

178test-suite hlint

168test-suite hlint

179− build-depends:

169+ build-depends: base, hlint

180− base,

181− hlint >= 2.0 && < 4.0

182 hs-source-dirs: test

170 hs-source-dirs: test

183 main-is: hlint.hs

171 main-is: hlint.hs

184 type: exitcode-stdio-1.0

172 type: exitcode-stdio-1.0

@@ -230,7 +218,7 @@ test-suite hydration

230 main-is: hydration.hs

218 main-is: hydration.hs

231 type: exitcode-stdio-1.0

219 type: exitcode-stdio-1.0

232 default-language: Haskell98

220 default-language: Haskell98

233− if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)

221+ if !os(linux) || !arch(x86_64) || flag(profile-reflex)

234 buildable: False

222 buildable: False

235

223

236-- broken test on base 4.11 & ghc 8.4.3

224-- broken test on base 4.11 & ghc 8.4.3

@@ -250,7 +238,7 @@ test-suite gc

250 main-is: gc.hs

238 main-is: gc.hs

251 type: exitcode-stdio-1.0

239 type: exitcode-stdio-1.0

252 default-language: Haskell98

240 default-language: Haskell98

253− if !os(linux) || !arch(x86_64) || !flag(gc-tests)

241+ if !os(linux) || !arch(x86_64)

254 buildable: False

242 buildable: False

255

243

256source-repository head

244source-repository head

reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+1−2

@@ -9,12 +9,11 @@

9{-# LANGUAGE GeneralizedNewtypeDeriving #-}

10#if !MIN_VERSION_base(4,9,0)

11{-# LANGUAGE ImpredicativeTypes #-}

12−#else

13−{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes

14#endif

12#endif

15{-# LANGUAGE LambdaCase #-}

13{-# LANGUAGE LambdaCase #-}

16{-# LANGUAGE OverloadedStrings #-}

14{-# LANGUAGE OverloadedStrings #-}

17{-# LANGUAGE PolyKinds #-}

15{-# LANGUAGE PolyKinds #-}

16+{-# LANGUAGE Rank2Types #-}

18{-# LANGUAGE RecursiveDo #-}

17{-# LANGUAGE RecursiveDo #-}

19{-# LANGUAGE ScopedTypeVariables #-}

18{-# LANGUAGE ScopedTypeVariables #-}

20{-# LANGUAGE StandaloneDeriving #-}

19{-# LANGUAGE StandaloneDeriving #-}

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+4−12

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

2{-# LANGUAGE CPP #-}

3{-# LANGUAGE ConstraintKinds #-}

4{-# LANGUAGE DataKinds #-}

5+{-# LANGUAGE DeriveFunctor #-}

5{-# LANGUAGE DeriveTraversable #-}

6{-# LANGUAGE DeriveTraversable #-}

6{-# LANGUAGE EmptyDataDecls #-}

7{-# LANGUAGE EmptyDataDecls #-}

7{-# LANGUAGE FlexibleContexts #-}

8{-# LANGUAGE FlexibleContexts #-}

@@ -48,7 +49,6 @@ module Reflex.Dom.Builder.Immediate

48 , HydrationMode (..)

49 , HydrationMode (..)

49 , HydrationRunnerT (..)

50 , HydrationRunnerT (..)

50 , runHydrationRunnerT

51 , runHydrationRunnerT

51− , runHydrationRunnerTWithFailure

52 , ImmediateDomBuilderT

53 , runHydrationDomBuilderT

54 , getHydrationMode

@@ -292,23 +292,15 @@ localRunner (HydrationRunnerT m) s parent = do

292

293{-# INLINABLE runHydrationRunnerT #-}

294runHydrationRunnerT

295− :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))

296− => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a

297−runHydrationRunnerT m = runHydrationRunnerTWithFailure m (pure ())

298−

299−{-# INLINABLE runHydrationRunnerTWithFailure #-}

300−runHydrationRunnerTWithFailure

301 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))

295 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))

302 => HydrationRunnerT t m a -> IO () -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a

296 => HydrationRunnerT t m a -> IO () -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a

303−runHydrationRunnerTWithFailure (HydrationRunnerT m) onFailure s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do

297+runHydrationRunnerT (HydrationRunnerT m) onFailure s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do

304 (a, s') <- runStateT m (HydrationState s False)

298 (a, s') <- runStateT m (HydrationState s False)

305 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'

299 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'

306 when (_hydrationState_failed s') $ liftIO $ putStrLn "reflex-dom warning: hydration failed: the DOM was not as expected at switchover time. This may be due to invalid HTML which the browser has altered upon parsing, some external JS altering the DOM, or the page being served from an outdated cache."

300 when (_hydrationState_failed s') $ liftIO $ putStrLn "reflex-dom warning: hydration failed: the DOM was not as expected at switchover time. This may be due to invalid HTML which the browser has altered upon parsing, some external JS altering the DOM, or the page being served from an outdated cache."

307 when (_hydrationState_failed s') $ liftIO onFailure

301 when (_hydrationState_failed s') $ liftIO onFailure

308 pure a

302 pure a

309

303

310−

311−

312instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where

304instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where

313 {-# INLINABLE newEventWithTrigger #-}

305 {-# INLINABLE newEventWithTrigger #-}

314 newEventWithTrigger = lift . newEventWithTrigger

306 newEventWithTrigger = lift . newEventWithTrigger

@@ -1876,14 +1868,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda

1876 getHydrationMode >>= \case

1868 getHydrationMode >>= \case

1877 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do

1869 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do

1878 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children

1870 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children

1879− phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm

1871+ phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm

1880 liftIO $ writeIORef placeholders $! phs

1872 liftIO $ writeIORef placeholders $! phs

1881 insertAfterPreviousNode lastPlaceholder

1873 insertAfterPreviousNode lastPlaceholder

1882 HydrationMode_Immediate -> do

1874 HydrationMode_Immediate -> do

1883 let activate i = do

1875 let activate i = do

1884 append $ toNode $ _traverseChildImmediate_fragment i

1876 append $ toNode $ _traverseChildImmediate_fragment i

1885 pure $ _traverseChildImmediate_placeholder i

1877 pure $ _traverseChildImmediate_placeholder i

1886− phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0

1878+ phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0

1887 liftIO $ writeIORef placeholders $! phs

1879 liftIO $ writeIORef placeholders $! phs

1888 append $ toNode lastPlaceholder

1880 append $ toNode lastPlaceholder

1889 requestDomAction_ $ ffor children' $ \p -> do

1881 requestDomAction_ $ ffor children' $ \p -> do

reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+1−1

@@ -274,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh

274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5

275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape

276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8

277− (modify . (:)) . (\c -> "") =<< case mSetContents of

277+ modify . (:) =<< (\c -> "") <$> case mSetContents of

278 Nothing -> return (pure (escape initialContents))

279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on

280 return $ CommentNode ()

reflex-dom-core/src/Reflex/Dom/Main.hs+10−38

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

5{-# LANGUAGE GADTs #-}

6{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE NoMonomorphismRestriction #-}

8+{-# LANGUAGE PatternSynonyms #-}

8{-# LANGUAGE RankNTypes #-}

9{-# LANGUAGE RankNTypes #-}

9{-# LANGUAGE RecursiveDo #-}

10{-# LANGUAGE RecursiveDo #-}

10{-# LANGUAGE ScopedTypeVariables #-}

11{-# LANGUAGE ScopedTypeVariables #-}

@@ -63,41 +64,22 @@ mainHydrationWidgetWithHead = mainHydrationWidgetWithHead'

63{-# INLINABLE mainHydrationWidgetWithHead' #-}

64{-# INLINABLE mainHydrationWidgetWithHead' #-}

64-- | Warning: `mainHydrationWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.

65-- | Warning: `mainHydrationWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.

65mainHydrationWidgetWithHead' :: HydrationWidget () () -> HydrationWidget () () -> JSM ()

66mainHydrationWidgetWithHead' :: HydrationWidget () () -> HydrationWidget () () -> JSM ()

66−mainHydrationWidgetWithHead' = mainHydrationWidgetWithSwitchoverAction' (pure ())

67+mainHydrationWidgetWithHead' = mainHydrationWidgetWithSwitchoverAction' (pure ()) (pure ())

68{-# INLINE mainHydrationWidgetWithSwitchoverAction #-}

69{-# INLINE mainHydrationWidgetWithSwitchoverAction #-}

69−mainHydrationWidgetWithSwitchoverAction :: JSM () -> (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> JSM ()

70+mainHydrationWidgetWithSwitchoverAction :: IO () -> JSM () -> (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> JSM ()

70mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverAction'

71mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverAction'

72{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}

73{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}

73-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.

74-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.

74−mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()

75+mainHydrationWidgetWithSwitchoverAction' :: IO () -> JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()

75−mainHydrationWidgetWithSwitchoverAction' = mainHydrationWidgetWithSwitchoverActionWithFailure' (pure ())

76−

77−

78−{-# INLINABLE mainHydrationWidgetWithSwitchoverActionWithFailure' #-}

79−-- | Warning: `mainHydrationWidgetWithSwitchoverActionWithFaiilure'` is provided only as performance tweak. It is expected to disappear in future releases.

80−mainHydrationWidgetWithSwitchoverActionWithFailure' :: IO () -> JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()

81−mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchoverAction head' body = do

76+mainHydrationWidgetWithSwitchoverAction' onFailure switchoverAction head' body = do

82− runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction $ \appendHead appendBody -> do

77+ runHydrationWidgetWithHeadAndBody onFailure switchoverAction $ \appendHead appendBody -> do

83 appendHead head'

78 appendHead head'

84 appendBody body

79 appendBody body

86{-# INLINABLE attachHydrationWidget #-}

81{-# INLINABLE attachHydrationWidget #-}

87attachHydrationWidget

82attachHydrationWidget

88− :: JSM ()

89− -> JSContextSingleton ()

90− -> ( Event DomTimeline ()

91− -> IORef HydrationMode

92− -> Maybe (IORef [(Node, HydrationRunnerT DomTimeline (DomCoreWidget ()) ())])

93− -> EventChannel

94− -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))

95− )

96− -> IO (a, FireCommand DomTimeline DomHost)

97−attachHydrationWidget = attachHydrationWidgetWithFailure (pure ())

98−

99−{-# INLINABLE attachHydrationWidgetWithFailure #-}

100−attachHydrationWidgetWithFailure

101 :: IO ()

83 :: IO ()

102 -> JSM ()

84 -> JSM ()

103 -> JSContextSingleton ()

85 -> JSContextSingleton ()

@@ -108,7 +90,7 @@ attachHydrationWidgetWithFailure

108 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))

90 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))

109 )

91 )

110 -> IO (a, FireCommand DomTimeline DomHost)

92 -> IO (a, FireCommand DomTimeline DomHost)

111−attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do

93+attachHydrationWidget onFailure switchoverAction jsSing w = do

112 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating

94 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating

113 rootNodesRef <- liftIO $ newIORef []

95 rootNodesRef <- liftIO $ newIORef []

114 events <- newChan

96 events <- newChan

@@ -124,7 +106,7 @@ attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do

124 rootNodes <- liftIO $ readIORef rootNodesRef

106 rootNodes <- liftIO $ readIORef rootNodesRef

125 let delayedAction = do

107 let delayedAction = do

126 for_ (reverse rootNodes) $ \(rootNode, runner) -> do

108 for_ (reverse rootNodes) $ \(rootNode, runner) -> do

127− let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events

109+ let hydrate = runHydrationRunnerT runner onFailure Nothing rootNode events

128 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing

110 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing

129 liftIO $ writeIORef hydrationMode HydrationMode_Immediate

111 liftIO $ writeIORef hydrationMode HydrationMode_Immediate

130 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing

112 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing

@@ -139,16 +121,6 @@ type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (Perform

139

121

140{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}

122{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}

141runHydrationWidgetWithHeadAndBody

123runHydrationWidgetWithHeadAndBody

142− :: JSM ()

143− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once

144− -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once

145− -> FloatingWidget () ()

146− )

147− -> JSM ()

148−runHydrationWidgetWithHeadAndBody = runHydrationWidgetWithHeadAndBodyWithFailure (pure ())

149−

150−{-# INLINABLE runHydrationWidgetWithHeadAndBodyWithFailure #-}

151−runHydrationWidgetWithHeadAndBodyWithFailure

152 :: IO ()

124 :: IO ()

153 -> JSM ()

125 -> JSM ()

154 -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once

126 -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once

@@ -156,11 +128,11 @@ runHydrationWidgetWithHeadAndBodyWithFailure

156 -> FloatingWidget () ()

128 -> FloatingWidget () ()

157 )

129 )

158 -> JSM ()

130 -> JSM ()

159−runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do

131+runHydrationWidgetWithHeadAndBody onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do

160 globalDoc <- currentDocumentUnchecked

132 globalDoc <- currentDocumentUnchecked

161 headElement <- getHeadUnchecked globalDoc

133 headElement <- getHeadUnchecked globalDoc

162 bodyElement <- getBodyUnchecked globalDoc

134 bodyElement <- getBodyUnchecked globalDoc

163− (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do

135+ (events, fc) <- liftIO . attachHydrationWidget onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do

164 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef

136 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef

165 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c

137 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c

166 hydrateDom n w = do

138 hydrateDom n w = do

reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1

@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu

117 "overflow" =: "hidden" <>

118 "position" =: "relative"

119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>

120− "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>

120+ "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>

121 "position" =: "absolute" <>

122 "width" =: "100%"

123 findWindow sizeIncrement windowSize startingPosition =

reflex-dom-core/test/hlint.hs+1−1

@@ -1,4 +1,4 @@

1−import Language.Haskell.HLint (hlint)

1+import Language.Haskell.HLint3 (hlint)

2import System.Exit (exitFailure, exitSuccess)

4main :: IO ()

reflex-dom-core/test/hydration.hs+27−34

@@ -20,14 +20,6 @@

21{-# OPTIONS_GHC -fno-warn-orphans #-}

23−-- Notice to those working on this test suite:

24−-- It doesn't appear to be possible to use --match to run a particular test, in

25−-- this situation the test may hang before reaching our code. This seems to

26−-- happen when the test is not the first test in the block. As a workaround, you

27−-- can just comment out the other tests. Also, using `xit` will cause the same

28−-- issue. `xit` tests must be the last tests in the session, or the session will

29−-- hang in the following test.

30−

31import Prelude hiding (fail)

23import Prelude hiding (fail)

32import Control.Concurrent

24import Control.Concurrent

33import qualified Control.Concurrent.Async as Async

25import qualified Control.Concurrent.Async as Async

@@ -154,13 +146,13 @@ main = do

154 withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"

146 withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"

155 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }

147 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }

156 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags

148 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags

157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium

149+ hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium

158

150

159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec

151+tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec

160tests withDebugging wdConfig caps _selenium = do

152tests withDebugging wdConfig caps _selenium = do

161 let putStrLnDebug :: MonadIO m => Text -> m ()

153 let putStrLnDebug :: MonadIO m => Text -> m ()

162 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m

154 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m

163− session' t = sessionWith wdConfig t . using caps

155+ session' = sessionWith wdConfig "" . using (map (,"") caps)

164 runWD m = runWDOptions (WdOptions False) $ do

156 runWD m = runWDOptions (WdOptions False) $ do

165 putStrLnDebug "before"

157 putStrLnDebug "before"

166 r <- m

158 r <- m

@@ -172,7 +164,7 @@ tests withDebugging wdConfig caps _selenium = do

172 testWidget = testWidgetDebug True withDebugging

164 testWidget = testWidgetDebug True withDebugging

173 testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b

165 testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b

174 testWidget' = testWidgetDebug' True withDebugging

166 testWidget' = testWidgetDebug' True withDebugging

175− session' "text" $ do

167+ describe "text" $ session' $ do

176 it "works" $ runWD $ do

168 it "works" $ runWD $ do

177 testWidgetStatic (checkBodyText "hello world") $ do

169 testWidgetStatic (checkBodyText "hello world") $ do

178 text "hello world"

170 text "hello world"

@@ -233,7 +225,7 @@ tests withDebugging wdConfig caps _selenium = do

233 click <- button ""

225 click <- button ""

234 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click

226 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click

235

227

236− session' "element" $ do

228+ describe "element" $ session' $ do

237 it "works with domEvent Click" $ runWD $ do

229 it "works with domEvent Click" $ runWD $ do

238 clickedRef <- liftIO $ newRef False

230 clickedRef <- liftIO $ newRef False

239 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do

231 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do

@@ -297,8 +289,8 @@ tests withDebugging wdConfig caps _selenium = do

297 let click = domEvent Click e

289 let click = domEvent Click e

298 return ()

290 return ()

299

291

300− session' "inputElement" $ do

292+ describe "inputElement" $ do

301− describe "static renderer" $ do

293+ describe "static renderer" $ session' $ do

302 it "sets value attribute" $ runWD $ do

294 it "sets value attribute" $ runWD $ do

303 let checkStatic = do

295 let checkStatic = do

304 e <- findElemWithRetry $ WD.ByTag "input"

296 e <- findElemWithRetry $ WD.ByTag "input"

@@ -355,7 +347,7 @@ tests withDebugging wdConfig caps _selenium = do

355 & inputElementConfig_initialChecked .~ False

347 & inputElementConfig_initialChecked .~ False

356 & inputElementConfig_setChecked .~ (True <$ pb)

348 & inputElementConfig_setChecked .~ (True <$ pb)

357 pure ()

349 pure ()

358− describe "hydration" $ do

350+ describe "hydration" $ session' $ do

359 it "doesn't wipe user input when switching over" $ runWD $ do

351 it "doesn't wipe user input when switching over" $ runWD $ do

360 inputRef <- newRef ("hello " :: Text)

352 inputRef <- newRef ("hello " :: Text)

361 testWidget'

353 testWidget'

@@ -593,7 +585,8 @@ tests withDebugging wdConfig caps _selenium = do

593 el "p" $ dynText $ _inputElement_value e

585 el "p" $ dynText $ _inputElement_value e

594 performEvent_ $ consRef valRef <$> updated (_inputElement_value e)

586 performEvent_ $ consRef valRef <$> updated (_inputElement_value e)

595 performEvent_ $ consRef inputRef <$> _inputElement_input e

587 performEvent_ $ consRef inputRef <$> _inputElement_input e

588+

596− describe "hydration/immediate" $ do

589+ describe "hydration/immediate" $ session' $ do

597 it "captures user input after switchover" $ runWD $ do

590 it "captures user input after switchover" $ runWD $ do

598 inputRef :: IORef Text <- newRef ""

591 inputRef :: IORef Text <- newRef ""

599 let checkValue = do

592 let checkValue = do

@@ -673,8 +666,8 @@ tests withDebugging wdConfig caps _selenium = do

673 names <- liftJSM $ traverse File.getName fs

666 names <- liftJSM $ traverse File.getName fs

674 liftIO $ writeRef filesRef names

667 liftIO $ writeRef filesRef names

675

668

676− session' "textAreaElement" $ do

669+ describe "textAreaElement" $ do

677− describe "static renderer" $ do

670+ describe "static renderer" $ session' $ do

678 it "sets value attribute" $ runWD $ do

671 it "sets value attribute" $ runWD $ do

679 let checkStatic = do

672 let checkStatic = do

680 e <- findElemWithRetry $ WD.ByTag "textarea"

673 e <- findElemWithRetry $ WD.ByTag "textarea"

@@ -697,7 +690,7 @@ tests withDebugging wdConfig caps _selenium = do

697 & textAreaElementConfig_initialValue .~ "test"

690 & textAreaElementConfig_initialValue .~ "test"

698 & textAreaElementConfig_setValue .~ ("test-updated" <$ pb)

691 & textAreaElementConfig_setValue .~ ("test-updated" <$ pb)

699 pure ()

692 pure ()

700− describe "hydration" $ do

693+ describe "hydration" $ session' $ do

701 it "doesn't wipe user input when switching over" $ runWD $ do

694 it "doesn't wipe user input when switching over" $ runWD $ do

702 inputRef <- newRef ("" :: Text)

695 inputRef <- newRef ("" :: Text)

703 testWidget'

696 testWidget'

@@ -846,7 +839,7 @@ tests withDebugging wdConfig caps _selenium = do

846 e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)

839 e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)

847 el "p" $ dynText $ _textAreaElement_value e

840 el "p" $ dynText $ _textAreaElement_value e

848

841

849− describe "hydration/immediate" $ do

842+ describe "hydration/immediate" $ session' $ do

850 it "captures user input after switchover" $ runWD $ do

843 it "captures user input after switchover" $ runWD $ do

851 inputRef :: IORef Text <- newRef ""

844 inputRef :: IORef Text <- newRef ""

852 let checkValue = do

845 let checkValue = do

@@ -888,13 +881,13 @@ tests withDebugging wdConfig caps _selenium = do

888 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e

881 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e

889 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)

882 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)

890

883

891− session' "selectElement" $ do

884+ describe "selectElement" $ do

892 let options :: DomBuilder t m => m ()

885 let options :: DomBuilder t m => m ()

893 options = do

886 options = do

894 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"

887 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"

895 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"

888 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"

896 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"

889 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"

897− describe "hydration" $ do

890+ describe "hydration" $ session' $ do

898 it "sets initial value correctly" $ runWD $ do

891 it "sets initial value correctly" $ runWD $ do

899 inputRef <- newRef ("" :: Text)

892 inputRef <- newRef ("" :: Text)

900 let setup = do

893 let setup = do

@@ -968,7 +961,7 @@ tests withDebugging wdConfig caps _selenium = do

968 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e

961 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e

969 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)

962 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)

970

963

971− describe "hydration/immediate" $ do

964+ describe "hydration/immediate" $ session' $ do

972 it "captures user input after switchover" $ runWD $ do

965 it "captures user input after switchover" $ runWD $ do

973 inputRef :: IORef Text <- newRef ""

966 inputRef :: IORef Text <- newRef ""

974 let checkValue = do

967 let checkValue = do

@@ -1014,7 +1007,7 @@ tests withDebugging wdConfig caps _selenium = do

1014 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e

1007 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e

1015 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)

1008 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)

1016

1009

1017− session' "prerender" $ do

1010+ describe "prerender" $ session' $ do

1018 it "works in simple case" $ runWD $ do

1011 it "works in simple case" $ runWD $ do

1019 testWidget (checkBodyText "One") (checkBodyText "Two") $ do

1012 testWidget (checkBodyText "One") (checkBodyText "Two") $ do

1020 prerender_ (text "One") (text "Two")

1013 prerender_ (text "One") (text "Two")

@@ -1083,7 +1076,7 @@ tests withDebugging wdConfig caps _selenium = do

1083 prerender_ (pure ()) (liftIO $ trigger "Client")

1076 prerender_ (pure ()) (liftIO $ trigger "Client")

1084 textNode $ TextNodeConfig "Initial" $ Just e

1077 textNode $ TextNodeConfig "Initial" $ Just e

1085

1078

1086− session' "namespaces" $ do

1079+ describe "namespaces" $ session' $ do

1087 it "dyn can be nested in namespaced widget" $ runWD $ do

1080 it "dyn can be nested in namespaced widget" $ runWD $ do

1088 testWidget (pure ()) (checkTextInTag "svg" "one") $ do

1081 testWidget (pure ()) (checkTextInTag "svg" "one") $ do

1089 let svgRootCfg = def

1082 let svgRootCfg = def

@@ -1092,7 +1085,7 @@ tests withDebugging wdConfig caps _selenium = do

1092 void $ element "svg" svgRootCfg $ do

1085 void $ element "svg" svgRootCfg $ do

1093 dyn_ $ text "one" <$ pure ()

1086 dyn_ $ text "one" <$ pure ()

1094

1087

1095− session' "runWithReplace" $ do

1088+ describe "runWithReplace" $ session' $ do

1096 it "works" $ runWD $ do

1089 it "works" $ runWD $ do

1097 replaceChan :: Chan Text <- liftIO newChan

1090 replaceChan :: Chan Text <- liftIO newChan

1098 let setup = findElemWithRetry $ WD.ByTag "div"

1091 let setup = findElemWithRetry $ WD.ByTag "div"

@@ -1290,7 +1283,7 @@ tests withDebugging wdConfig caps _selenium = do

1290 _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace

1283 _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace

1291 text "|after"

1284 text "|after"

1292

1285

1293− session' "traverseDMapWithKeyWithAdjust" $ do

1286+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do

1294 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)

1287 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)

1295 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do

1288 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do

1296 elClass "span" "key" $ text $ textKey k

1289 elClass "span" "key" $ text $ textKey k

@@ -1393,7 +1386,7 @@ tests withDebugging wdConfig caps _selenium = do

1393 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]

1386 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]

1394 liftIO $ dmap `H.shouldBe` keyMap

1387 liftIO $ dmap `H.shouldBe` keyMap

1395

1388

1396− session' "traverseIntMapWithKeyWithAdjust" $ do

1389+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do

1397 let textKeyInt k = "key" <> T.pack (show k)

1390 let textKeyInt k = "key" <> T.pack (show k)

1398 intMap = IntMap.fromList

1391 intMap = IntMap.fromList

1399 [ (1, "one")

1392 [ (1, "one")

@@ -1500,7 +1493,7 @@ tests withDebugging wdConfig caps _selenium = do

1500 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]

1493 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]

1501 liftIO $ dmap `H.shouldBe` intMap

1494 liftIO $ dmap `H.shouldBe` intMap

1502

1495

1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do

1496+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do

1504 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)

1497 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)

1505 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do

1498 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do

1506 elClass "span" "key" $ text $ textKey2 k

1499 elClass "span" "key" $ text $ textKey2 k

@@ -1580,8 +1573,8 @@ tests withDebugging wdConfig caps _selenium = do

1580 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan

1573 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan

1581 liftIO $ assertEqual "DMap" initMap dmap

1574 liftIO $ assertEqual "DMap" initMap dmap

1582

1575

1583− session' "hydrating invalid HTML" $ do

1576+ describe "hydrating invalid HTML" $ session' $ do

1584− xit "can hydrate list in paragraph" $ runWD $ do

1577+ it "can hydrate list in paragraph" $ runWD $ do

1585 let preSwitchover = do

1578 let preSwitchover = do

1586 checkBodyText "before\ninner\nafter"

1579 checkBodyText "before\ninner\nafter"

1587 -- Two <p> tags should be present

1580 -- Two <p> tags should be present

@@ -1610,7 +1603,7 @@ tests withDebugging wdConfig caps _selenium = do

1610 -- TODO: This test presupposes the exact set of labels that "dropdown" places in the "value" fields to distinguish options.

1603 -- TODO: This test presupposes the exact set of labels that "dropdown" places in the "value" fields to distinguish options.

1611 -- This dependence on internal implementation details is undesirable in a test case, but seems fairly tricky to avoid.

1604 -- This dependence on internal implementation details is undesirable in a test case, but seems fairly tricky to avoid.

1612 -- It seems expedient for the time being to expect this test case to be updated, should those implementation details ever change.

1605 -- It seems expedient for the time being to expect this test case to be updated, should those implementation details ever change.

1613− session' "dropdown" $ do

1606+ describe "dropdown" $ session' $ do

1614 let doTest expectedOpts (initialValue :: Text) = do

1607 let doTest expectedOpts (initialValue :: Text) = do

1615 let doCheck = do

1608 let doCheck = do

1616 es <- findElemsWithRetry $ WD.ByTag "option"

1609 es <- findElemsWithRetry $ WD.ByTag "option"

@@ -1779,7 +1772,7 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =

1779 liftIO $ putMVar waitUntilSwitchover ()

1772 liftIO $ putMVar waitUntilSwitchover ()

1780 putStrLnDebug "put waitUntilSwitchover"

1773 putStrLnDebug "put waitUntilSwitchover"

1781 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"

1774 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"

1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget

1775+ mainHydrationWidgetWithSwitchoverAction onFailure switchOverAction blank bodyWidget

1783 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"

1776 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"

1784 syncPoint

1777 syncPoint

1785 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do

1778 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do

reflex-dom-test-selenium/reflex-dom-test-selenium.cabal+1−1

@@ -15,7 +15,7 @@ library

15 hs-source-dirs: src

16 build-depends:

17 async,

18− base >= 4.7 && < 4.15,

18+ base >= 4.7 && < 4.14,

19 bytestring == 0.10.*,

20 chrome-test-utils,

21 exceptions,

reflex-dom/ChangeLog.md−4

@@ -1,9 +1,5 @@

1# Revision history for reflex-dom

3−## 0.6.1.0-r1

4−

5−* Loosen reflex-dom-core version bounds

6−

7## 0.6.1.0

3## 0.6.1.0

9* Update for new dependent-map and dependent-sum (after the "some" package split)

5* Update for new dependent-map and dependent-sum (after the "some" package split)

reflex-dom/reflex-dom.cabal+3−3

@@ -61,7 +61,7 @@ library

61 hs-source-dirs: src-android

62 other-modules: Reflex.Dom.Android.MainWidget

63 build-depends:

64− aeson >= 1.4 && < 1.6,

64+ aeson >= 1.4 && < 1.5,

65 android-activity == 0.1.*,

66 data-default == 0.7.*,

67 jsaddle >= 0.9.6 && < 0.10

@@ -71,10 +71,10 @@ library

71 cpp-options: -DANDROID

72 build-tools: hsc2hs

73 build-depends:

74− base >= 4.7 && < 4.15,

74+ base >= 4.7 && < 4.14,

75 bytestring == 0.10.*,

76 reflex >= 0.8 && < 0.9,

77− reflex-dom-core >= 0.6.1.0 && <0.7,

77+ reflex-dom-core == 0.6.1.0,

78 text == 1.2.*

79 if !impl(ghcjs)

80 if flag(use-warp) && (os(linux) || os(osx))