on master help sign in
34 files changed+342−166
since splitsnapshots
unifiedsplit
.github/pull_request_template.md+2 ChangeLog.md+19−1 README.md+6−3 all-builds.nix+1−1 default.nix+29−16 dep/reflex-platform/github.json+3−3 haskell-overlays/misc-deps.nix+8−2 haskell-overlays/obelisk.nix+4 lib/asset/assets.nix+28−5 lib/backend/obelisk-backend.cabal+1−1 lib/backend/src/Obelisk/Backend.hs+1−1 lib/command/obelisk-command.cabal+1−1 lib/command/src/Obelisk/Command/Deploy.hs+15−15 lib/command/src/Obelisk/Command/Preprocessor.hs+52−47 lib/command/src/Obelisk/Command/Project.hs+10−4 lib/command/src/Obelisk/Command/Run.hs+13−12 lib/command/src/Obelisk/Command/Utils.hs+28−2 lib/command/src/Obelisk/Command/VmBuilder.hs+8−8 lib/executable-config/default.nix+13−2 lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+10−7 lib/executable-config/lookup/src/Obelisk/Configs.hs+31−12 lib/route/obelisk-route.cabal+1 lib/route/src/Obelisk/Route.hs+3−2 lib/route/src/Obelisk/Route/Frontend.hs+22−1 lib/run/obelisk-run.cabal+1−1 lib/run/src/Obelisk/Run.hs+3−3 lib/snap-extras/src/Obelisk/Snap/Extras.hs+1−1 skeleton/.gitignore+12−6 skeleton/backend/backend.cabal+2−2 skeleton/cabal.project+1 skeleton/common/common.cabal+1−1 skeleton/default.nix+10−3 skeleton/frontend/frontend.cabal+2−2 skeleton/shell.nix−1
.github/pull_request_template.md+2
@@ -3,6 +3,8 @@
33I have:
44
55 - [ ] Based work on latest `develop` branch
6+ - [ ] Followed the [contribution guide](https://github.com/obsidiansystems/obelisk/blob/develop/CONTRIBUTING.md#submitting-changes)
67 - [ ] Looked for lint in my changes with `hlint .` (lint found code you did not write can be left alone)
78 - [ ] Run the test suite: `$(nix-build -A selftest --no-out-link)`
9+ - [ ] [Updated the changelog](https://github.com/obsidiansystems/obelisk/blob/develop/CONTRIBUTING.md#in-the-changelog)
810 - [ ] (Optional) Run CI tests locally: `nix-build release.nix -A build.x86_64-linux --no-out-link` (or `x86_64-darwin` on macOS)
ChangeLog.md+19−1
@@ -2,8 +2,26 @@
22
33This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
44
5−## Unreleased
5+## v0.9.1.0
66
7+* [#801](https://github.com/obsidiansystems/obelisk/pull/801): Remove errors and warning for local packages without a library component
8+* [#812](https://github.com/obsidiansystems/obelisk/pull/812): Add support for `NoImplicitPrelude` and other extensions disabled via `No`
9+* Pinned version bumps:
10+ * reflex-platform [0.7.0.0](https://github.com/reflex-frp/reflex-platform/releases/tag/v0.7.0.0)
11+ * hnix 0.8.0
12+* [#787](https://github.com/obsidiansystems/obelisk/pull/787): Set `immutable` cache control directive when serving content-addressed static assets
13+* Use iOS SDK 13.2
14+
15+
16+## v0.9.0.1
17+
18+* ([#810](https://github.com/obsidiansystems/obelisk/pull/810)) Fix loading of `all.js` in fully compiled web apps.
19+
20+## v0.9.0.0
21+
22+* **(Breaking change)** Backport nixpkgs upgrades to ACME/Let's Encrypt handling so that HTTPS deployments continue to work flawlessly. If your deployment is having trouble renewing [Let's Encrypt](https://letsencrypt.org/) certificates, upgrade to this version.
23+ * **IMPORTANT:** In order to use [Let's Encrypt](https://letsencrypt.org/) you must now accept their [terms of service](https://letsencrypt.org/repository/). To do that, add `terms.security.acme.acceptTerms = true;` to the `import ./.obelisk/impl {` section in your `default.nix`. The new skeleton application may serve as an [example](https://github.com/obsidiansystems/obelisk/blob/4759342ab3570888c027d4c58cb5694cb832d624/skeleton/default.nix#L13).
24+* Update reflex-platform dependency to v0.6.0.0
725* ([#715](https://github.com/obsidiansystems/obelisk/pull/715)) In `Obelisk.Route` deprecate `isoEncoder` and `prismEncoder` in favor of more precisely named `viewEncoder` and `reviewEncoder` (respectively) and improve documentation regarding contravariance of `reviewEncoder`.
826* ([#739](https://github.com/obsidiansystems/obelisk/pull/739)) Improve `ob shell` by allowing commands to be passed verbatim after a `--` argument. For example, `ob shell 'run command'` can now be written `ob shell -- run command`.
927* ([#735](https://github.com/obsidiansystems/obelisk/pull/735)) Fix regression causing custom `Prelude`s to break `ob run`/`ob watch`/`ob repl`.
README.md+6−3
@@ -66,7 +66,10 @@ Obelisk assumes basic knowledge of [Haskell](https://www.haskell.org/) and [Refl
6666 sudo launchctl stop org.nixos.nix-daemon
6767 sudo launchctl start org.nixos.nix-daemon
6868 ```
69−1. Install obelisk: `nix-env -f https://github.com/obsidiansystems/obelisk/archive/master.tar.gz -iA command`
69+1. Install obelisk:
70+ ```bash
71+ nix-env -f https://github.com/obsidiansystems/obelisk/archive/master.tar.gz -iA command
72+ ```
7073
7174### Accessing private repositories
7275
@@ -111,7 +114,7 @@ First create a new EC2 instance:
1111141. Launch a NixOS 19.09 EC2 instance (we recommend [this AMI](https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-00a8eeaf232a74f84))
1121151. In the instance configuration wizard ensure that your instance has at least 1GB RAM and 10GB disk space.
1131161. When prompted save your AWS private key (`~/myaws.pem`) somewhere safe. We'll need it later during deployment.
114−1. Go to "Security Groups", select your instance's security group and under "Inbound" tab add a new rule for HTTP port 80 and 443.
117+1. Go to "Security Groups", select your instance's security group and under "Inbound" tab add a new rule for HTTP port 80 and HTTPS port 443.
115118
116119At this stage your instance should be booting and become accessible shortly. Note down the hostname of your EC2 instance.
117120
@@ -218,7 +221,7 @@ Your account must also belong to an Apple Developer Team, if you want to access
2182211. Click accept to authorize on both the computer and the iPhone.
219222
220223##### Xcode
221−Install Xcode 8.2 (contains iOS SDK 10.2) and open it so that it runs its post install tool setup.
224+Install Xcode 11.2 (contains iOS SDK 13.2) and open it so that it runs its post install tool setup.
222225
223226These versions will work out of the box but iOS SDKs prior to 11.3 should also work. You can choose another installed version in `default.nix`
224227
all-builds.nix+1−1
@@ -1,6 +1,6 @@
11{ self-args ? {
22 config.android_sdk.accept_license = true;
3− iosSdkVersion = "10.2";
3+ iosSdkVersion = "13.2";
44 }
55, local-self ? import ./. self-args
66, supportedSystems ? [ builtins.currentSystem ]
default.nix+29−16
@@ -1,7 +1,10 @@
11{ system ? builtins.currentSystem
22, profiling ? false
3−, iosSdkVersion ? "10.2"
3+, iosSdkVersion ? "13.2"
44, config ? {}
5+, terms ? { # Accepted terms, conditions, and licenses
6+ security.acme.acceptTerms = false;
7+ }
58, reflex-platform-func ? import ./dep/reflex-platform
69}:
710let
@@ -43,7 +46,7 @@ in rec {
4346 pathGit = ./.; # Used in CI by the migration graph hash algorithm to correctly ignore files.
4447 path = reflex-platform.filterGit ./.;
4548 obelisk = ghcObelisk;
46− obeliskEnvs = pkgs.lib.filterAttrs (k: _: pkgs.lib.strings.hasPrefix "obelisk-" k) ghcObeliskEnvs;
49+ obeliskEnvs = pkgs.lib.filterAttrs (k: _: k == "tabulation" || pkgs.lib.strings.hasPrefix "obelisk-" k) ghcObeliskEnvs; #TODO: use thunkSet https://github.com/reflex-frp/reflex-platform/pull/671
4750 command = ghcObelisk.obelisk-command;
4851 shell = pinBuildInputs "obelisk-shell" ([command] ++ command.commandRuntimeDeps);
4952
@@ -74,16 +77,20 @@ in rec {
7477 '';
7578
7679 compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" {} ''
77− mkdir $out
78− cd $out
79− # TODO profiling + static shouldn't break and need an ad-hoc workaround like that
80− ln -s "${haskellLib.justStaticExecutables frontend}/bin/frontend.jsexe/all.js" all.unminified.js
81− ${if optimizationLevel == null then ''
82− ln -s all.unminified.js all.js
83− '' else ''
84− ${pkgs.closurecompiler}/bin/closure-compiler --externs "${reflex-platform.ghcjsExternsJs}" -O ${optimizationLevel} --jscomp_warning=checkVars --create_source_map="all.js.map" --source_map_format=V3 --js_output_file="all.js" all.unminified.js
85− echo "//# sourceMappingURL=all.js.map" >> all.js
86− ''}
80+ set -euo pipefail
81+ cd '${haskellLib.justStaticExecutables frontend}'
82+ shopt -s globstar
83+ for f in **/all.js; do
84+ dir="$out/$(basename "$(dirname "$f")")"
85+ mkdir -p "$dir"
86+ ln -s "$(realpath "$f")" "$dir/all.unminified.js"
87+ ${if optimizationLevel == null then ''
88+ ln -s "$dir/all.unminified.js" "$dir/all.js"
89+ '' else ''
90+ '${pkgs.closurecompiler}/bin/closure-compiler' --externs '${reflex-platform.ghcjsExternsJs}' -O '${optimizationLevel}' --jscomp_warning=checkVars --create_source_map="$dir/all.js.map" --source_map_format=V3 --js_output_file="$dir/all.js" "$dir/all.unminified.js"
91+ echo '//# sourceMappingURL=all.js.map' >> "$dir/all.js"
92+ ''}
93+ done
8794 '';
8895
8996 serverModules = {
@@ -110,7 +117,7 @@ in rec {
110117 "${routeHost}".email = adminEmail;
111118 } else {};
112119
113− security.acme.${if enableHttps then "acceptTerms" else null} = true;
120+ security.acme.${if enableHttps && (terms.security.acme.acceptTerms or false) then "acceptTerms" else null} = true;
114121 };
115122
116123 mkObeliskApp =
@@ -127,12 +134,16 @@ in rec {
127134 }: {...}: {
128135 services.nginx = {
129136 enable = true;
137+ recommendedProxySettings = true;
130138 virtualHosts."${routeHost}" = {
131139 enableACME = enableHttps;
132140 forceSSL = enableHttps;
133141 locations.${baseUrl} = {
134142 proxyPass = "http://127.0.0.1:" + toString internalPort;
135143 proxyWebsockets = true;
144+ extraConfig = ''
145+ access_log off;
146+ '';
136147 };
137148 };
138149 };
@@ -173,9 +184,11 @@ in rec {
173184 pkgs.runCommand "serverExe" {} ''
174185 mkdir $out
175186 set -eux
176− ln -s "${if profiling then backend else haskellLib.justStaticExecutables backend}"/bin/* $out/
177− ln -s "${mkAssets assets}" $out/static.assets
178− ln -s ${mkAssets (compressedJs frontend optimizationLevel)} $out/frontend.jsexe.assets
187+ ln -s '${if profiling then backend else haskellLib.justStaticExecutables backend}'/bin/* $out/
188+ ln -s '${mkAssets assets}' $out/static.assets
189+ for d in '${mkAssets (compressedJs frontend optimizationLevel)}'/*/; do
190+ ln -s "$d" "$out"/"$(basename "$d").assets"
191+ done
179192 echo ${version} > $out/version
180193 '';
181194
dep/reflex-platform/github.json+3−3
@@ -1,8 +1,8 @@
11{
22 "owner": "reflex-frp",
33 "repo": "reflex-platform",
4− "branch": "develop",
4+ "branch": "release/0.7.0.0",
55 "private": false,
6− "rev": "c21ec7036c8351185cd2feef9ce577b6a61c4f22",
7− "sha256": "0m4sdpz6qvngralpyprrbvsyi2zmfh2l3q5vhihwfp3842blvbfg"
6+ "rev": "27a7851a780ff21472d85f9a02fb84635ef9027a",
7+ "sha256": "1m4zlw91dpjlbdchjyxhvhv3k7lilm0qa17dhhww868xxc27sann"
88}
haskell-overlays/misc-deps.nix+8−2
@@ -9,8 +9,14 @@ let
99in
1010
1111{
12− hnix = haskellLib.dontCheck (haskellLib.doJailbreak (self.callCabal2nix "hnix" (hackGet ../dep/hnix) {}));
13− hnix-store-core = self.callHackage "hnix-store-core" "0.1.0.0" {};
12+ regex-base = self.callHackage "regex-base" "0.94.0.0" {};
13+ regex-posix = self.callHackage "regex-posix" "0.96.0.0" {};
14+ regex-tdfa = self.callHackage "regex-tdfa" "1.3.1.0" {};
15+ test-framework = haskellLib.dontCheck (self.callHackage "test-framework" "0.8.2.0" {});
16+ hnix = haskellLib.dontCheck (self.callHackage "hnix" "0.8.0" {});
17+ hnix-store-core = self.callHackage "hnix-store-core" "0.2.0.0" {};
18+
19+ aeson-gadt-th = self.callHackage "aeson-gadt-th" "0.2.4" {};
1420
1521 ghcid = self.callCabal2nix "ghcid" (hackGet ../dep/ghcid) {};
1622 # Exports more internals
haskell-overlays/obelisk.nix+4
@@ -19,8 +19,12 @@ in
1919 obelisk-command = haskellLib.overrideCabal (self.callCabal2nix "obelisk-command" (obeliskCleanSource ../lib/command) {}) {
2020 librarySystemDepends = [
2121 pkgs.jre
22+ pkgs.git
2223 pkgs.nix
2324 pkgs.nix-prefetch-git
25+ pkgs.openssh
26+ pkgs.rsync
27+ pkgs.which
2428 (haskellLib.justStaticExecutables self.ghcid)
2529 ];
2630 };
lib/asset/assets.nix+28−5
@@ -20,7 +20,7 @@ zopfliEncodings = file:
2020 nixpkgs.stdenv.mkDerivation {
2121 name = "encodings";
2222
23− input = file;
23+ input = mkPath file;
2424
2525 builder = builtins.toFile "builder.sh" ''
2626 source "$stdenv/setup"
@@ -46,7 +46,7 @@ gzipEncodings = file:
4646 nixpkgs.stdenv.mkDerivation {
4747 name = "encodings";
4848
49− input = file;
49+ input = mkPath file;
5050
5151 builder = builtins.toFile "builder.sh" ''
5252 source "$stdenv/setup"
@@ -70,7 +70,7 @@ noEncodings = file:
7070 nixpkgs.stdenv.mkDerivation {
7171 name = "encodings";
7272
73− input = file;
73+ input = mkPath file;
7474
7575 builder = builtins.toFile "builder.sh" ''
7676 source "$stdenv/setup"
@@ -203,7 +203,7 @@ hashFile = path:
203203 nixpkgs.nix
204204 ];
205205 preferLocalBuild = true;
206− inherit path;
206+ path = mkPath path;
207207 } ''
208208 nix-hash --flat --base32 --type sha256 "$path" | tr -d '\n' >"$out"
209209 '');
@@ -224,7 +224,30 @@ symlink = path: {
224224 inherit path;
225225};
226226
227−# Given a encoding generation function and a file entry resulting from readDirRecursive in the form { name :: String, value: { path :: String } },
227+# Tests if a given character (string of length 1) is valid for a derivation path name.
228+# Passing a string of length other than 1 is undefined.
229+# :: Char -> Bool
230+isValidDrvNameChar = c: "a" <= c && c <= "z" || "A" <= c && c <= "Z" || "0" <= c && c <= "9" || c == "+" || c == "-" || c == "_" || c == "?" || c == "=" || c == ".";
231+
232+# Convert a string into a string that could be used in a derivation name.
233+# replacement lets you choose how to replace invalid characters. It may be any length.
234+# If it contains invalid characters then the result will also be invalid.
235+# :: { str :: String, replacement :: String } -> String
236+mkValidDrvName = { str, replacement ? "?" }:
237+ let
238+ newName = stringAsChars (c: if isValidDrvNameChar c then c else replacement) str;
239+ in if builtins.substring 0 1 newName == "." then "_" + newName else newName;
240+
241+# Like builtins.path but always ensures the name is valid.
242+mkPath = path:
243+ if builtins.typeOf path == "path" # Don't mess with non-paths
244+ then builtins.path {
245+ inherit path;
246+ name = mkValidDrvName { str = builtins.baseNameOf path; };
247+ }
248+ else path;
249+
250+# Given an encoding generation function and a file entry resulting from readDirRecursive in the form { name :: String, value: { path :: String } },
228251# build a DirEntry for dirToPath with the various encodings of the asset for dirToPath to build into a final directory tree.
229252mkAsset = encodings: {name, value}:
230253 let nameWithHash = "${hashFile value.path}-${name}";
lib/backend/obelisk-backend.cabal+1−1
@@ -21,7 +21,7 @@ library
2121 obelisk-frontend,
2222 obelisk-route,
2323 obelisk-snap-extras,
24− reflex-dom,
24+ reflex-dom-core,
2525 snap,
2626 snap-server,
2727 text,
lib/backend/src/Obelisk/Backend.hs+1−1
@@ -58,7 +58,7 @@ import qualified Obelisk.ExecutableConfig.Lookup as Lookup
5858import Obelisk.Frontend
5959import Obelisk.Route
6060import Obelisk.Snap.Extras (doNotCache, serveFileIfExistsAs)
61−import Reflex.Dom
61+import Reflex.Dom.Core
6262import Snap (MonadSnap, Snap, commandLineConfig, defaultConfig, getsRequest, httpServe, modifyResponse
6363 , rqPathInfo, rqQueryString, setContentType, writeBS, writeText
6464 , rqCookies, Cookie(..) , setHeader)
lib/command/obelisk-command.cabal+1−1
@@ -1,5 +1,5 @@
11name: obelisk-command
2−version: 0.8.0.0
2+version: 0.9.0.1
33cabal-version: >= 1.8
44build-type: Simple
55
lib/command/src/Obelisk/Command/Deploy.hs+15−15
@@ -85,13 +85,12 @@ deployInit' thunkPtr (DeployInitOpts deployDir sshKeyPath hostnames route adminE
8585 --accidentally create a production deployment that uses development
8686 --credentials to connect to some resources. This could result in, e.g.,
8787 --production data backed up to a dev environment.
88− withSpinner "Creating project configuration directories" $ do
89− callProcessAndLogOutput (Notice, Error) $
90− proc "mkdir" [ "-p"
91− , deployDir </> "config" </> "backend"
92− , deployDir </> "config" </> "common"
93− , deployDir </> "config" </> "frontend"
94− ]
88+ withSpinner "Creating project configuration directories" $ liftIO $ do
89+ mapM_ (createDirectoryIfMissing True)
90+ [ deployDir </> "config" </> "backend"
91+ , deployDir </> "config" </> "common"
92+ , deployDir </> "config" </> "frontend"
93+ ]
9594
9695 let srcDir = deployDir </> "src"
9796 withSpinner ("Creating source thunk (" <> T.pack (makeRelative deployDir srcDir) <> ")") $ do
@@ -162,8 +161,8 @@ deployPush deployPath getNixBuilders = do
162161 "nix-copy-closure" ["-v", "--to", "--use-substitutes", "root@" <> host, "--gzip", outputPath]
163162 withSpinner "Uploading config" $ ifor_ buildOutputByHost $ \host _ -> do
164163 callProcessAndLogOutput (Notice, Warning) $
165− proc "rsync"
166− [ "-e ssh " <> unwords sshOpts
164+ proc rsyncPath
165+ [ "-e " <> sshPath <> " " <> unwords sshOpts
167166 , "-qarvz"
168167 , deployPath </> "config"
169168 , "root@" <> host <> ":/var/lib/backend"
@@ -171,9 +170,10 @@ deployPush deployPath getNixBuilders = do
171170 --TODO: Create GC root so we're sure our closure won't go away during this time period
172171 withSpinner "Switching to new configuration" $ ifor_ buildOutputByHost $ \host outputPath -> do
173172 callProcessAndLogOutput (Notice, Warning) $
174− proc "ssh" $ sshOpts <>
173+ proc sshPath $ sshOpts <>
175174 [ "root@" <> host
176175 , unwords
176+ -- Note that we don't want to $(staticWhich "nix-env") here, because this is executing on a remote machine
177177 [ "nix-env -p /nix/var/nix/profiles/system --set " <> outputPath
178178 , "&&"
179179 , "/nix/var/nix/profiles/system/bin/switch-to-configuration switch"
@@ -182,10 +182,10 @@ deployPush deployPath getNixBuilders = do
182182 isClean <- checkGitCleanStatus deployPath True
183183 when (not isClean) $ do
184184 withSpinner "Committing changes to Git" $ do
185− callProcessAndLogOutput (Debug, Error) $ proc "git"
186− ["-C", deployPath, "add", "."]
187− callProcessAndLogOutput (Debug, Error) $ proc "git"
188− ["-C", deployPath, "commit", "-m", "New deployment"]
185+ callProcessAndLogOutput (Debug, Error) $
186+ gitProc deployPath ["add", "."]
187+ callProcessAndLogOutput (Debug, Error) $
188+ gitProc deployPath ["commit", "-m", "New deployment"]
189189 putLog Notice $ "Deployed => " <> T.pack route
190190 where
191191 callProcess' envMap cmd args = do
@@ -315,7 +315,7 @@ readDeployConfig deployDir fname = liftIO $ do
315315
316316verifyHostKey :: MonadObelisk m => FilePath -> FilePath -> String -> m ()
317317verifyHostKey knownHostsPath keyPath hostName =
318− callProcessAndLogOutput (Notice, Warning) $ proc "ssh" $
318+ callProcessAndLogOutput (Notice, Warning) $ proc sshPath $
319319 sshArgs knownHostsPath keyPath True <>
320320 [ "root@" <> hostName
321321 , "-o", "NumberOfPasswordPrompts=0"
lib/command/src/Obelisk/Command/Preprocessor.hs+52−47
@@ -5,6 +5,7 @@ module Obelisk.Command.Preprocessor where
55
66import qualified Data.ByteString.Lazy as BL
77import qualified Data.ByteString.Lazy.Builder as BU
8+import Data.Foldable (for_)
89import Data.List (intersperse, isPrefixOf, sortOn)
910import Data.Maybe (fromMaybe)
1011import qualified Data.Text.Lazy.Builder as TL
@@ -17,79 +18,83 @@ import System.FilePath (hasTrailingPathSeparator, joinPath, splitPath)
1718
1819import Obelisk.Command.Run (CabalPackageInfo (..), parseCabalPackage')
1920
21+-- | This code is intended to be executed via ghci's -pgmF preprocessor option.
22+-- The command line arguments are passed in via ghc, which dictates the first three options and meanings
23+-- In order for this code to execute, origPath must contain either a '.' character or a '/' character.
24+-- (This is to avoid the possibility of the command line syntax conflicting with another ob command)
25+-- We do have control over the remaining arguments, but they must be the same for all files.
26+-- Thus, the fourth command line argument must be "apply-packages", which has already been handled.
27+-- We assume all the remaining arguments passed in are paths to cabal or hpack package specifications.
28+-- Thus we must select among the packagePaths for the file we are going to parse.
2029applyPackages :: FilePath -> FilePath -> FilePath -> [FilePath] -> IO ()
21−applyPackages origPath inPath outPath packagePaths' = withFile outPath WriteMode $ \outFile -> do
22− -- This code is intended to be executed via ghci's -pgmF preprocessor option
23− -- The command line arguments are passed in via ghc, which dictates the first three options and meanings
24− -- In order for this code to execute, origPath must contain either a '.' character or a '/' character.
25− -- (This is to avoid the possibility of the command line syntax conflicting with another ob command)
26− -- We do have control over the remaining arguments, but they must be the same for all files.
27− -- Thus, the fourth command line argument must be "apply-packages", which has already been handled.
28− -- We assume all the remaining arguments passed in are paths to cabal or hpack package specifications.
29− -- Thus we must select among the packagePaths for the file we are going to parse.
30−
30+applyPackages origPath inPath outPath packagePaths' = do
3131 origPathCanonical <- canonicalizePath origPath
3232 packagePaths <- traverse canonicalizePath packagePaths'
3333
34− let takeDirs = takeWhile hasTrailingPathSeparator
35− packageDirs = sortOn (negate . length . takeDirs) $ map splitPath packagePaths
36− origDir = splitPath origPathCanonical
37− matches = [ joinPath d | d <- packageDirs, takeDirs d `isPrefixOf` origDir ]
34+ let
35+ takeDirs = takeWhile hasTrailingPathSeparator
36+ packageDirs = sortOn (negate . length . takeDirs) $ map splitPath packagePaths
37+ origDir = splitPath origPathCanonical
38+ matches = [ joinPath d | d <- packageDirs, takeDirs d `isPrefixOf` origDir ]
3839
39− -- So the first element of matches is going to be the deepest path to a package spec that contains
40+ -- The first element of matches is going to be the deepest path to a package spec that contains
4041 -- our file as a subdirectory.
41−
42− case matches of
43− [] ->
42+ packageInfo' <- case matches of
43+ [] -> do
4444 hPutStrLn stderr $ "Error: Unable to find cabal information for " <> origPath <> "; Skipping preprocessor."
45− packagePath:_ -> do
46− parseCabalPackage' packagePath >>= \case
47− Left err ->
48− hPutStrLn stderr $ "Error: Unable to parse cabal package " <> packagePath <> "; Skipping preprocessor on " <> origPath <> ". Error: " <> show err
49− Right (_warnings, packageInfo) ->
50− hPutTextBuilder outFile (generateHeader origPath packageInfo)
45+ pure Nothing
46+ packagePath:_ -> parseCabalPackage' packagePath >>= \case
47+ Left err -> do
48+ hPutStrLn stderr $ "Error: Unable to parse cabal package " <> packagePath <> "; Skipping preprocessor on " <> origPath <> ". Error: " <> show err
49+ pure Nothing
50+ Right (Just (_, packageInfo)) -> pure $ Just packageInfo
51+ Right Nothing -> pure Nothing
5152
52− BL.readFile inPath >>= BL.hPut outFile
53+ writeOutput packageInfo' inPath outPath
5354
55+writeOutput :: Maybe CabalPackageInfo -> FilePath -> FilePath -> IO ()
56+writeOutput packageInfo' origPath outPath = withFile outPath WriteMode $ \hOut -> do
57+ for_ packageInfo' $ \packageInfo -> hPutTextBuilder hOut (generateHeader origPath packageInfo)
58+ BL.readFile origPath >>= BL.hPut hOut
5459 where
5560 hPutTextBuilder h = BU.hPutBuilder h . TL.encodeUtf8Builder . TL.toLazyText
5661
57−
58− -- I'm pretty sure there's a certain amount of oversimplification in CabalPackageInfo, so I doubt this is fully robust.
59−
6062generateHeader :: FilePath -> CabalPackageInfo -> TL.Builder
6163generateHeader origPath packageInfo =
6264 hsExtensions <> ghcOptions <> lineNumberPragma origPath
6365 where
6466 hsExtensions =
65− if not (null extList)
66− then TL.fromText "{-# LANGUAGE "
67− <> mconcat (intersperse (TL.fromText ", ") extList)
68− <> TL.fromText " #-}\n"
69− else mempty
67+ if null extList
68+ then mempty
69+ else pragma $ TL.fromText "LANGUAGE " <> mconcat (intersperse (TL.fromText ", ") extList)
7070 extList = addDefaultLanguage $ concatMap showExt $ _cabalPackageInfo_defaultExtensions packageInfo
7171 addDefaultLanguage =
7272 case _cabalPackageInfo_defaultLanguage packageInfo of
7373 Nothing -> id
7474 Just x -> case x of
75− UnknownLanguage ext -> ( TL.fromString ext :)
76− ext -> ( TL.fromString (show ext) :)
75+ UnknownLanguage ext -> (TL.fromString ext :)
76+ ext -> (TL.fromString (show ext) :)
7777 showExt = \case
7878 EnableExtension ext -> [TL.fromString (show ext)]
79− DisableExtension _ -> []
79+ DisableExtension ext -> ["No" <> TL.fromString (show ext)]
8080 UnknownExtension ext -> [TL.fromString ext]
8181
8282 ghcOptions =
83− if not (null optList)
84− then TL.fromText "{-# OPTIONS_GHC "
85− <> mconcat (intersperse (TL.fromText " ") optList)
86− <> TL.fromText " #-}\n"
87− else mempty
88− optList = map TL.fromString
89− $ filter (not . isPrefixOf "-O")
90− $ fromMaybe []
91− $ lookup GHC (_cabalPackageInfo_compilerOptions packageInfo)
83+ if null optList
84+ then mempty
85+ else pragma $
86+ TL.fromText "OPTIONS_GHC " <> mconcat (intersperse (TL.fromText " ") (map TL.fromString optList))
87+ ghcOptList
88+ = filter (not . isPrefixOf "-O")
89+ $ fromMaybe []
90+ $ lookup GHC (_cabalPackageInfo_compilerOptions packageInfo)
91+ optList = _cabalPackageInfo_cppOptions packageInfo <> ghcOptList
9292
9393lineNumberPragma :: FilePath -> TL.Builder
94−lineNumberPragma origPath =
95− TL.fromText "{-# LINE 1 \"" <> TL.fromString origPath <> TL.fromText "\" #-}\n"
94+lineNumberPragma origPath = pragma $ TL.fromText "LINE 1 " <> quoted '"' (TL.fromString origPath)
95+
96+pragma :: TL.Builder -> TL.Builder
97+pragma x = TL.fromText "{-# " <> x <> TL.fromText " #-}\n"
98+
99+quoted :: Char -> TL.Builder -> TL.Builder
100+quoted char x = TL.singleton char <> x <> TL.singleton char
lib/command/src/Obelisk/Command/Project.hs+10−4
@@ -51,7 +51,7 @@ import Obelisk.App (MonadObelisk)
5151import Obelisk.CliApp
5252import Obelisk.Command.Nix
5353import Obelisk.Command.Thunk
54−import Obelisk.Command.Utils (nixBuildExePath, nixExePath, toNixPath)
54+import Obelisk.Command.Utils (nixBuildExePath, nixExePath, toNixPath, cp, nixShellPath)
5555
5656--TODO: Make this module resilient to random exceptions
5757
@@ -116,7 +116,7 @@ initProject source force = withSystemTempDirectory "ob-init" $ \tmpDir -> do
116116 skel <- nixBuildAttrWithCache implDir "skeleton" --TODO: I don't think there's actually any reason to cache this
117117
118118 callProcessAndLogOutput (Notice, Error) $
119− proc "cp"
119+ proc cp
120120 [ "-r"
121121 , "--preserve=links"
122122 , obDir
@@ -126,7 +126,7 @@ initProject source force = withSystemTempDirectory "ob-init" $ \tmpDir -> do
126126
127127 withSpinner "Copying project skeleton" $ do
128128 callProcessAndLogOutput (Notice, Error) $
129− proc "cp"
129+ proc cp
130130 [ "-r"
131131 , "--no-preserve=mode"
132132 , "-T"
@@ -137,6 +137,12 @@ initProject source force = withSystemTempDirectory "ob-init" $ \tmpDir -> do
137137 let configDir = "config"
138138 createDirectoryIfMissing False configDir
139139 mapM_ (createDirectoryIfMissing False . (configDir </>)) ["backend", "common", "frontend"]
140+ putLog Notice $ T.intercalate "\n"
141+ [ "An obelisk project has been successfully initialized. Next steps:"
142+ , " 'ob run': Start a development server"
143+ , " 'ob watch': Watch for changes without starting a server"
144+ , " 'ob repl': Load your project into GHCi"
145+ ]
140146
141147callHandoffOb
142148 :: MonadObelisk m
@@ -292,7 +298,7 @@ bashEscape :: String -> String
292298bashEscape = BSU.toString . bytes . bash . BSU.fromString
293299
294300nixShellRunProc :: NixShellConfig -> ProcessSpec
295−nixShellRunProc cfg = setDelegateCtlc True $ proc "nix-shell" $ runNixShellConfig cfg
301+nixShellRunProc cfg = setDelegateCtlc True $ proc nixShellPath $ runNixShellConfig cfg
296302
297303nixShellWithoutPkgs
298304 :: MonadObelisk m
lib/command/src/Obelisk/Command/Run.hs+13−12
@@ -14,7 +14,7 @@ module Obelisk.Command.Run where
1414import Control.Arrow ((&&&))
1515import Control.Exception (Exception, bracket)
1616import Control.Lens (ifor, (.~), (&))
17−import Control.Monad (filterM, unless)
17+import Control.Monad (filterM)
1818import Control.Monad.Except (runExceptT, throwError)
1919import Control.Monad.IO.Class (liftIO)
2020import Control.Monad.Reader (MonadIO)
@@ -46,7 +46,7 @@ import Distribution.Compiler (CompilerFlavor(..))
4646import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
4747import Distribution.Parsec.ParseResult (runParseResult)
4848import qualified Distribution.System as Dist
49−import Distribution.Types.BuildInfo (buildable, defaultExtensions, defaultLanguage, hsSourceDirs, options)
49+import Distribution.Types.BuildInfo (buildable, cppOptions, defaultExtensions, defaultLanguage, hsSourceDirs, options)
5050import Distribution.Types.CondTree (simplifyCondTree)
5151import Distribution.Types.GenericPackageDescription (ConfVar (Arch, Impl, OS), condLibrary)
5252import Distribution.Types.Library (libBuildInfo)
@@ -94,6 +94,8 @@ data CabalPackageInfo = CabalPackageInfo
9494 -- ^ List of globally set languages of the library component
9595 , _cabalPackageInfo_compilerOptions :: [(CompilerFlavor, [String])]
9696 -- ^ List of compiler-specific options (e.g., the "ghc-options" field of the cabal file)
97+ , _cabalPackageInfo_cppOptions :: [String]
98+ -- ^ List of CPP (C Preprocessor) options (e.g. the "cpp-options" field of the cabal file)
9799 }
98100
99101-- | 'Bool' with a better name for its purpose.
@@ -302,15 +304,16 @@ parseCabalPackage
302304 -> m (Maybe CabalPackageInfo)
303305parseCabalPackage dir = parseCabalPackage' dir >>= \case
304306 Left err -> Nothing <$ putLog Error err
305− Right (warnings, pkgInfo) -> do
307+ Right (Just (warnings, pkgInfo)) -> do
306308 for_ warnings $ putLog Warning . T.pack . show
307309 pure $ Just pkgInfo
310+ Right Nothing -> pure Nothing
308311
309312-- | Like 'parseCabalPackage' but returns errors and warnings directly so as to avoid 'MonadObelisk'.
310313parseCabalPackage'
311314 :: (MonadIO m)
312315 => FilePath -- ^ Package directory
313− -> m (Either T.Text ([Dist.PWarning], CabalPackageInfo))
316+ -> m (Either T.Text (Maybe ([Dist.PWarning], CabalPackageInfo)))
314317parseCabalPackage' pkg = runExceptT $ do
315318 (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
316319 Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
@@ -338,7 +341,7 @@ parseCabalPackage' pkg = runExceptT $ do
338341 case condLibrary <$> result of
339342 Right (Just condLib) -> do
340343 let (_, lib) = simplifyCondTree evalConfVar condLib
341− pure $ (warnings,) $ CabalPackageInfo
344+ pure $ Just $ (warnings,) $ CabalPackageInfo
342345 { _cabalPackageInfo_packageName = T.pack packageName
343346 , _cabalPackageInfo_packageFile = packageFile
344347 , _cabalPackageInfo_packageRoot = takeDirectory packageFile
@@ -350,18 +353,19 @@ parseCabalPackage' pkg = runExceptT $ do
350353 , _cabalPackageInfo_defaultLanguage =
351354 defaultLanguage $ libBuildInfo lib
352355 , _cabalPackageInfo_compilerOptions = options $ libBuildInfo lib
356+ , _cabalPackageInfo_cppOptions = cppOptions $ libBuildInfo lib
353357 }
354− Right Nothing -> throwError "Haskell package has no library component"
358+ Right Nothing -> pure Nothing
355359 Left (_, errors) ->
356360 throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
357361
358362parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
359363parsePackagesOrFail dirs' = do
360− (pkgDirErrs, packageInfos') <- fmap partitionEithers $ for dirs $ \dir -> do
364+ packageInfos' <- fmap catMaybes $ for dirs $ \dir -> do
361365 flip fmap (parseCabalPackage dir) $ \case
362366 Just packageInfo
363− | _cabalPackageInfo_buildable packageInfo -> Right packageInfo
364− _ -> Left dir
367+ | _cabalPackageInfo_buildable packageInfo -> Just packageInfo
368+ _ -> Nothing
365369
366370 -- Sort duplicate packages such that we prefer shorter paths, but fall back to alphabetical ordering.
367371 let packagesByName = Map.map (NE.sortBy $ comparing $ \p -> let n = _cabalPackageInfo_packageFile p in (length n, n))
@@ -383,9 +387,6 @@ parsePackagesOrFail dirs' = do
383387 "No valid, buildable packages found" <> (if null dirs then "" else " in " <> intercalate ", " dirs)
384388 Just xs -> pure xs
385389
386− unless (null pkgDirErrs) $
387− putLog Warning $ T.pack $ "Failed to find buildable packages in " <> intercalate ", " pkgDirErrs
388−
389390 pure packageInfos
390391 where
391392 dirs = toList dirs'
lib/command/src/Obelisk/Command/Utils.hs+28−2
@@ -60,6 +60,32 @@ nixPrefetchGitPath = $(staticWhich "nix-prefetch-git")
6060nixPrefetchUrlPath :: FilePath
6161nixPrefetchUrlPath = $(staticWhich "nix-prefetch-url")
6262
63+nixShellPath :: FilePath
64+nixShellPath = $(staticWhich "nix-shell")
65+
66+rsyncPath :: FilePath
67+rsyncPath = $(staticWhich "rsync")
68+
69+sshPath :: FilePath
70+sshPath = $(staticWhich "ssh")
71+
72+gitPath :: FilePath
73+gitPath = $(staticWhich "git")
74+
75+whichPath :: FilePath
76+whichPath = $(staticWhich "which")
77+
78+sshKeygenPath :: FilePath
79+sshKeygenPath = $(staticWhich "ssh-keygen")
80+
81+-- $(staticWhich "docker") was intentionally omitted, at least for now
82+-- One concern is that I don't know how particular docker is about having the
83+-- CLI exe match the version of the docker daemon, which is largely outside of
84+-- the control of obelisk-command.
85+-- TODO: Investigate the tradeoffs associated with this choice
86+dockerPath :: FilePath
87+dockerPath = "docker"
88+
6389-- | Nix syntax requires relative paths to be prefixed by @./@ or
6490-- @../@. This will make a 'FilePath' that can be embedded in a Nix
6591-- expression.
@@ -97,7 +123,7 @@ initGit repo = do
97123 git ["commit", "-m", "Initial commit."]
98124
99125gitProcNoRepo :: [String] -> ProcessSpec
100−gitProcNoRepo args = setEnvOverride (M.singleton "GIT_TERMINAL_PROMPT" "0" <>) $ proc "git" args
126+gitProcNoRepo args = setEnvOverride (M.singleton "GIT_TERMINAL_PROMPT" "0" <>) $ proc gitPath args
101127
102128gitProc :: FilePath -> [String] -> ProcessSpec
103129gitProc repo = gitProcNoRepo . runGitInDir
@@ -114,7 +140,7 @@ isolateGitProc = setEnvOverride (overrides <>)
114140 , ("GIT_CONFIG_NOSYSTEM", "1")
115141 , ("GIT_TERMINAL_PROMPT", "0") -- git 2.3+
116142 , ("GIT_ASKPASS", "echo") -- pre git 2.3 to just use empty password
117− , ("GIT_SSH_COMMAND", "ssh -o PreferredAuthentications password -o PubkeyAuthentication no -o GSSAPIAuthentication no")
143+ , ("GIT_SSH_COMMAND", "ssh -o PreferredAuthentications=password -o PubkeyAuthentication=no -o GSSAPIAuthentication=no")
118144 ]
119145
120146-- | Recursively copy a directory using `cp -a` -- TODO: Should use -rT instead of -a
lib/command/src/Obelisk/Command/VmBuilder.hs+8−8
@@ -21,7 +21,7 @@ import qualified System.Info
2121
2222import Obelisk.App (MonadObelisk, getObeliskUserStateDir)
2323import Obelisk.CliApp
24−import Obelisk.Command.Utils (rmPath)
24+import Obelisk.Command.Utils (rmPath, whichPath, sshKeygenPath, nixBuildExePath, dockerPath)
2525
2626-- | Generate the `--builders` argument string to enable the VM builder after ensuring it is available.
2727getNixBuildersArg :: MonadObelisk m => m String
@@ -35,7 +35,7 @@ getNixBuildersArg = do
3535
3636checkForNixDarwin :: MonadObelisk m => String -> m ()
3737checkForNixDarwin sshIdFile = do
38− (exitCode, _, _) <- readCreateProcessWithExitCode $ proc "which" ["darwin-rebuild"]
38+ (exitCode, _, _) <- readCreateProcessWithExitCode $ proc whichPath ["darwin-rebuild"]
3939 unless (exitCode == ExitSuccess) $ failWith $ T.intercalate "\n"
4040 [ "Deployments from macOS require nix-darwin to be installed."
4141 , "Follow the installation instructions here: https://github.com/LnL7/nix-darwin"
@@ -67,7 +67,7 @@ containerExists :: MonadObelisk m => FilePath -> m Bool
6767containerExists stateDir = handle (\(_ :: IOError) -> failWith needDockerMsg) $ do
6868 containerNames <- fmap (map T.strip . T.lines) $
6969 readProcessAndLogStderr Error $
70− proc "docker" ["container", "list", "--all", "--format", "{{.Names}}"]
70+ proc dockerPath ["container", "list", "--all", "--format", "{{.Names}}"]
7171 let exists = containerName `elem` containerNames
7272 when exists $ testLinuxBuild stateDir
7373 pure exists
@@ -85,7 +85,7 @@ containerSshPort = 2222
8585startContainer :: MonadObelisk m => m ()
8686startContainer = withSpinner "Starting VM builder" $
8787 callProcessAndLogOutput (Debug, Debug) $
88− proc "docker" ["start", containerName]
88+ proc dockerPath ["start", containerName]
8989
9090-- | Creates the Docker container; assumes it does not exist.
9191setupNixDocker :: MonadObelisk m => FilePath -> m ()
@@ -98,12 +98,12 @@ setupNixDocker stateDir = withSpinner ("Creating Docker container named " <> con
9898 callProcessAndLogOutput (Debug, Error) $
9999 proc rmPath ["-f", stateDir </> sshKeyFileName, stateDir </> sshKeyFileName <.> "pub"]
100100 callProcessAndLogOutput (Debug, Error) $
101− proc "ssh-keygen" ["-t", "ed25519", "-f", stateDir </> sshKeyFileName, "-P", ""]
101+ proc sshKeygenPath ["-t", "ed25519", "-f", stateDir </> sshKeyFileName, "-P", ""]
102102
103103 -- Build the docker container (which uses the SSH keys in the 'ssh' folder)
104104 containerId <- fmap T.strip $ readProcessAndLogStderr Error $
105− proc "docker" ["build", stateDir, "--quiet"]
106− callProcessAndLogOutput (Debug, Error) $ proc "docker"
105+ proc dockerPath ["build", stateDir, "--quiet"]
106+ callProcessAndLogOutput (Debug, Error) $ proc dockerPath
107107 [ "run"
108108 , "--restart", "always"
109109 , "--detach"
@@ -155,7 +155,7 @@ testLinuxBuild :: MonadObelisk m => FilePath -> m ()
155155testLinuxBuild stateDir
156156 | System.Info.os == "linux" = failWith "Using the docker builder is not necessary on linux."
157157 | otherwise = do
158− (exitCode, _stdout, stderr) <- readCreateProcessWithExitCode $ proc "nix-build"
158+ (exitCode, _stdout, stderr) <- readCreateProcessWithExitCode $ proc nixBuildExePath
159159 [ "--no-out-link"
160160 , "-E", "(import <nixpkgs> { system = \"x86_64-linux\"; }).writeText \"test\" builtins.currentTime"
161161 , "--builders", nixBuildersArgString stateDir
lib/executable-config/default.nix+13−2
@@ -25,8 +25,19 @@ let
2525in
2626
2727{
28− haskellOverlay = self: super: {
29− obelisk-executable-config-lookup = self.callCabal2nix "obelisk-executable-config-lookup" (obeliskCleanSource ./lookup) {};
28+ haskellOverlay = self: super:
29+ let
30+ pkgs = self.callPackage ({pkgs}: pkgs) {};
31+ in {
32+ obelisk-executable-config-lookup = pkgs.haskell.lib.overrideCabal
33+ (self.callCabal2nix "obelisk-executable-config-lookup" (obeliskCleanSource ./lookup) {})
34+ (drv: {
35+ # Hack until https://github.com/NixOS/cabal2nix/pull/432 lands
36+ libraryHaskellDepends = (drv.libraryHaskellDepends or [])
37+ ++ pkgs.stdenv.lib.optionals (with pkgs.stdenv.hostPlatform; isAndroid && is32bit) [
38+ self.android-activity
39+ ];
40+ });
3041 };
3142
3243 platforms = {
lib/executable-config/lookup/obelisk-executable-config-lookup.cabal+10−7
@@ -31,15 +31,18 @@ library
3131 base64-bytestring,
3232 bytestring,
3333 containers,
34+ exceptions,
3435 filepath,
35− text,
36− transformers,
37− transformers-base,
38− ref-tf,
39− primitive,
36+ jsaddle,
37+ mmorph,
4038 monad-control,
39+ mtl,
40+ primitive,
41+ ref-tf,
42+ reflex-dom-core,
4143 reflex,
42− reflex-dom,
43− jsaddle
44+ text,
45+ transformers-base,
46+ transformers
4447
4548 ghc-options: -Wall
lib/executable-config/lookup/src/Obelisk/Configs.hs+31−12
@@ -18,24 +18,38 @@ module Obelisk.Configs
1818 , getTextConfig
1919 ) where
2020
21−import Control.Applicative
22−import Control.Monad
23−import Control.Monad.Base
24−import Control.Monad.Fix
25−import Control.Monad.Primitive
26−import Control.Monad.Ref
27−import Control.Monad.IO.Class
28−import Control.Monad.Trans.Class
29−import Control.Monad.Trans.Control
30−import Control.Monad.Trans.Reader
21+import Control.Applicative (Alternative)
22+import Control.Monad (MonadPlus)
23+import Control.Monad.Base (MonadBase)
24+import Control.Monad.Catch (MonadThrow)
25+import Control.Monad.Fail (MonadFail)
26+import Control.Monad.Fix (MonadFix)
27+import Control.Monad.IO.Class (MonadIO)
28+import Control.Monad.Morph (MFunctor)
29+import Control.Monad.Primitive (PrimMonad, PrimState, primitive)
30+import Control.Monad.Ref (MonadRef)
31+import Control.Monad.Trans (MonadTrans, lift)
32+import Control.Monad.Trans.Control (MonadBaseControl)
33+import Control.Monad.Trans.Reader (ReaderT (..), ask, mapReaderT)
34+import Control.Monad.Trans.State (StateT)
35+import qualified Control.Monad.Trans.State.Strict as Strict
3136import Data.ByteString (ByteString)
3237import Data.Map (Map)
3338import qualified Data.Map as Map
3439import Data.Text (Text)
3540import qualified Data.Text.Encoding as T
3641import Reflex
37−import Reflex.Host.Class
38−import Reflex.Dom
42+import Reflex.Host.Class (MonadReflexCreateTrigger)
43+import Reflex.Dom.Core
44+ ( DomBuilder
45+ , DomRenderHook
46+ , HasDocument
47+ , HasJS
48+ , HasJSContext
49+ , Prerender (Client)
50+ , StaticDomBuilderT
51+ , prerender
52+ )
3953#ifndef ghcjs_HOST_OS
4054import Language.Javascript.JSaddle (MonadJSM)
4155#endif
@@ -62,6 +76,8 @@ instance HasConfigs m => HasConfigs (PostBuildT t m)
6276instance HasConfigs m => HasConfigs (QueryT t q m)
6377instance HasConfigs m => HasConfigs (ReaderT r m)
6478instance HasConfigs m => HasConfigs (RequesterT t request response m)
79+instance HasConfigs m => HasConfigs (StateT w m)
80+instance HasConfigs m => HasConfigs (Strict.StateT w m)
6581instance HasConfigs m => HasConfigs (StaticDomBuilderT t m)
6682instance HasConfigs m => HasConfigs (TriggerEventT t m)
6783
@@ -72,12 +88,15 @@ newtype ConfigsT m a = ConfigsT { unConfigsT :: ReaderT (Map Text ByteString) m
7288 , Monad
7389 , MonadPlus
7490 , Alternative
91+ , MonadFail
7592 , MonadFix
93+ , MonadThrow
7694 , MonadIO
7795 , MonadBase m'
7896 , MonadBaseControl m'
7997 , MonadRef
8098 , MonadTrans
99+ , MFunctor
81100 , DomBuilder t
82101 , MonadHold t
83102 , MonadReflexCreateTrigger t
lib/route/obelisk-route.cabal+1
@@ -20,6 +20,7 @@ library
2020 http-types,
2121 jsaddle,
2222 lens,
23+ mmorph,
2324 monad-control,
2425 mtl,
2526 network-uri,
lib/route/src/Obelisk/Route.hs+3−2
@@ -170,6 +170,7 @@ import Data.Text (Text)
170170import qualified Data.Text as T
171171import qualified Data.Text.Encoding as T
172172import Data.Text.Lens (IsText, packed, unpacked)
173+import Data.Type.Equality
173174import Data.Universe
174175import Data.Universe.Some
175176import Network.HTTP.Types.URI
@@ -1038,8 +1039,8 @@ someSumEncoder = Encoder $ pure $ EncoderImpl
10381039
10391040data Void1 :: * -> * where {}
10401041
1041−instance Universe (Some Void1) where
1042− universe = []
1042+instance UniverseSome Void1 where
1043+ universeSome = []
10431044
10441045void1Encoder :: (Applicative check, MonadError Text parse) => Encoder check parse (Some Void1) a
10451046void1Encoder = Encoder $ pure $ EncoderImpl
lib/route/src/Obelisk/Route/Frontend.hs+22−1
@@ -62,6 +62,7 @@ import Control.Category.Cartesian ((&&&))
6262import Control.Lens hiding (Bifunctor, bimap, universe, element)
6363import Control.Monad ((<=<))
6464import Control.Monad.Fix
65+import Control.Monad.Morph
6566import Control.Monad.Primitive
6667import Control.Monad.Reader
6768import Control.Monad.Ref
@@ -108,7 +109,23 @@ instance Monad m => Routed t r (RoutedT t r m) where
108109instance (Monad m, Routed t r m) => Routed t r (ReaderT r' m)
109110
110111newtype RoutedT t r m a = RoutedT { unRoutedT :: ReaderT (Dynamic t r) m a }
111− deriving (Functor, Applicative, Monad, MonadFix, MonadTrans, NotReady t, MonadHold t, MonadSample t, PostBuild t, TriggerEvent t, MonadIO, MonadReflexCreateTrigger t, HasDocument, DomRenderHook t)
112+ deriving
113+ ( Functor
114+ , Applicative
115+ , Monad
116+ , MonadFix
117+ , MonadTrans
118+ , MFunctor
119+ , NotReady t
120+ , MonadHold t
121+ , MonadSample t
122+ , PostBuild t
123+ , TriggerEvent t
124+ , MonadIO
125+ , MonadReflexCreateTrigger t
126+ , HasDocument
127+ , DomRenderHook t
128+ )
112129
113130instance MonadReader r' m => MonadReader r' (RoutedT t r m) where
114131 ask = lift ask
@@ -184,6 +201,10 @@ instance (Monad m, RouteToUrl r m) => RouteToUrl r (EventWriterT t w m)
184201
185202instance (Monad m, SetRoute t r m) => SetRoute t r (EventWriterT t w m)
186203
204+instance (Monad m, RouteToUrl r m) => RouteToUrl r (DynamicWriterT t w m)
205+
206+instance (Monad m, SetRoute t r m) => SetRoute t r (DynamicWriterT t w m)
207+
187208runRoutedT :: RoutedT t r m a -> Dynamic t r -> m a
188209runRoutedT = runReaderT . unRoutedT
189210
lib/run/obelisk-run.cabal+1−1
@@ -33,7 +33,7 @@ library
3333 , process
3434 , ref-tf
3535 , reflex
36− , reflex-dom
36+ , reflex-dom-core
3737 , snap-core
3838 , streaming-commons
3939 , text
lib/run/src/Obelisk/Run.hs+3−3
@@ -144,9 +144,9 @@ runWidget conf configs frontend validFullEncoder = do
144144
145145 cert <- X509.newX509 >>= X509Request.makeX509FromReq certRequest
146146 _ <- X509.setPublicKey cert privateKey
147− now <- getCurrentTime
148− _ <- X509.setNotBefore cert $ addUTCTime (-1) now
149− _ <- X509.setNotAfter cert $ addUTCTime (365 * 24 * 60 * 60) now
147+ timenow <- getCurrentTime
148+ _ <- X509.setNotBefore cert $ addUTCTime (-1) timenow
149+ _ <- X509.setNotAfter cert $ addUTCTime (365 * 24 * 60 * 60) timenow
150150 _ <- X509.signX509 cert privateKey Nothing
151151
152152 certByteString <- BSUTF8.fromString <$> PEM.writeX509 cert
lib/snap-extras/src/Obelisk/Snap/Extras.hs+1−1
@@ -17,7 +17,7 @@ import System.Directory
1717-- | Set response header for "permanent" caching
1818cachePermanently :: MonadSnap m => m ()
1919cachePermanently = do
20− modifyResponse $ setHeader "Cache-Control" "public, max-age=315360000"
20+ modifyResponse $ setHeader "Cache-Control" "public, max-age=315360000, immutable"
2121 modifyResponse $ setHeader "Expires" "Tue, 01 Feb 2050 00:00:00 GMT" --TODO: This should be set to "approximately one year from the time the response is sent"
2222
2323-- | Set response header to not cache
skeleton/.gitignore+12−6
@@ -1,9 +1,15 @@
1−dist-newstyle
2−result
3−result-*
4−result-android
5−result-ios
6−result-exe
71.attr-cache
2+.cabal-sandbox
3+*.hi
4+*.o
5+cabal.project.local
6+cabal.sandbox.config
7+ctags
8+dist-newstyle/
9+dist/
810ghcid-output.txt
911profile/
12+result
13+result-*
14+tags
15+TAGS
skeleton/backend/backend.cabal+2−2
@@ -14,12 +14,12 @@ library
1414 , obelisk-route
1515 exposed-modules:
1616 Backend
17− ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
17+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O -fno-show-valid-hole-fits
1818
1919executable backend
2020 main-is: main.hs
2121 hs-source-dirs: src-bin
22− ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
22+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O -threaded -fno-show-valid-hole-fits
2323 if impl(ghcjs)
2424 buildable: False
2525 build-depends: base
skeleton/cabal.project+1
@@ -1,2 +1,3 @@
11optional-packages:
22 *
3+write-ghc-environment-files: never
skeleton/common/common.cabal+1−1
@@ -12,4 +12,4 @@ library
1212 exposed-modules:
1313 Common.Api
1414 Common.Route
15− ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
15+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O -fno-show-valid-hole-fits
skeleton/default.nix+10−3
@@ -1,10 +1,17 @@
1−{ obelisk ? import ./.obelisk/impl {
2− system = builtins.currentSystem;
3− iosSdkVersion = "10.2";
1+{ system ? builtins.currentSystem
2+, obelisk ? import ./.obelisk/impl {
3+ inherit system;
4+ iosSdkVersion = "13.2";
5+
46 # You must accept the Android Software Development Kit License Agreement at
57 # https://developer.android.com/studio/terms in order to build Android apps.
68 # Uncomment and set this to `true` to indicate your acceptance:
79 # config.android_sdk.accept_license = false;
10+
11+ # In order to use Let's Encrypt for HTTPS deployments you must accept
12+ # their terms of service at https://letsencrypt.org/repository/.
13+ # Uncomment and set this to `true` to indicate your acceptance:
14+ # terms.security.acme.acceptTerms = false;
815 }
916}:
1017with obelisk;
skeleton/frontend/frontend.cabal+2−2
@@ -16,7 +16,7 @@ library
1616 , text
1717 exposed-modules:
1818 Frontend
19− ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O
19+ ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -O -fno-show-valid-hole-fits
2020
2121executable frontend
2222 main-is: main.hs
@@ -28,7 +28,7 @@ executable frontend
2828 , reflex-dom
2929 , obelisk-generated-static
3030 , frontend
31− ghc-options: -threaded -O -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates
31+ ghc-options: -threaded -O -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -fno-show-valid-hole-fits
3232 if impl(ghcjs)
3333 ghc-options: -dedupe
3434 cpp-options: -DGHCJS_BROWSER
skeleton/shell.nixdeleted−1
@@ -1 +0,0 @@
1−(import ./. {}).shells.ghc