Merge branch 'develop' into cn-add-test-screenshot
commit5c1a170f3f2d6817bae027b02808fd5310f921b3
authorAli Abrar <aliabrar@gmail.com>
dateSat 12 Dec 2020, 14:37 (6 years ago)
parent781f860d16fa53
dep/reflex-platform/default.nix+1−6
@@ -1,7 +1,2 @@
11# DO NOT HAND-EDIT THIS FILE
2−import ((import <nixpkgs> {}).fetchFromGitHub (
3− let json = builtins.fromJSON (builtins.readFile ./github.json);
4− in { inherit (json) owner repo rev sha256;
5− private = json.private or false;
6− }
7−))
2+import (import ./thunk.nix)
dep/reflex-platform/github.json+4−3
@@ -1,7 +1,8 @@
11{
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
4− "branch": "master",
5− "rev": "510b990d0b11f0626afbec5fe8575b5b2395391b",
6− "sha256": "09cmahsbxr0963wq171c7j139iyzz49hramr4v9nsf684wcwkngv"
4+ "branch": "aa-bump-some",
5+ "private": false,
6+ "rev": "fd5acecb50474f795734db9fb924cc3b2fd2b508",
7+ "sha256": "0wsdd67g42klsf9n3pxb3pndjdz36nzf8gp7pfm8j6nyyy2qribk"
78}
dep/reflex-platform/thunk.nixnew file+9
@@ -0,0 +1,9 @@
1+# DO NOT HAND-EDIT THIS FILE
2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+ if !fetchSubmodules && !private then builtins.fetchTarball {
4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+ } else (import <nixpkgs> {}).fetchFromGitHub {
6+ inherit owner repo rev sha256 fetchSubmodules private;
7+ };
8+ json = builtins.fromJSON (builtins.readFile ./github.json);
9+in fetch json
reflex-dom-core/ChangeLog.md+11
@@ -1,5 +1,16 @@
11# Revision history for reflex-dom-core
22
3+## 0.6.1.0
4+
5+* Bump version bounds
6+* Update for new dependent-map and dependent-sum version (after the "some" package split)
7+* Add `MonadAtomicRef` instance for `UnrunnableT`
8+* Fix ([#467](https://github.com/reflex-frp/reflex-dom/issues/467)): Prevent multiple firings of XHR response event
9+* Updates for GHC 8.10
10+* Move `HasSetValue` from Reflex.Dom.Widget.Input to Reflex.Dom.Builder.Class and add an instance for `TextAreaElementConfig`
11+* Add `now` to the `MonadHold` instance for `UnrunnableT`
12+
13+
314## 0.6.0.0
415
516* ([#375](https://github.com/reflex-frp/reflex-dom/pull/375)) **(Breaking change)** Expose resized dimensions from `resizeDetector`, `resizeDetectorWithStyle`, and `resizeDetectorWithAttrs` from `Reflex.Dom.Widget.Resize`.
reflex-dom-core/reflex-dom-core.cabal+2−2
@@ -1,6 +1,6 @@
11cabal-version: 1.24
22Name: reflex-dom-core
3−Version: 0.6.0.0
3+Version: 0.6.1.0
44Synopsis: Functional Reactive Web Apps with Reflex
55Description:
66 Web applications without callbacks or side-effects.
@@ -83,7 +83,7 @@ library
8383 primitive >= 0.5 && < 0.8,
8484 random >= 1.1 && < 1.2,
8585 ref-tf == 0.4.*,
86− reflex >= 0.6.2 && < 0.8,
86+ reflex >= 0.8 && < 0.9,
8787 semigroups >= 0.16 && < 0.20,
8888 stm >= 2.4 && < 2.6,
8989 text == 1.2.*,
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+8
@@ -744,3 +744,11 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
744744instance HasDocument m => HasDocument (PostBuildT t m)
745745instance HasDocument m => HasDocument (RequesterT t request response m)
746746instance HasDocument m => HasDocument (QueryT t q m)
747+
748+class HasSetValue a where
749+ type SetValue a :: *
750+ setValue :: Lens' a (SetValue a)
751+
752+instance Reflex t => HasSetValue (TextAreaElementConfig er t m) where
753+ type SetValue (TextAreaElementConfig er t m) = Event t Text
754+ setValue = textAreaElementConfig_setValue
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+1
@@ -135,6 +135,7 @@ import Data.Functor.Compose
135135import Data.Functor.Constant
136136import Data.Functor.Misc
137137import Data.Functor.Product
138+import Data.GADT.Compare (GCompare)
138139import Data.IORef
139140import Data.IntMap.Strict (IntMap)
140141import Data.Maybe
reflex-dom-core/src/Reflex/Dom/Prerender.hs+1
@@ -211,6 +211,7 @@ instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
211211 holdIncremental _ _ = unrunnable
212212 buildDynamic _ _ = unrunnable
213213 headE _ = unrunnable
214+ now = unrunnable
214215instance Monad m => MonadSample t (UnrunnableT js t m) where
215216 sample _ = unrunnable
216217instance Monad m => MonadIO (UnrunnableT js t m) where
reflex-dom-core/src/Reflex/Dom/Widget/Input.hs−3
@@ -629,9 +629,6 @@ instance HasAttributes (FileInputConfig t) where
629629 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
630630 attributes = fileInputConfig_attributes
631631
632−class HasSetValue a where
633− type SetValue a :: *
634− setValue :: Lens' a (SetValue a)
635632
636633instance HasSetValue (TextAreaConfig t) where
637634 type SetValue (TextAreaConfig t) = Event t Text
reflex-dom/ChangeLog.md+4
@@ -1,5 +1,9 @@
11# Revision history for reflex-dom
22
3+## 0.6.1.0
4+
5+* Update for new dependent-map and dependent-sum (after the "some" package split)
6+
37## 0.6.0.0
48
59* ([#379](https://github.com/reflex-frp/reflex-dom/pull/379)) Re-export all modules from `reflex-dom-core`. The newly re-exported modules are:
reflex-dom/reflex-dom.cabal+3−3
@@ -1,6 +1,6 @@
11cabal-version: 1.24
22Name: reflex-dom
3−Version: 0.6.0.0
3+Version: 0.6.1.0
44Synopsis: Functional Reactive Web Apps with Reflex
55Description:
66 Web applications without callbacks or side-effects.
@@ -73,8 +73,8 @@ library
7373 build-depends:
7474 base >= 4.7 && < 4.14,
7575 bytestring == 0.10.*,
76− reflex >= 0.6.2 && < 0.8,
77− reflex-dom-core == 0.6.0.0,
76+ reflex >= 0.8 && < 0.9,
77+ reflex-dom-core == 0.6.1.0,
7878 text == 1.2.*
7979 if !impl(ghcjs)
8080 if flag(use-warp) && (os(linux) || os(osx))