From 7990cf4e09889c6b47e5bbbfd07bf1f6a6028524 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Thu, 25 Jul 2019 18:18:28 -0400 Subject: [PATCH 01/14] Pipe config parameter to obelisk --- default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index e8b83a66..1f0b1b24 100644 --- a/default.nix +++ b/default.nix @@ -1,8 +1,11 @@ -{ obelisk ? import ./.obelisk/impl (builtins.removeAttrs args ["pkgs"]) +{ config ? {} +, obelisk ? import ./.obelisk/impl (builtins.removeAttrs args ["pkgs"]) , pkgs ? obelisk.nixpkgs , ... } @ args: let + obelisk = import ./.obelisk/impl { inherit config; }; + pkgs = obelisk.nixpkgs; reflex-platform = obelisk.reflex-platform; inherit (pkgs) lib; haskellLib = pkgs.haskell.lib; From 8c3a18a0b6d44f52a1d1dbd5c3f27acb8ace9df1 Mon Sep 17 00:00:00 2001 From: Leon P Smith Date: Tue, 19 May 2020 00:32:01 -0400 Subject: [PATCH 02/14] Bump vessel --- dep/vessel/default.nix | 7 +------ dep/vessel/github.json | 5 +++-- dep/vessel/thunk.nix | 9 +++++++++ 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 dep/vessel/thunk.nix diff --git a/dep/vessel/default.nix b/dep/vessel/default.nix index 7a047786..2b4d4ab1 100644 --- a/dep/vessel/default.nix +++ b/dep/vessel/default.nix @@ -1,7 +1,2 @@ # DO NOT HAND-EDIT THIS FILE -import ((import {}).fetchFromGitHub ( - let json = builtins.fromJSON (builtins.readFile ./github.json); - in { inherit (json) owner repo rev sha256; - private = json.private or false; - } -)) +import (import ./thunk.nix) \ No newline at end of file diff --git a/dep/vessel/github.json b/dep/vessel/github.json index bcd4f423..6e67ec1d 100644 --- a/dep/vessel/github.json +++ b/dep/vessel/github.json @@ -2,6 +2,7 @@ "owner": "obsidiansystems", "repo": "vessel", "branch": "develop", - "rev": "178dccd6b208c09537f07166524032f89464fc2b", - "sha256": "1fd2wygdqcmxvb62swcqvkc9yq4i5qd9xygmjpjvfcajsrd57p60" + "private": false, + "rev": "5627e62680ad8606784af264d998c5d0576e6d56", + "sha256": "1ib7cr0j7v9mk4lvscr7r14q9nk64jdvj7a21xwg74ir5z80wzxj" } diff --git a/dep/vessel/thunk.nix b/dep/vessel/thunk.nix new file mode 100644 index 00000000..bbf2dc18 --- /dev/null +++ b/dep/vessel/thunk.nix @@ -0,0 +1,9 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file From 84e899a1cf7ec88b60ede2ce338c573150359656 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 18 Jun 2020 08:32:57 -0400 Subject: [PATCH 03/14] aeson-orphans: Remove redundant ghc-options flag --- aeson-orphans/rhyolite-aeson-orphans.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aeson-orphans/rhyolite-aeson-orphans.cabal b/aeson-orphans/rhyolite-aeson-orphans.cabal index 8e1731cc..1fb5ac80 100644 --- a/aeson-orphans/rhyolite-aeson-orphans.cabal +++ b/aeson-orphans/rhyolite-aeson-orphans.cabal @@ -24,4 +24,4 @@ library exposed-modules: Rhyolite.Aeson.Orphans other-extensions: TemplateHaskell - ghc-options: -Wall -fno-warn-unused-do-bind -fwarn-tabs -funbox-strict-fields -O2 -fprof-auto-calls + ghc-options: -Wall -fno-warn-unused-do-bind -funbox-strict-fields -O2 -fprof-auto-calls From 1c9b0164977fb0de8006733b7eb1793efe6985f1 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 18 Jun 2020 19:18:07 -0400 Subject: [PATCH 04/14] Bump vessel to support reflex 0.7.1 --- dep/vessel/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dep/vessel/github.json b/dep/vessel/github.json index 6e67ec1d..273daaae 100644 --- a/dep/vessel/github.json +++ b/dep/vessel/github.json @@ -3,6 +3,6 @@ "repo": "vessel", "branch": "develop", "private": false, - "rev": "5627e62680ad8606784af264d998c5d0576e6d56", - "sha256": "1ib7cr0j7v9mk4lvscr7r14q9nk64jdvj7a21xwg74ir5z80wzxj" + "rev": "7430019ee93e4682f713e08dca3c0e137a33a379", + "sha256": "1mkz273g8cpalrwyrjmqpz0hkq6v04i2chr88y19c7cc7m0hw2f2" } From d6c10966137b5f21b2b080e6265d3466fc5639c3 Mon Sep 17 00:00:00 2001 From: Tom Smalley Date: Fri, 25 Sep 2020 10:09:53 +0100 Subject: [PATCH 05/14] Bump obelisk --- .obelisk/impl/github.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.obelisk/impl/github.json b/.obelisk/impl/github.json index 77c0e5e6..62166a1f 100644 --- a/.obelisk/impl/github.json +++ b/.obelisk/impl/github.json @@ -1,8 +1,8 @@ { "owner": "obsidiansystems", "repo": "obelisk", - "branch": "master", + "branch": "ts-multiple-domains", "private": false, - "rev": "d9df151ed175be4f2dff721676e412a88a0596c1", - "sha256": "1wm2q4blqga6appp193idkapnqsan7qnkz29kylqag1y11fk4rrj" + "rev": "dea94e88399a1dd42d6d5227608f1510ccef1634", + "sha256": "1z540ksfmqb6gafpx6r5n0hidsjckbg5a2yk6ljpapmnijr06ncw" } From 96e003dc41e10bff46b9076406946527312271f6 Mon Sep 17 00:00:00 2001 From: Tom Smalley Date: Fri, 25 Sep 2020 13:46:01 +0100 Subject: [PATCH 06/14] Decouple runObeliskRhyoliteWidget from config/common/route --- frontend/Rhyolite/Frontend/App.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/Rhyolite/Frontend/App.hs b/frontend/Rhyolite/Frontend/App.hs index 33619a79..190dd1b3 100644 --- a/frontend/Rhyolite/Frontend/App.hs +++ b/frontend/Rhyolite/Frontend/App.hs @@ -302,16 +302,16 @@ runObeliskRhyoliteWidget :: , ToJSON qWire ) => QueryMorphism qFrontend qWire - -> Text -- ^ Typically "config/route", config file containing an http/https URL at which the backend will be served. + -> URI -- ^ http/https URL at which the backend will be served. -> Encoder Identity Identity (R (FullRoute backendRoute frontendRoute)) PageName -- ^ Checked route encoder -> R backendRoute -- ^ The "listen" backend route which is handled by the action produced by 'serveDbOverWebsockets' -> RoutedT t (R frontendRoute) (RhyoliteWidget qFrontend req t m) a -- ^ Child widget -> RoutedT t (R frontendRoute) m a -runObeliskRhyoliteWidget toWire configRoute enc listenRoute child = do +runObeliskRhyoliteWidget toWire route enc listenRoute child = do obR <- askRoute - route <- (fmap . fmap) (parseURI . T.unpack . T.strip . T.decodeUtf8) (getConfig configRoute) >>= \case - Just (Just route) -> pure route - _ -> error "runObeliskRhyoliteWidget: Unable to parse route config" + --route <- (fmap . fmap) (parseURI . T.unpack . T.strip . T.decodeUtf8) (getConfig configRoute) >>= \case + -- Just (Just route) -> pure route + -- _ -> error "runObeliskRhyoliteWidget: Unable to parse route config" let wsUrl = T.pack (show $ websocketUri route) <> renderBackendRoute enc listenRoute lift $ runPrerenderedRhyoliteWidget toWire wsUrl $ runRoutedT child obR From a8a000e07d93d48663820767eac05a72706887e5 Mon Sep 17 00:00:00 2001 From: Tom Smalley Date: Fri, 25 Sep 2020 17:18:18 +0100 Subject: [PATCH 07/14] Bump obelisk with ghcjs assets fix --- .obelisk/impl/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.obelisk/impl/github.json b/.obelisk/impl/github.json index 62166a1f..3a6b03b7 100644 --- a/.obelisk/impl/github.json +++ b/.obelisk/impl/github.json @@ -3,6 +3,6 @@ "repo": "obelisk", "branch": "ts-multiple-domains", "private": false, - "rev": "dea94e88399a1dd42d6d5227608f1510ccef1634", - "sha256": "1z540ksfmqb6gafpx6r5n0hidsjckbg5a2yk6ljpapmnijr06ncw" + "rev": "028d11d1c54efcb78ebd25cd02c0b6420aa6926a", + "sha256": "045v9br6wiff1wg92kdrcvcm0r965k2qawg4y8yx5gbi55kwvn6z" } From 8ca6d2da5178131fe2dac7f38e63556e29c1dfeb Mon Sep 17 00:00:00 2001 From: Tom Smalley Date: Fri, 25 Sep 2020 19:12:19 +0100 Subject: [PATCH 08/14] Fix listen route --- frontend/Rhyolite/Frontend/App.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Rhyolite/Frontend/App.hs b/frontend/Rhyolite/Frontend/App.hs index 190dd1b3..28bc448a 100644 --- a/frontend/Rhyolite/Frontend/App.hs +++ b/frontend/Rhyolite/Frontend/App.hs @@ -48,7 +48,7 @@ import qualified Data.Text.Encoding as T import Data.Text.Encoding (decodeUtf8) import GHC.Generics (Generic) import Obelisk.Route.Frontend (Routed(..), SetRoute(..), RouteToUrl(..)) -import Network.URI (URI, parseURI) +import Network.URI (URI, parseURI, uriPath) import qualified Reflex as R import Data.Witherable (Filterable) import Reflex.Dom.Core hiding (MonadWidget, Request) @@ -312,7 +312,7 @@ runObeliskRhyoliteWidget toWire route enc listenRoute child = do --route <- (fmap . fmap) (parseURI . T.unpack . T.strip . T.decodeUtf8) (getConfig configRoute) >>= \case -- Just (Just route) -> pure route -- _ -> error "runObeliskRhyoliteWidget: Unable to parse route config" - let wsUrl = T.pack (show $ websocketUri route) <> renderBackendRoute enc listenRoute + let wsUrl = T.pack $ show $ (websocketUri route) { uriPath = T.unpack $ T.takeWhile (/= '?') $ renderBackendRoute enc listenRoute } lift $ runPrerenderedRhyoliteWidget toWire wsUrl $ runRoutedT child obR {-# DEPRECATED runPrerenderedRhyoliteWidget "Use runRhyoliteWidget instead" #-} From fe707297eed6894c457aaabb6e14037d5507533f Mon Sep 17 00:00:00 2001 From: Tom Smalley Date: Mon, 19 Oct 2020 19:47:25 +0100 Subject: [PATCH 09/14] Decouple runObeliskRhyoliteWidget RoutedT route from encoder route --- frontend/Rhyolite/Frontend/App.hs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/frontend/Rhyolite/Frontend/App.hs b/frontend/Rhyolite/Frontend/App.hs index 28bc448a..a6338847 100644 --- a/frontend/Rhyolite/Frontend/App.hs +++ b/frontend/Rhyolite/Frontend/App.hs @@ -44,11 +44,10 @@ import Data.Semigroup ((<>)) import Data.Some import Data.Text (Text) import qualified Data.Text as T -import qualified Data.Text.Encoding as T import Data.Text.Encoding (decodeUtf8) import GHC.Generics (Generic) import Obelisk.Route.Frontend (Routed(..), SetRoute(..), RouteToUrl(..)) -import Network.URI (URI, parseURI, uriPath) +import Network.URI (URI, uriPath) import qualified Reflex as R import Data.Witherable (Filterable) import Reflex.Dom.Core hiding (MonadWidget, Request) @@ -305,15 +304,11 @@ runObeliskRhyoliteWidget :: -> URI -- ^ http/https URL at which the backend will be served. -> Encoder Identity Identity (R (FullRoute backendRoute frontendRoute)) PageName -- ^ Checked route encoder -> R backendRoute -- ^ The "listen" backend route which is handled by the action produced by 'serveDbOverWebsockets' - -> RoutedT t (R frontendRoute) (RhyoliteWidget qFrontend req t m) a -- ^ Child widget - -> RoutedT t (R frontendRoute) m a + -> RoutedT t (R route) (RhyoliteWidget qFrontend req t m) a -- ^ Child widget + -> RoutedT t (R route) m a runObeliskRhyoliteWidget toWire route enc listenRoute child = do - obR <- askRoute - --route <- (fmap . fmap) (parseURI . T.unpack . T.strip . T.decodeUtf8) (getConfig configRoute) >>= \case - -- Just (Just route) -> pure route - -- _ -> error "runObeliskRhyoliteWidget: Unable to parse route config" let wsUrl = T.pack $ show $ (websocketUri route) { uriPath = T.unpack $ T.takeWhile (/= '?') $ renderBackendRoute enc listenRoute } - lift $ runPrerenderedRhyoliteWidget toWire wsUrl $ runRoutedT child obR + mapRoutedT (runPrerenderedRhyoliteWidget toWire wsUrl) child {-# DEPRECATED runPrerenderedRhyoliteWidget "Use runRhyoliteWidget instead" #-} runPrerenderedRhyoliteWidget From 5c2755c752ae0812d2685517435694da606e15eb Mon Sep 17 00:00:00 2001 From: Tom Smalley Date: Mon, 19 Oct 2020 19:55:57 +0100 Subject: [PATCH 10/14] Freer runObeliskRhyoliteWidget route --- frontend/Rhyolite/Frontend/App.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/Rhyolite/Frontend/App.hs b/frontend/Rhyolite/Frontend/App.hs index a6338847..88c9f432 100644 --- a/frontend/Rhyolite/Frontend/App.hs +++ b/frontend/Rhyolite/Frontend/App.hs @@ -304,8 +304,8 @@ runObeliskRhyoliteWidget :: -> URI -- ^ http/https URL at which the backend will be served. -> Encoder Identity Identity (R (FullRoute backendRoute frontendRoute)) PageName -- ^ Checked route encoder -> R backendRoute -- ^ The "listen" backend route which is handled by the action produced by 'serveDbOverWebsockets' - -> RoutedT t (R route) (RhyoliteWidget qFrontend req t m) a -- ^ Child widget - -> RoutedT t (R route) m a + -> RoutedT t route (RhyoliteWidget qFrontend req t m) a -- ^ Child widget + -> RoutedT t route m a runObeliskRhyoliteWidget toWire route enc listenRoute child = do let wsUrl = T.pack $ show $ (websocketUri route) { uriPath = T.unpack $ T.takeWhile (/= '?') $ renderBackendRoute enc listenRoute } mapRoutedT (runPrerenderedRhyoliteWidget toWire wsUrl) child From dc21166b44c68313c412d86bfbac95d0f1747b50 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 7 Jan 2022 16:34:54 +0000 Subject: [PATCH 11/14] Bump obelisk --- .obelisk/impl/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.obelisk/impl/github.json b/.obelisk/impl/github.json index 3a6b03b7..2c404724 100644 --- a/.obelisk/impl/github.json +++ b/.obelisk/impl/github.json @@ -3,6 +3,6 @@ "repo": "obelisk", "branch": "ts-multiple-domains", "private": false, - "rev": "028d11d1c54efcb78ebd25cd02c0b6420aa6926a", - "sha256": "045v9br6wiff1wg92kdrcvcm0r965k2qawg4y8yx5gbi55kwvn6z" + "rev": "09f9596b415770fdd4cb8213fa4694c90751df68", + "sha256": "11fax7g30cb9k84bdd39s4gi6qwd1lc99ppd9gmrfadyln9nwfp5" } From 4397f60a5765c532d81cc83495158ccdbf9c3de4 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 29 Apr 2022 12:45:06 +0100 Subject: [PATCH 12/14] Merge obelisk branch with v0.9.0.1 --- .obelisk/impl/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.obelisk/impl/github.json b/.obelisk/impl/github.json index 2c404724..b73395bd 100644 --- a/.obelisk/impl/github.json +++ b/.obelisk/impl/github.json @@ -3,6 +3,6 @@ "repo": "obelisk", "branch": "ts-multiple-domains", "private": false, - "rev": "09f9596b415770fdd4cb8213fa4694c90751df68", - "sha256": "11fax7g30cb9k84bdd39s4gi6qwd1lc99ppd9gmrfadyln9nwfp5" + "rev": "307f33acf4081661fdc0b4f44f30dbc291f08327", + "sha256": "0vxzmxn90wrv55hgqv9md6pyjjrdvxpf970z5wyvx928kgpbs7is" } From 66494cf4b2341b8dcc194d7fd874b2fdc4bde40d Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 2 May 2022 00:13:43 +0100 Subject: [PATCH 13/14] Merge obelisk fork with v0.9.1.0 --- .obelisk/impl/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.obelisk/impl/github.json b/.obelisk/impl/github.json index b73395bd..47a55edd 100644 --- a/.obelisk/impl/github.json +++ b/.obelisk/impl/github.json @@ -3,6 +3,6 @@ "repo": "obelisk", "branch": "ts-multiple-domains", "private": false, - "rev": "307f33acf4081661fdc0b4f44f30dbc291f08327", - "sha256": "0vxzmxn90wrv55hgqv9md6pyjjrdvxpf970z5wyvx928kgpbs7is" + "rev": "2aef601824ebe4c706703663dcfbf01faf0f3603", + "sha256": "0qz2ygv8m0615q7vwymp3dvc44byiqvxwpn1rpc4ibq10169jr5c" } From 3e87370ed237f89012ee81adf3ff585e3afd81c9 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 2 May 2022 01:24:24 +0100 Subject: [PATCH 14/14] Merge obelisk fork with v0.9.2.0 --- .obelisk/impl/github.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.obelisk/impl/github.json b/.obelisk/impl/github.json index 47a55edd..7eb23cc1 100644 --- a/.obelisk/impl/github.json +++ b/.obelisk/impl/github.json @@ -3,6 +3,6 @@ "repo": "obelisk", "branch": "ts-multiple-domains", "private": false, - "rev": "2aef601824ebe4c706703663dcfbf01faf0f3603", - "sha256": "0qz2ygv8m0615q7vwymp3dvc44byiqvxwpn1rpc4ibq10169jr5c" + "rev": "19e4ed403ae476417f207b871b58775638b45dc1", + "sha256": "10iz188m0gazi0bw3svh5kczwkjfa04nkn43xq6kbmbx8b67viv6" }