elm-pages 3.0.0-beta.2 → 3.0.0-beta.20

package/src/Pages/Internal/Platform.elm

@@ -45,11 +45,6 @@ import Time
 import Url exposing (Url)
 
 
-type Transition
-    = Loading Int Path
-    | Submitting FormData
-
-
 {-| -}
 type alias Program userModel userMsg pageData actionData sharedData errorPage =
     Platform.Program Flags (Model userModel pageData actionData sharedData) (Msg userMsg pageData actionData sharedData errorPage)
@@ -423,16 +418,14 @@ update config appMsg model =
                         )
 
                     else
-                        ( { model
-                            | url = url
-                          }
+                        ( model
                         , NoEffect
                         )
                             -- TODO is it reasonable to always re-fetch route data if you re-navigate to the current route? Might be a good
                             -- parallel to the browser behavior
                             |> startNewGetLoad url (UpdateCacheAndUrlNew True url Nothing)
 
-        FetcherComplete forPageReload fetcherKey transitionId___ userMsgResult ->
+        FetcherComplete _ fetcherKey _ userMsgResult ->
             case userMsgResult of
                 Ok ( userMsg, maybeFetcherDoneActionData ) ->
                     ( { model
@@ -605,27 +598,32 @@ update config appMsg model =
                                 , actionData = newActionData
                                 }
 
-                            ( userModel, _ ) =
+                            ( userModel, userEffect ) =
                                 -- TODO if urlWithoutRedirectResolution is different from the url with redirect resolution, then
                                 -- instead of calling update, call pushUrl (I think?)
                                 -- TODO include user Cmd
-                                config.update model.pageFormState
-                                    (model.inFlightFetchers |> toFetcherState)
-                                    (model.transition |> Maybe.map Tuple.second)
-                                    newSharedData
-                                    newPageData
-                                    model.key
-                                    (config.onPageChange
-                                        { protocol = model.url.protocol
-                                        , host = model.url.host
-                                        , port_ = model.url.port_
-                                        , path = urlPathToPath urlWithoutRedirectResolution
-                                        , query = urlWithoutRedirectResolution.query
-                                        , fragment = urlWithoutRedirectResolution.fragment
-                                        , metadata = config.urlToRoute urlWithoutRedirectResolution
-                                        }
-                                    )
-                                    previousPageData.userModel
+                                if stayingOnSamePath then
+                                    ( previousPageData.userModel, NoEffect )
+
+                                else
+                                    config.update model.pageFormState
+                                        (model.inFlightFetchers |> toFetcherState)
+                                        (model.transition |> Maybe.map Tuple.second)
+                                        newSharedData
+                                        newPageData
+                                        model.key
+                                        (config.onPageChange
+                                            { protocol = model.url.protocol
+                                            , host = model.url.host
+                                            , port_ = model.url.port_
+                                            , path = urlPathToPath urlWithoutRedirectResolution
+                                            , query = urlWithoutRedirectResolution.query
+                                            , fragment = urlWithoutRedirectResolution.fragment
+                                            , metadata = config.urlToRoute urlWithoutRedirectResolution
+                                            }
+                                        )
+                                        previousPageData.userModel
+                                        |> Tuple.mapSecond UserCmd
 
                             updatedModel : Model userModel pageData actionData sharedData
                             updatedModel =
@@ -656,10 +654,13 @@ update config appMsg model =
                             , currentPath = newUrl.path
                           }
                         , if not stayingOnSamePath && scrollToTopWhenDone then
-                            ScrollToTop
+                            Batch
+                                [ ScrollToTop
+                                , userEffect
+                                ]
 
                           else
-                            NoEffect
+                            userEffect
                         )
                             |> (case maybeUserMsg of
                                     Just userMsg ->
@@ -679,10 +680,10 @@ update config appMsg model =
                 Err _ ->
                     {-
                        When there is an error loading the content.dat, we are either
-                       1) in the dev server, and should show the relevant DataSource error for the page
+                       1) in the dev server, and should show the relevant BackendTask error for the page
                           we're navigating to. This could be done more cleanly, but it's simplest to just
                           do a fresh page load and use the code path for presenting an error for a fresh page.
-                       2) In a production app. That means we had a successful build, so there were no DataSource failures,
+                       2) In a production app. That means we had a successful build, so there were no BackendTask failures,
                           so the app must be stale (unless it's in some unexpected state from a bug). In the future,
                           it probably makes sense to include some sort of hash of the app version we are fetching, match
                           it with the current version that's running, and perform this logic when we see there is a mismatch.
@@ -766,7 +767,7 @@ update config appMsg model =
 toFetcherState : Dict String ( Int, Pages.Transition.FetcherState actionData ) -> Dict String (Pages.Transition.FetcherState actionData)
 toFetcherState inFlightFetchers =
     inFlightFetchers
-        |> Dict.map (\_ ( index, fetcherState ) -> fetcherState)
+        |> Dict.map (\_ ( _, fetcherState ) -> fetcherState)
 
 
 performUserMsg :
@@ -828,7 +829,7 @@ perform config model effect =
                 |> Maybe.withDefault Cmd.none
 
         FetchPageData transitionKey maybeRequestInfo url toMsg ->
-            fetchRouteData True transitionKey toMsg config url maybeRequestInfo
+            fetchRouteData transitionKey toMsg config url maybeRequestInfo
 
         Submit fields ->
             if fields.method == Get then
@@ -843,7 +844,7 @@ perform config model effect =
                         -- TODO add optional path parameter to Submit variant to allow submitting to other routes
                         model.url
                 in
-                fetchRouteData False -1 (UpdateCacheAndUrlNew False model.url Nothing) config urlToSubmitTo (Just fields)
+                fetchRouteData -1 (UpdateCacheAndUrlNew False model.url Nothing) config urlToSubmitTo (Just fields)
 
         SubmitFetcher fetcherKey transitionId formData ->
             startFetcher2 config False fetcherKey transitionId formData model
@@ -863,7 +864,7 @@ perform config model effect =
                         |> config.perform
                             { fetchRouteData =
                                 \fetchInfo ->
-                                    fetchRouteData False
+                                    fetchRouteData
                                         -1
                                         (prepare fetchInfo.toMsg)
                                         config
@@ -873,7 +874,7 @@ perform config model effect =
                             ---- TODO map the Msg with the wrapper type (like in the PR branch)
                             , submit =
                                 \fetchInfo ->
-                                    fetchRouteData False -1 (prepare fetchInfo.toMsg) config (fetchInfo.values.action |> Url.fromString |> Maybe.withDefault model.url) (Just fetchInfo.values)
+                                    fetchRouteData -1 (prepare fetchInfo.toMsg) config (fetchInfo.values.action |> Url.fromString |> Maybe.withDefault model.url) (Just fetchInfo.values)
                             , runFetcher =
                                 \(Pages.Fetcher.Fetcher options) ->
                                     -- TODO need to get the fetcherId here
@@ -927,7 +928,7 @@ startFetcher fetcherKey transitionId options model =
                 Http.expectBytesResponse (FetcherComplete False fetcherKey model.nextTransitionKey)
                     (\bytes ->
                         case bytes of
-                            Http.GoodStatus_ metadata bytesBody ->
+                            Http.GoodStatus_ _ bytesBody ->
                                 ( options.decoder (Ok bytesBody)
                                     |> Just
                                 , Nothing
@@ -943,7 +944,7 @@ startFetcher fetcherKey transitionId options model =
                             Http.NetworkError_ ->
                                 Err <| Http.NetworkError
 
-                            Http.BadStatus_ metadata body ->
+                            Http.BadStatus_ metadata _ ->
                                 Err <| Http.BadStatus metadata.statusCode
                     )
             , tracker = Nothing
@@ -974,7 +975,7 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
     Cmd.batch
         [ cancelStaleFetchers model
         , case Dict.get fetcherKey model.inFlightFetchers of
-            Just ( inFlightId, inFlightFetcher ) ->
+            Just ( inFlightId, _ ) ->
                 Http.cancel (String.fromInt inFlightId)
 
             Nothing ->
@@ -985,7 +986,7 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
                 Http.expectBytesResponse (FetcherComplete fromPageReload fetcherKey model.nextTransitionKey)
                     (\bytes ->
                         case bytes of
-                            Http.GoodStatus_ metadata bytesBody ->
+                            Http.GoodStatus_ _ bytesBody ->
                                 let
                                     decodedAction : Maybe actionData
                                     decodedAction =
@@ -993,10 +994,10 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
                                             Just (ResponseSketch.RenderPage _ maybeAction) ->
                                                 maybeAction
 
-                                            Just (ResponseSketch.HotUpdate pageData shared maybeAction) ->
+                                            Just (ResponseSketch.HotUpdate _ _ maybeAction) ->
                                                 maybeAction
 
-                                            Just (ResponseSketch.NotFound notFound) ->
+                                            Just (ResponseSketch.NotFound _) ->
                                                 Nothing
 
                                             _ ->
@@ -1014,7 +1015,7 @@ startFetcher2 config fromPageReload fetcherKey transitionId formData model =
                             Http.NetworkError_ ->
                                 Err <| Http.NetworkError
 
-                            Http.BadStatus_ metadata body ->
+                            Http.BadStatus_ metadata _ ->
                                 Err <| Http.BadStatus metadata.statusCode
                     )
             , tracker = Just (String.fromInt transitionId)
@@ -1036,7 +1037,7 @@ cancelStaleFetchers model =
     model.inFlightFetchers
         |> Dict.toList
         |> List.filterMap
-            (\( fetcherKey, ( id, fetcher ) ) ->
+            (\( _, ( id, fetcher ) ) ->
                 case fetcher.status of
                     Pages.Transition.FetcherReloading _ ->
                         Http.cancel (String.fromInt id)
@@ -1157,14 +1158,13 @@ urlPathToPath urls =
 
 
 fetchRouteData :
-    Bool
-    -> Int
+    Int
     -> (Result Http.Error ( Url, ResponseSketch pageData actionData sharedData ) -> Msg userMsg pageData actionData sharedData errorPage)
     -> ProgramConfig userMsg userModel route pageData actionData sharedData effect (Msg userMsg pageData actionData sharedData errorPage) errorPage
     -> Url
     -> Maybe FormData
     -> Cmd (Msg userMsg pageData actionData sharedData errorPage)
-fetchRouteData forPageDataReload transitionKey toMsg config url details =
+fetchRouteData transitionKey toMsg config url details =
     {-
        TODO:
        - [X] `toMsg` needs a parameter for the callback Msg so it can pass it on if there is a Redirect response
@@ -1251,7 +1251,7 @@ fetchRouteData forPageDataReload transitionKey toMsg config url details =
                         Http.NetworkError_ ->
                             Err Http.NetworkError
 
-                        Http.BadStatus_ metadata body ->
+                        Http.BadStatus_ _ body ->
                             body
                                 |> Bytes.Decode.decode config.decodeResponse
                                 |> Result.fromMaybe "Decoding error"
@@ -1303,7 +1303,7 @@ startNewGetLoad urlToGet toMsg ( model, effect ) =
         cancelIfStale : Effect userMsg pageData actionData sharedData userEffect errorPage
         cancelIfStale =
             case model.transition of
-                Just ( transitionKey, Pages.Transition.Loading path loadingKind ) ->
+                Just ( transitionKey, Pages.Transition.Loading _ _ ) ->
                     CancelRequest transitionKey
 
                 _ ->
@@ -1314,13 +1314,13 @@ startNewGetLoad urlToGet toMsg ( model, effect ) =
         , transition =
             ( model.nextTransitionKey
             , case model.transition of
-                Just ( transitionKey, Pages.Transition.LoadAfterSubmit submitData _ _ ) ->
+                Just ( _, Pages.Transition.LoadAfterSubmit submitData _ _ ) ->
                     Pages.Transition.LoadAfterSubmit
                         submitData
                         (urlToGet.path |> Path.fromString)
                         Pages.Transition.Load
 
-                Just ( transitionKey, Pages.Transition.Submitting submitData ) ->
+                Just ( _, Pages.Transition.Submitting submitData ) ->
                     Pages.Transition.LoadAfterSubmit
                         submitData
                         (urlToGet.path |> Path.fromString)
@@ -1392,6 +1392,7 @@ loadDataAndUpdateUrl ( newPageData, newSharedData, newActionData ) maybeUserMsg
                     , actionData = newActionData
                     }
 
+                -- TODO use userEffect here?
                 ( userModel, _ ) =
                     -- TODO if urlWithoutRedirectResolution is different from the url with redirect resolution, then
                     -- instead of calling update, call pushUrl (I think?)
@@ -1467,10 +1468,10 @@ loadDataAndUpdateUrl ( newPageData, newSharedData, newActionData ) maybeUserMsg
         Err _ ->
             {-
                When there is an error loading the content.dat, we are either
-               1) in the dev server, and should show the relevant DataSource error for the page
+               1) in the dev server, and should show the relevant BackendTask error for the page
                   we're navigating to. This could be done more cleanly, but it's simplest to just
                   do a fresh page load and use the code path for presenting an error for a fresh page.
-               2) In a production app. That means we had a successful build, so there were no DataSource failures,
+               2) In a production app. That means we had a successful build, so there were no BackendTask failures,
                   so the app must be stale (unless it's in some unexpected state from a bug). In the future,
                   it probably makes sense to include some sort of hash of the app version we are fetching, match
                   it with the current version that's running, and perform this logic when we see there is a mismatch.

package/src/Pages/Internal/Script.elm

@@ -0,0 +1,17 @@
+module Pages.Internal.Script exposing (Script(..))
+
+import BackendTask exposing (BackendTask)
+import Cli.Program as Program
+import FatalError exposing (FatalError)
+import Html exposing (Html)
+
+
+{-| -}
+type Script
+    = Script
+        ((Maybe { indent : Int, newLines : Bool }
+          -> Html Never
+          -> String
+         )
+         -> Program.Config (BackendTask FatalError ())
+        )

package/src/Pages/Internal/StaticHttpBody.elm

@@ -1,6 +1,9 @@
 module Pages.Internal.StaticHttpBody exposing (Body(..), codec, encode)
 
+import Base64
+import Bytes exposing (Bytes)
 import Codec exposing (Codec)
+import Json.Decode
 import Json.Encode as Encode
 
 
@@ -8,6 +11,7 @@ type Body
     = EmptyBody
     | StringBody String String
     | JsonBody Encode.Value
+    | BytesBody String Bytes
 
 
 encode : Body -> Encode.Value
@@ -26,6 +30,15 @@ encode body =
                 [ ( "content", content )
                 ]
 
+        BytesBody _ content ->
+            encodeWithType "bytes"
+                [ ( "content"
+                  , Base64.fromBytes content
+                        |> Maybe.withDefault ""
+                        |> Encode.string
+                  )
+                ]
+
 
 encodeWithType : String -> List ( String, Encode.Value ) -> Encode.Value
 encodeWithType typeName otherFields =
@@ -37,7 +50,7 @@ encodeWithType typeName otherFields =
 codec : Codec Body
 codec =
     Codec.custom
-        (\vEmpty vString vJson value ->
+        (\vEmpty vString vJson vBytes value ->
             case value of
                 EmptyBody ->
                     vEmpty
@@ -47,8 +60,29 @@ codec =
 
                 JsonBody body ->
                     vJson body
+
+                BytesBody contentType body ->
+                    vBytes contentType body
         )
         |> Codec.variant0 "EmptyBody" EmptyBody
         |> Codec.variant2 "StringBody" StringBody Codec.string Codec.string
         |> Codec.variant1 "JsonBody" JsonBody Codec.value
+        |> Codec.variant2 "BytesBody" BytesBody Codec.string bytesCodec
         |> Codec.buildCustom
+
+
+bytesCodec : Codec Bytes
+bytesCodec =
+    Codec.build (Base64.fromBytes >> Maybe.withDefault "" >> Encode.string)
+        (Json.Decode.string
+            |> Json.Decode.map Base64.toBytes
+            |> Json.Decode.andThen
+                (\decodedBytes ->
+                    case decodedBytes of
+                        Just bytes ->
+                            Json.Decode.succeed bytes
+
+                        Nothing ->
+                            Json.Decode.fail "Couldn't parse bytes."
+                )
+        )

package/src/Pages/Manifest.elm

@@ -2,6 +2,7 @@ module Pages.Manifest exposing
     ( Config, Icon
     , init
     , withBackgroundColor, withCategories, withDisplayMode, withIarcRatingId, withLang, withOrientation, withShortName, withThemeColor
+    , withField
     , DisplayMode(..), Orientation(..), IconPurpose(..)
     , generator
     , toJson
@@ -41,6 +42,11 @@ You pass your `Pages.Manifest.Config` record into the `Pages.application` functi
 @docs withBackgroundColor, withCategories, withDisplayMode, withIarcRatingId, withLang, withOrientation, withShortName, withThemeColor
 
 
+## Arbitrary Fields Escape Hatch
+
+@docs withField
+
+
 ## Config options
 
 @docs DisplayMode, Orientation, IconPurpose
@@ -58,9 +64,11 @@ You pass your `Pages.Manifest.Config` record into the `Pages.application` functi
 -}
 
 import ApiRoute
+import BackendTask exposing (BackendTask)
 import Color exposing (Color)
 import Color.Convert
-import DataSource exposing (DataSource)
+import Dict exposing (Dict)
+import FatalError exposing (FatalError)
 import Head
 import Json.Encode as Encode
 import LanguageTag exposing (LanguageTag, emptySubtags)
@@ -123,6 +131,7 @@ init options =
     , shortName = Nothing
     , icons = options.icons
     , lang = usEnglish
+    , otherFields = Dict.empty
     }
 
 
@@ -191,6 +200,17 @@ withLang languageTag config =
     { config | lang = languageTag }
 
 
+{-| Escape hatch for specifying fields that aren't exposed through this module otherwise. The possible supported properties
+in a manifest file can change over time, so see [MDN manifest.json docs](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json)
+for a full listing of the current supported properties.
+-}
+withField : String -> Encode.Value -> Config -> Config
+withField name value config =
+    { config
+        | otherFields = config.otherFields |> Dict.insert name value
+    }
+
+
 orientationToString : Orientation -> String
 orientationToString orientation =
     case orientation of
@@ -239,6 +259,7 @@ type alias Config =
     , shortName : Maybe String
     , icons : List Icon
     , lang : LanguageTag
+    , otherFields : Dict String Encode.Value
     }
 
 
@@ -324,16 +345,16 @@ nonEmptyList list =
 
 {-| A generator for Api.elm to include a manifest.json.
 -}
-generator : String -> DataSource Config -> ApiRoute.ApiRoute ApiRoute.Response
+generator : String -> BackendTask FatalError Config -> ApiRoute.ApiRoute ApiRoute.Response
 generator canonicalSiteUrl config =
     ApiRoute.succeed
         (config
-            |> DataSource.map (toJson canonicalSiteUrl >> Encode.encode 0)
+            |> BackendTask.map (toJson canonicalSiteUrl >> Encode.encode 0)
         )
         |> ApiRoute.literal "manifest.json"
         |> ApiRoute.single
         |> ApiRoute.withGlobalHeadTags
-            (DataSource.succeed
+            (BackendTask.succeed
                 [ Head.manifestLink "/manifest.json"
                 ]
             )
@@ -420,6 +441,10 @@ toJson canonicalSiteUrl config =
       , Encode.string "/" |> Just
       )
     ]
+        ++ (config.otherFields
+                |> Dict.toList
+                |> List.map (Tuple.mapSecond Just)
+           )
         |> encodeMaybeObject
 
 

package/src/Pages/ProgramConfig.elm

@@ -1,12 +1,13 @@
 module Pages.ProgramConfig exposing (ProgramConfig)
 
 import ApiRoute
+import BackendTask exposing (BackendTask)
 import Browser.Navigation
 import Bytes exposing (Bytes)
 import Bytes.Decode
 import Bytes.Encode
-import DataSource exposing (DataSource)
 import Dict exposing (Dict)
+import FatalError exposing (FatalError)
 import Form.FormData exposing (FormData)
 import Head
 import Html exposing (Html)
@@ -48,9 +49,9 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
         -> ( userModel, effect )
     , update : Pages.FormState.PageFormState -> Dict String (Pages.Transition.FetcherState actionData) -> Maybe Pages.Transition.Transition -> sharedData -> pageData -> Maybe Browser.Navigation.Key -> userMsg -> userModel -> ( userModel, effect )
     , subscriptions : route -> Path -> userModel -> Sub userMsg
-    , sharedData : DataSource sharedData
-    , data : route -> DataSource (PageServerResponse pageData errorPage)
-    , action : route -> DataSource (PageServerResponse actionData errorPage)
+    , sharedData : BackendTask FatalError sharedData
+    , data : Decode.Value -> route -> BackendTask FatalError (PageServerResponse pageData errorPage)
+    , action : Decode.Value -> route -> BackendTask FatalError (PageServerResponse actionData errorPage)
     , onActionData : actionData -> Maybe userMsg
     , view :
         Pages.FormState.PageFormState
@@ -68,8 +69,8 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
             { view : userModel -> { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
             , head : List Head.Tag
             }
-    , handleRoute : route -> DataSource (Maybe NotFoundReason)
-    , getStaticRoutes : DataSource (List route)
+    , handleRoute : route -> BackendTask FatalError (Maybe NotFoundReason)
+    , getStaticRoutes : BackendTask FatalError (List route)
     , urlToRoute : Url -> route
     , routeToPath : route -> List String
     , site : Maybe SiteConfig
@@ -88,7 +89,10 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
         }
         -> userMsg
     , apiRoutes :
-        (Html Never -> String)
+        (Maybe { indent : Int, newLines : Bool }
+         -> Html Never
+         -> String
+        )
         -> List (ApiRoute.ApiRoute ApiRoute.Response)
     , pathPatterns : List RoutePattern
     , basePath : List String
@@ -98,7 +102,7 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
     , encodeResponse : ResponseSketch pageData actionData sharedData -> Bytes.Encode.Encoder
     , encodeAction : actionData -> Bytes.Encode.Encoder
     , decodeResponse : Bytes.Decode.Decoder (ResponseSketch pageData actionData sharedData)
-    , globalHeadTags : Maybe ((Html Never -> String) -> DataSource (List Head.Tag))
+    , globalHeadTags : Maybe ((Maybe { indent : Int, newLines : Bool } -> Html Never -> String) -> BackendTask FatalError (List Head.Tag))
     , cmdToEffect : Cmd userMsg -> effect
     , perform :
         { fetchRouteData :

package/src/Pages/Script.elm

@@ -0,0 +1,109 @@
+module Pages.Script exposing
+    ( Script
+    , withCliOptions, withoutCliOptions
+    , writeFile
+    , log
+    , Error(..)
+    )
+
+{-|
+
+@docs Script
+
+@docs withCliOptions, withoutCliOptions
+
+
+## File System Utilities
+
+@docs writeFile
+
+
+## Utilities
+
+@docs log
+
+
+## Errors
+
+@docs Error
+
+-}
+
+import BackendTask exposing (BackendTask)
+import BackendTask.Http
+import BackendTask.Internal.Request
+import Cli.OptionsParser as OptionsParser
+import Cli.Program as Program
+import FatalError exposing (FatalError)
+import Json.Decode as Decode
+import Json.Encode as Encode
+import Pages.Internal.Script
+
+
+{-| -}
+type alias Script =
+    Pages.Internal.Script.Script
+
+
+{-| -}
+type Error
+    = --TODO make more descriptive
+      FileWriteError
+
+
+{-| -}
+writeFile : { path : String, body : String } -> BackendTask { fatal : FatalError, recoverable : Error } ()
+writeFile { path, body } =
+    BackendTask.Internal.Request.request
+        { name = "write-file"
+        , body =
+            BackendTask.Http.jsonBody
+                (Encode.object
+                    [ ( "path", Encode.string path )
+                    , ( "body", Encode.string body )
+                    ]
+                )
+        , expect =
+            -- TODO decode possible error details here
+            BackendTask.Http.expectJson (Decode.succeed ())
+        }
+
+
+{-| -}
+log : String -> BackendTask error ()
+log message =
+    BackendTask.Internal.Request.request
+        { name = "log"
+        , body =
+            BackendTask.Http.jsonBody
+                (Encode.object
+                    [ ( "message", Encode.string message )
+                    ]
+                )
+        , expect = BackendTask.Http.expectJson (Decode.succeed ())
+        }
+
+
+{-| -}
+withoutCliOptions : BackendTask FatalError () -> Script
+withoutCliOptions execute =
+    Pages.Internal.Script.Script
+        (\_ ->
+            Program.config
+                |> Program.add
+                    (OptionsParser.build ())
+                |> Program.mapConfig
+                    (\() ->
+                        execute
+                    )
+        )
+
+
+{-| -}
+withCliOptions : Program.Config cliOptions -> (cliOptions -> BackendTask FatalError ()) -> Script
+withCliOptions config execute =
+    Pages.Internal.Script.Script
+        (\_ ->
+            config
+                |> Program.mapConfig execute
+        )

package/src/Pages/SiteConfig.elm

@@ -1,10 +1,11 @@
 module Pages.SiteConfig exposing (SiteConfig)
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Head
 
 
 type alias SiteConfig =
     { canonicalUrl : String
-    , head : DataSource (List Head.Tag)
+    , head : BackendTask FatalError (List Head.Tag)
     }

package/src/Pages/StaticHttp/Request.elm

@@ -11,7 +11,7 @@ type alias Request =
     , method : String
     , headers : List ( String, String )
     , body : Body
-    , useCache : Bool
+    , cacheOptions : Maybe Encode.Value
     }
 
 
@@ -40,5 +40,5 @@ codec =
         |> Codec.field "method" .method Codec.string
         |> Codec.field "headers" .headers (Codec.list (Codec.tuple Codec.string Codec.string))
         |> Codec.field "body" .body StaticHttpBody.codec
-        |> Codec.field "useCache" .useCache Codec.bool
+        |> Codec.nullableField "cacheOptions" .cacheOptions Codec.value
         |> Codec.buildObject