elm-pages 3.0.0-beta.9 → 3.0.0

package/src/Pages/Internal/Platform/Cli.elm

@@ -6,40 +6,38 @@ module Pages.Internal.Platform.Cli exposing (Flags, Model, Msg(..), Program, cli
 
 -}
 
-import ApiRoute
+import BackendTask exposing (BackendTask)
 import BuildError exposing (BuildError)
 import Bytes exposing (Bytes)
 import Bytes.Encode
 import Codec
-import DataSource exposing (DataSource)
-import Dict
-import Head
+import Dict exposing (Dict)
+import FatalError exposing (FatalError)
+import Head exposing (Tag)
 import Html exposing (Html)
 import HtmlPrinter
 import Internal.ApiRoute exposing (ApiRoute(..))
+import Internal.Request
 import Json.Decode as Decode
 import Json.Encode
 import PageServerResponse exposing (PageServerResponse)
 import Pages.Flags
-import Pages.Http
+import Pages.Internal.FatalError
 import Pages.Internal.NotFoundReason as NotFoundReason exposing (NotFoundReason)
 import Pages.Internal.Platform.CompatibilityKey
 import Pages.Internal.Platform.Effect as Effect exposing (Effect)
-import Pages.Internal.Platform.StaticResponses as StaticResponses exposing (StaticResponses)
+import Pages.Internal.Platform.StaticResponses as StaticResponses
 import Pages.Internal.Platform.ToJsPayload as ToJsPayload
 import Pages.Internal.ResponseSketch as ResponseSketch
-import Pages.Internal.StaticHttpBody as StaticHttpBody
-import Pages.Msg
 import Pages.ProgramConfig exposing (ProgramConfig)
 import Pages.SiteConfig exposing (SiteConfig)
 import Pages.StaticHttp.Request
-import Pages.StaticHttpRequest as StaticHttpRequest
-import Path exposing (Path)
+import PagesMsg exposing (PagesMsg)
 import RenderRequest exposing (RenderRequest)
 import RequestsAndPending exposing (RequestsAndPending)
-import Task
 import TerminalText as Terminal
 import Url exposing (Url)
+import UrlPath exposing (UrlPath)
 
 
 {-| -}
@@ -55,10 +53,8 @@ currentCompatibilityKey =
 
 {-| -}
 type alias Model route =
-    { staticResponses : StaticResponses
+    { staticResponses : BackendTask FatalError Effect
     , errors : List BuildError
-    , allRawResponses : RequestsAndPending
-    , unprocessedPages : List ( Path, route )
     , maybeRequestJson : RenderRequest route
     , isDevServer : Bool
     }
@@ -66,12 +62,7 @@ type alias Model route =
 
 {-| -}
 type Msg
-    = GotDataBatch
-        (List
-            { request : Pages.StaticHttp.Request.Request
-            , response : RequestsAndPending.Response
-            }
-        )
+    = GotDataBatch Decode.Value
     | GotBuildError BuildError
 
 
@@ -112,7 +103,7 @@ cliApplication config =
                     |> Tuple.mapSecond (perform site renderRequest config)
         , update =
             \msg model ->
-                update site config msg model
+                update msg model
                     |> Tuple.mapSecond (perform site model.maybeRequestJson config)
         , subscriptions =
             \_ ->
@@ -159,35 +150,11 @@ cliApplication config =
                                         )
                                     |> mergeResult
                             )
-                    , config.gotBatchSub
-                        |> Sub.map
-                            (\newBatch ->
-                                Decode.decodeValue batchDecoder newBatch
-                                    |> Result.map GotDataBatch
-                                    |> Result.mapError
-                                        (\error ->
-                                            ("From location 2: "
-                                                ++ (error
-                                                        |> Decode.errorToString
-                                                   )
-                                            )
-                                                |> BuildError.internal
-                                                |> GotBuildError
-                                        )
-                                    |> mergeResult
-                            )
+                    , config.gotBatchSub |> Sub.map GotDataBatch
                     ]
         }
 
 
-batchDecoder : Decode.Decoder (List { request : Pages.StaticHttp.Request.Request, response : RequestsAndPending.Response })
-batchDecoder =
-    Decode.map2 (\request response -> { request = request, response = response })
-        (Decode.field "request" requestDecoder)
-        (Decode.field "response" RequestsAndPending.decoder)
-        |> Decode.list
-
-
 mergeResult : Result a a -> a
 mergeResult r =
     case r of
@@ -244,61 +211,16 @@ perform site renderRequest config effect =
         Effect.Batch list ->
             flatten site renderRequest config list
 
-        Effect.FetchHttp unmasked ->
-            if unmasked.url == "$$elm-pages$$headers" then
-                case
-                    renderRequest
-                        |> RenderRequest.maybeRequestPayload
-                        |> Maybe.map (\json -> RequestsAndPending.Response Nothing (RequestsAndPending.JsonBody json))
-                        |> Result.fromMaybe (Pages.Http.BadUrl "$$elm-pages$$headers is only available on server-side request (not on build).")
-                of
-                    Ok okResponse ->
-                        Task.succeed
-                            [ { request = unmasked
-                              , response = okResponse
-                              }
-                            ]
-                            |> Task.perform GotDataBatch
-
-                    Err error ->
-                        { title = "Static HTTP Error"
-                        , message =
-                            [ Terminal.text "I got an error making an HTTP request to this URL: "
-
-                            -- TODO include HTTP method, headers, and body
-                            , Terminal.yellow unmasked.url
-                            , Terminal.text <| Json.Encode.encode 2 <| StaticHttpBody.encode unmasked.body
-                            , Terminal.text "\n\n"
-                            , case error of
-                                Pages.Http.BadStatus metadata body ->
-                                    Terminal.text <|
-                                        String.join "\n"
-                                            [ "Bad status: " ++ String.fromInt metadata.statusCode
-                                            , "Status message: " ++ metadata.statusText
-                                            , "Body: " ++ body
-                                            ]
-
-                                Pages.Http.BadUrl _ ->
-                                    -- TODO include HTTP method, headers, and body
-                                    Terminal.text <| "Invalid url: " ++ unmasked.url
-
-                                Pages.Http.Timeout ->
-                                    Terminal.text "Timeout"
-
-                                Pages.Http.NetworkError ->
-                                    Terminal.text "Network error"
-                            ]
-                        , fatal = True
-                        , path = "" -- TODO wire in current path here
-                        }
-                            |> Task.succeed
-                            |> Task.perform GotBuildError
-
-            else
-                ToJsPayload.DoHttp unmasked unmasked.useCache
-                    |> Codec.encoder (ToJsPayload.successCodecNew2 canonicalSiteUrl "")
-                    |> config.toJsPort
-                    |> Cmd.map never
+        Effect.FetchHttp requests ->
+            requests
+                |> List.map
+                    (\request ->
+                        ( Pages.StaticHttp.Request.hash request, request )
+                    )
+                |> ToJsPayload.DoHttp
+                |> Codec.encoder (ToJsPayload.successCodecNew2 canonicalSiteUrl "")
+                |> config.toJsPort
+                |> Cmd.map never
 
         Effect.SendSinglePage info ->
             let
@@ -335,9 +257,6 @@ perform site renderRequest config effect =
                 |> config.sendPageData
                 |> Cmd.map never
 
-        Effect.Continue ->
-            Cmd.none
-
 
 flagsDecoder :
     Decode.Decoder
@@ -353,15 +272,8 @@ flagsDecoder =
             , compatibilityKey = compatibilityKey
             }
         )
-        --(Decode.field "staticHttpCache"
-        --    (Decode.dict
-        --        (Decode.string
-        --            |> Decode.map Just
-        --        )
-        --    )
-        --)
         -- TODO remove hardcoding and decode staticHttpCache here
-        (Decode.succeed Dict.empty)
+        (Decode.succeed (Json.Encode.object []))
         (Decode.field "mode" Decode.string |> Decode.map (\mode -> mode == "dev-server"))
         (Decode.field "compatibilityKey" Decode.int)
 
@@ -375,9 +287,9 @@ init :
     -> ( Model route, Effect )
 init site renderRequest config flags =
     case Decode.decodeValue flagsDecoder flags of
-        Ok { staticHttpCache, isDevServer, compatibilityKey } ->
+        Ok { isDevServer, compatibilityKey } ->
             if compatibilityKey == currentCompatibilityKey then
-                initLegacy site renderRequest { staticHttpCache = staticHttpCache, isDevServer = isDevServer } config
+                initLegacy site renderRequest { isDevServer = isDevServer } config
 
             else
                 let
@@ -396,9 +308,7 @@ init site renderRequest config flags =
                                )
                 in
                 updateAndSendPortIfDone
-                    site
-                    config
-                    { staticResponses = StaticResponses.empty
+                    { staticResponses = StaticResponses.empty Effect.NoEffect
                     , errors =
                         [ { title = "Incompatible NPM and Elm package versions"
                           , message = [ Terminal.text <| message ]
@@ -406,17 +316,13 @@ init site renderRequest config flags =
                           , path = ""
                           }
                         ]
-                    , allRawResponses = Dict.empty
-                    , unprocessedPages = []
                     , maybeRequestJson = renderRequest
                     , isDevServer = False
                     }
 
         Err error ->
             updateAndSendPortIfDone
-                site
-                config
-                { staticResponses = StaticResponses.empty
+                { staticResponses = StaticResponses.empty Effect.NoEffect
                 , errors =
                     [ { title = "Internal Error"
                       , message = [ Terminal.text <| "Failed to parse flags: " ++ Decode.errorToString error ]
@@ -424,8 +330,6 @@ init site renderRequest config flags =
                       , path = ""
                       }
                     ]
-                , allRawResponses = Dict.empty
-                , unprocessedPages = []
                 , maybeRequestJson = renderRequest
                 , isDevServer = False
                 }
@@ -474,140 +378,506 @@ isActionDecoder =
 initLegacy :
     SiteConfig
     -> RenderRequest route
-    -> { staticHttpCache : RequestsAndPending, isDevServer : Bool }
+    -> { isDevServer : Bool }
     -> ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
     -> ( Model route, Effect )
-initLegacy site renderRequest { staticHttpCache, isDevServer } config =
+initLegacy site ((RenderRequest.SinglePage includeHtml singleRequest _) as renderRequest) { isDevServer } config =
     let
-        staticResponses : StaticResponses
-        staticResponses =
-            case renderRequest of
-                RenderRequest.SinglePage _ singleRequest _ ->
+        globalHeadTags : BackendTask FatalError (List Tag)
+        globalHeadTags =
+            (config.globalHeadTags |> Maybe.withDefault (\_ -> BackendTask.succeed [])) HtmlPrinter.htmlToString
+
+        staticResponsesNew : BackendTask FatalError Effect
+        staticResponsesNew =
+            case singleRequest of
+                RenderRequest.Page serverRequestPayload ->
                     let
-                        globalHeadTags : DataSource (List Head.Tag)
-                        globalHeadTags =
-                            (config.globalHeadTags |> Maybe.withDefault (\_ -> DataSource.succeed [])) HtmlPrinter.htmlToString
+                        isAction : Maybe ActionRequest
+                        isAction =
+                            renderRequest
+                                |> RenderRequest.maybeRequestPayload
+                                |> Maybe.andThen (Decode.decodeValue isActionDecoder >> Result.withDefault Nothing)
+
+                        currentUrl : Url
+                        currentUrl =
+                            { protocol = Url.Https
+                            , host = site.canonicalUrl
+                            , port_ = Nothing
+                            , path = serverRequestPayload.path |> UrlPath.toRelative
+                            , query = Nothing
+                            , fragment = Nothing
+                            }
                     in
-                    case singleRequest of
-                        RenderRequest.Page serverRequestPayload ->
-                            let
-                                isAction : Maybe ActionRequest
-                                isAction =
-                                    renderRequest
-                                        |> RenderRequest.maybeRequestPayload
-                                        |> Maybe.andThen (Decode.decodeValue isActionDecoder >> Result.withDefault Nothing)
-                            in
-                            StaticResponses.renderSingleRoute
-                                (case isAction of
-                                    Just _ ->
-                                        config.action serverRequestPayload.frontmatter
-                                            |> DataSource.andThen
-                                                (\something ->
-                                                    case something of
-                                                        PageServerResponse.ErrorPage _ _ ->
-                                                            DataSource.succeed something
-                                                                |> DataSource.map (\_ -> ())
-
-                                                        PageServerResponse.RenderPage _ _ ->
-                                                            DataSource.map3 (\_ _ _ -> ())
-                                                                (config.data serverRequestPayload.frontmatter)
-                                                                config.sharedData
-                                                                globalHeadTags
-
-                                                        PageServerResponse.ServerResponse _ ->
-                                                            DataSource.succeed something
-                                                                |> DataSource.map (\_ -> ())
-                                                )
+                    --case isAction of
+                    --    Just actionRequest ->
+                    (if isDevServer then
+                        config.handleRoute serverRequestPayload.frontmatter
 
+                     else
+                        BackendTask.succeed Nothing
+                    )
+                        |> BackendTask.andThen
+                            (\pageFound ->
+                                case pageFound of
                                     Nothing ->
-                                        DataSource.map3 (\_ _ _ -> ())
-                                            (config.data serverRequestPayload.frontmatter)
-                                            config.sharedData
-                                            globalHeadTags
-                                )
-                                (if isDevServer then
-                                    config.handleRoute serverRequestPayload.frontmatter
+                                        --sendSinglePageProgress site model.allRawResponses config model payload
+                                        (case isAction of
+                                            Just _ ->
+                                                config.action
+                                                    (RenderRequest.maybeRequestPayload renderRequest
+                                                        |> Maybe.map Internal.Request.toRequest
+                                                        |> Maybe.withDefault Internal.Request.fakeRequest
+                                                    )
+                                                    serverRequestPayload.frontmatter
+                                                    |> BackendTask.map Just
 
-                                 else
-                                    DataSource.succeed Nothing
-                                )
+                                            Nothing ->
+                                                BackendTask.succeed Nothing
+                                        )
+                                            |> BackendTask.andThen
+                                                (\something ->
+                                                    let
+                                                        actionHeaders2 : Maybe { statusCode : Int, headers : List ( String, String ) }
+                                                        actionHeaders2 =
+                                                            case something of
+                                                                Just (PageServerResponse.RenderPage responseThing _) ->
+                                                                    Just responseThing
+
+                                                                Just (PageServerResponse.ServerResponse responseThing) ->
+                                                                    Just
+                                                                        { headers = responseThing.headers
+                                                                        , statusCode = responseThing.statusCode
+                                                                        }
 
-                        RenderRequest.Api ( path, ApiRoute apiRequest ) ->
-                            StaticResponses.renderApiRequest
-                                (DataSource.map2 (\_ _ -> ())
-                                    (apiRequest.matchesToResponse path)
-                                    globalHeadTags
-                                )
+                                                                _ ->
+                                                                    Nothing
 
-                        RenderRequest.NotFound _ ->
-                            StaticResponses.renderApiRequest
-                                (DataSource.map2 (\_ _ -> ())
-                                    (DataSource.succeed [])
-                                    globalHeadTags
-                                )
+                                                        maybeRedirectResponse : Maybe Effect
+                                                        maybeRedirectResponse =
+                                                            actionHeaders2
+                                                                |> Maybe.andThen
+                                                                    (\responseMetadata ->
+                                                                        toRedirectResponse config
+                                                                            serverRequestPayload
+                                                                            includeHtml
+                                                                            responseMetadata
+                                                                            responseMetadata
+                                                                    )
+                                                    in
+                                                    case maybeRedirectResponse of
+                                                        Just redirectResponse ->
+                                                            redirectResponse
+                                                                |> BackendTask.succeed
 
-        unprocessedPages : List ( Path, route )
-        unprocessedPages =
-            case renderRequest of
-                RenderRequest.SinglePage _ serverRequestPayload _ ->
-                    case serverRequestPayload of
-                        RenderRequest.Page pageData ->
-                            [ ( pageData.path, pageData.frontmatter ) ]
+                                                        Nothing ->
+                                                            BackendTask.map3
+                                                                (\pageData sharedData tags ->
+                                                                    let
+                                                                        renderedResult : Effect
+                                                                        renderedResult =
+                                                                            case pageData of
+                                                                                PageServerResponse.RenderPage responseInfo pageData_ ->
+                                                                                    let
+                                                                                        currentPage : { path : UrlPath, route : route }
+                                                                                        currentPage =
+                                                                                            { path = serverRequestPayload.path, route = urlToRoute config currentUrl }
+
+                                                                                        maybeActionData : Maybe actionData
+                                                                                        maybeActionData =
+                                                                                            case something of
+                                                                                                Just (PageServerResponse.RenderPage _ actionThing) ->
+                                                                                                    Just actionThing
+
+                                                                                                _ ->
+                                                                                                    Nothing
+
+                                                                                        pageModel : userModel
+                                                                                        pageModel =
+                                                                                            config.init
+                                                                                                Pages.Flags.PreRenderFlags
+                                                                                                sharedData
+                                                                                                pageData_
+                                                                                                maybeActionData
+                                                                                                (Just
+                                                                                                    { path =
+                                                                                                        { path = currentPage.path
+                                                                                                        , query = Nothing
+                                                                                                        , fragment = Nothing
+                                                                                                        }
+                                                                                                    , metadata = currentPage.route
+                                                                                                    , pageUrl = Nothing
+                                                                                                    }
+                                                                                                )
+                                                                                                |> Tuple.first
+
+                                                                                        viewValue : { title : String, body : List (Html (PagesMsg userMsg)) }
+                                                                                        viewValue =
+                                                                                            (config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData_ maybeActionData |> .view) pageModel
+
+                                                                                        responseMetadata : { statusCode : Int, headers : List ( String, String ) }
+                                                                                        responseMetadata =
+                                                                                            actionHeaders2 |> Maybe.withDefault responseInfo
+                                                                                    in
+                                                                                    (case isAction of
+                                                                                        Just actionRequestKind ->
+                                                                                            let
+                                                                                                actionDataResult : Maybe (PageServerResponse actionData errorPage)
+                                                                                                actionDataResult =
+                                                                                                    something
+                                                                                            in
+                                                                                            case actionDataResult of
+                                                                                                Just (PageServerResponse.RenderPage ignored2 actionData_) ->
+                                                                                                    case actionRequestKind of
+                                                                                                        ActionResponseRequest ->
+                                                                                                            ( ignored2.headers
+                                                                                                            , ResponseSketch.HotUpdate pageData_ sharedData (Just actionData_)
+                                                                                                                |> config.encodeResponse
+                                                                                                                |> Bytes.Encode.encode
+                                                                                                            )
+
+                                                                                                        ActionOnlyRequest ->
+                                                                                                            ---- TODO need to encode action data when only that is requested (not ResponseSketch?)
+                                                                                                            ( ignored2.headers
+                                                                                                            , actionData_
+                                                                                                                |> config.encodeAction
+                                                                                                                |> Bytes.Encode.encode
+                                                                                                            )
+
+                                                                                                _ ->
+                                                                                                    ( responseMetadata.headers
+                                                                                                    , Bytes.Encode.encode (Bytes.Encode.unsignedInt8 0)
+                                                                                                    )
+
+                                                                                        Nothing ->
+                                                                                            ( responseMetadata.headers
+                                                                                            , ResponseSketch.HotUpdate pageData_ sharedData Nothing
+                                                                                                |> config.encodeResponse
+                                                                                                |> Bytes.Encode.encode
+                                                                                            )
+                                                                                    )
+                                                                                        |> (\( actionHeaders, byteEncodedPageData ) ->
+                                                                                                let
+                                                                                                    rendered : { view : userModel -> { title : String, body : List (Html (PagesMsg userMsg)) }, head : List Tag }
+                                                                                                    rendered =
+                                                                                                        config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData_ maybeActionData
+                                                                                                in
+                                                                                                PageServerResponse.toRedirect responseMetadata
+                                                                                                    |> Maybe.map
+                                                                                                        (\{ location } ->
+                                                                                                            location
+                                                                                                                |> ResponseSketch.Redirect
+                                                                                                                |> config.encodeResponse
+                                                                                                                |> Bytes.Encode.encode
+                                                                                                        )
+                                                                                                    -- TODO handle other cases besides redirects?
+                                                                                                    |> Maybe.withDefault byteEncodedPageData
+                                                                                                    |> (\encodedData ->
+                                                                                                            { route = currentPage.path |> UrlPath.toRelative
+                                                                                                            , contentJson = Dict.empty
+                                                                                                            , html = viewValue.body |> bodyToString
+                                                                                                            , errors = []
+                                                                                                            , head = rendered.head ++ tags
+                                                                                                            , title = viewValue.title
+                                                                                                            , staticHttpCache = Dict.empty
+                                                                                                            , is404 = False
+                                                                                                            , statusCode =
+                                                                                                                case includeHtml of
+                                                                                                                    RenderRequest.OnlyJson ->
+                                                                                                                        200
+
+                                                                                                                    RenderRequest.HtmlAndJson ->
+                                                                                                                        responseMetadata.statusCode
+                                                                                                            , headers =
+                                                                                                                -- TODO should `responseInfo.headers` be used? Is there a problem in the case where there is both an action and data response in one? Do we need to make sure it is performed as two separate HTTP requests to ensure that the cookies are set correctly in that case?
+                                                                                                                actionHeaders
+                                                                                                                    |> combineHeaders
+                                                                                                            }
+                                                                                                                |> ToJsPayload.PageProgress
+                                                                                                                |> Effect.SendSinglePageNew encodedData
+                                                                                                       )
+                                                                                           )
+
+                                                                                PageServerResponse.ServerResponse serverResponse ->
+                                                                                    --PageServerResponse.ServerResponse serverResponse
+                                                                                    -- TODO handle error?
+                                                                                    let
+                                                                                        responseMetadata : PageServerResponse.Response
+                                                                                        responseMetadata =
+                                                                                            case something of
+                                                                                                Just (PageServerResponse.ServerResponse responseThing) ->
+                                                                                                    responseThing
+
+                                                                                                _ ->
+                                                                                                    serverResponse
+                                                                                    in
+                                                                                    toRedirectResponse config serverRequestPayload includeHtml serverResponse responseMetadata
+                                                                                        |> Maybe.withDefault
+                                                                                            ({ body = serverResponse |> PageServerResponse.toJson
+                                                                                             , staticHttpCache = Dict.empty
+                                                                                             , statusCode = serverResponse.statusCode
+                                                                                             }
+                                                                                                |> ToJsPayload.SendApiResponse
+                                                                                                |> Effect.SendSinglePage
+                                                                                            )
+
+                                                                                PageServerResponse.ErrorPage error record ->
+                                                                                    let
+                                                                                        currentPage : { path : UrlPath, route : route }
+                                                                                        currentPage =
+                                                                                            { path = serverRequestPayload.path, route = urlToRoute config currentUrl }
+
+                                                                                        pageModel : userModel
+                                                                                        pageModel =
+                                                                                            config.init
+                                                                                                Pages.Flags.PreRenderFlags
+                                                                                                sharedData
+                                                                                                pageData2
+                                                                                                Nothing
+                                                                                                (Just
+                                                                                                    { path =
+                                                                                                        { path = currentPage.path
+                                                                                                        , query = Nothing
+                                                                                                        , fragment = Nothing
+                                                                                                        }
+                                                                                                    , metadata = currentPage.route
+                                                                                                    , pageUrl = Nothing
+                                                                                                    }
+                                                                                                )
+                                                                                                |> Tuple.first
+
+                                                                                        pageData2 : pageData
+                                                                                        pageData2 =
+                                                                                            config.errorPageToData error
+
+                                                                                        viewValue : { title : String, body : List (Html (PagesMsg userMsg)) }
+                                                                                        viewValue =
+                                                                                            (config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData2 Nothing |> .view) pageModel
+                                                                                    in
+                                                                                    (ResponseSketch.HotUpdate pageData2 sharedData Nothing
+                                                                                        |> config.encodeResponse
+                                                                                        |> Bytes.Encode.encode
+                                                                                    )
+                                                                                        |> (\encodedData ->
+                                                                                                { route = currentPage.path |> UrlPath.toRelative
+                                                                                                , contentJson = Dict.empty
+                                                                                                , html = viewValue.body |> bodyToString
+                                                                                                , errors = []
+                                                                                                , head = tags
+                                                                                                , title = viewValue.title
+                                                                                                , staticHttpCache = Dict.empty
+                                                                                                , is404 = False
+                                                                                                , statusCode =
+                                                                                                    case includeHtml of
+                                                                                                        RenderRequest.OnlyJson ->
+                                                                                                            200
+
+                                                                                                        RenderRequest.HtmlAndJson ->
+                                                                                                            config.errorStatusCode error
+                                                                                                , headers = record.headers |> combineHeaders
+                                                                                                }
+                                                                                                    |> ToJsPayload.PageProgress
+                                                                                                    |> Effect.SendSinglePageNew encodedData
+                                                                                           )
+                                                                    in
+                                                                    renderedResult
+                                                                )
+                                                                (config.data
+                                                                    (RenderRequest.maybeRequestPayload renderRequest
+                                                                        |> Maybe.map Internal.Request.toRequest
+                                                                        |> Maybe.withDefault Internal.Request.fakeRequest
+                                                                    )
+                                                                    serverRequestPayload.frontmatter
+                                                                )
+                                                                config.sharedData
+                                                                globalHeadTags
+                                                )
+                                            |> BackendTask.onError
+                                                (\((Pages.Internal.FatalError.FatalError fatalError) as error) ->
+                                                    let
+                                                        isPreRendered : Bool
+                                                        isPreRendered =
+                                                            let
+                                                                keys : Int
+                                                                keys =
+                                                                    RenderRequest.maybeRequestPayload renderRequest |> Maybe.map (Decode.decodeValue (Decode.keyValuePairs Decode.value)) |> Maybe.withDefault (Ok []) |> Result.withDefault [] |> List.map Tuple.first |> List.length
+                                                            in
+                                                            -- TODO this is a bit hacky, would be nice to clean up the way of checking whether this is server-rendered or pre-rendered
+                                                            keys <= 1
+                                                    in
+                                                    if isDevServer || isPreRendered then
+                                                        -- we want to stop the build for pre-rendered routes, and give a dev server error popup in the dev server
+                                                        BackendTask.fail error
+
+                                                    else
+                                                        --only render the production ErrorPage in production server-rendered Routes
+                                                        config.sharedData
+                                                            |> BackendTask.andThen
+                                                                (\justSharedData ->
+                                                                    let
+                                                                        errorPage : errorPage
+                                                                        errorPage =
+                                                                            config.internalError fatalError.body
+
+                                                                        dataThing : pageData
+                                                                        dataThing =
+                                                                            errorPage
+                                                                                |> config.errorPageToData
+
+                                                                        statusCode : Int
+                                                                        statusCode =
+                                                                            config.errorStatusCode errorPage
+
+                                                                        byteEncodedPageData : Bytes
+                                                                        byteEncodedPageData =
+                                                                            ResponseSketch.HotUpdate
+                                                                                dataThing
+                                                                                justSharedData
+                                                                                -- TODO remove shared action data
+                                                                                Nothing
+                                                                                |> config.encodeResponse
+                                                                                |> Bytes.Encode.encode
 
-                        RenderRequest.Api _ ->
-                            []
+                                                                        pageModel : userModel
+                                                                        pageModel =
+                                                                            config.init
+                                                                                Pages.Flags.PreRenderFlags
+                                                                                justSharedData
+                                                                                dataThing
+                                                                                Nothing
+                                                                                (Just
+                                                                                    { path =
+                                                                                        { path = currentPage.path
+                                                                                        , query = Nothing
+                                                                                        , fragment = Nothing
+                                                                                        }
+                                                                                    , metadata = currentPage.route
+                                                                                    , pageUrl = Nothing
+                                                                                    }
+                                                                                )
+                                                                                |> Tuple.first
+
+                                                                        currentPage : { path : UrlPath, route : route }
+                                                                        currentPage =
+                                                                            { path = serverRequestPayload.path, route = urlToRoute config currentUrl }
+
+                                                                        viewValue : { title : String, body : List (Html (PagesMsg userMsg)) }
+                                                                        viewValue =
+                                                                            (config.view Dict.empty Dict.empty Nothing currentPage Nothing justSharedData dataThing Nothing |> .view)
+                                                                                pageModel
+                                                                    in
+                                                                    { route = UrlPath.toAbsolute currentPage.path
+                                                                    , contentJson = Dict.empty
+                                                                    , html = viewValue.body |> bodyToString
+                                                                    , errors = []
+                                                                    , head = [] -- TODO render head tags --config.view Dict.empty Dict.empty Nothing pathAndRoute Nothing justSharedData pageData Nothing |> .head
+                                                                    , title = viewValue.title
+                                                                    , staticHttpCache = Dict.empty
+                                                                    , is404 = False
+                                                                    , statusCode = statusCode
+                                                                    , headers = Dict.empty
+                                                                    }
+                                                                        |> ToJsPayload.PageProgress
+                                                                        |> Effect.SendSinglePageNew byteEncodedPageData
+                                                                        |> BackendTask.succeed
+                                                                )
+                                                )
+
+                                    Just notFoundReason ->
+                                        render404Page config
+                                            Nothing
+                                            -- TODO do I need sharedDataResult?
+                                            --(Result.toMaybe sharedDataResult)
+                                            isDevServer
+                                            serverRequestPayload.path
+                                            notFoundReason
+                                            |> BackendTask.succeed
+                            )
 
-                        RenderRequest.NotFound _ ->
-                            []
+                RenderRequest.Api ( path, ApiRoute apiHandler ) ->
+                    BackendTask.map2
+                        (\response _ ->
+                            case response of
+                                Just okResponse ->
+                                    { body = okResponse
+                                    , staticHttpCache = Dict.empty -- TODO do I need to serialize the full cache here, or can I handle that from the JS side?
+                                    , statusCode = 200
+                                    }
+                                        |> ToJsPayload.SendApiResponse
+                                        |> Effect.SendSinglePage
+
+                                Nothing ->
+                                    render404Page config
+                                        -- TODO do I need sharedDataResult here?
+                                        Nothing
+                                        isDevServer
+                                        (UrlPath.fromString path)
+                                        NotFoundReason.NoMatchingRoute
+                         --Err error ->
+                         --    [ error ]
+                         --        |> ToJsPayload.Errors
+                         --        |> Effect.SendSinglePage
+                        )
+                        (apiHandler.matchesToResponse
+                            (renderRequest
+                                |> RenderRequest.maybeRequestPayload
+                                |> Maybe.withDefault Json.Encode.null
+                            )
+                            path
+                        )
+                        globalHeadTags
+
+                RenderRequest.NotFound notFoundPath ->
+                    (BackendTask.map2
+                        (\_ _ ->
+                            render404Page config
+                                Nothing
+                                --(Result.toMaybe sharedDataResult)
+                                --model
+                                isDevServer
+                                notFoundPath
+                                NotFoundReason.NoMatchingRoute
+                        )
+                        (BackendTask.succeed [])
+                        globalHeadTags
+                     -- TODO is there a way to resolve sharedData but get it as a Result if it fails?
+                     --config.sharedData
+                    )
 
         initialModel : Model route
         initialModel =
-            { staticResponses = staticResponses
+            { staticResponses = staticResponsesNew
             , errors = []
-            , allRawResponses = staticHttpCache
-            , unprocessedPages = unprocessedPages
             , maybeRequestJson = renderRequest
             , isDevServer = isDevServer
             }
     in
-    StaticResponses.nextStep initialModel Nothing
-        |> nextStepToEffect site
-            config
+    StaticResponses.nextStep (Json.Encode.object []) initialModel.staticResponses initialModel
+        |> nextStepToEffect
             initialModel
 
 
 updateAndSendPortIfDone :
-    SiteConfig
-    -> ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
-    -> Model route
+    Model route
     -> ( Model route, Effect )
-updateAndSendPortIfDone site config model =
-    StaticResponses.nextStep
+updateAndSendPortIfDone model =
+    StaticResponses.nextStep (Json.Encode.object [])
+        model.staticResponses
         model
-        Nothing
-        |> nextStepToEffect site config model
+        |> nextStepToEffect model
 
 
 {-| -}
 update :
-    SiteConfig
-    -> ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
-    -> Msg
+    Msg
     -> Model route
     -> ( Model route, Effect )
-update site config msg model =
+update msg model =
     case msg of
         GotDataBatch batch ->
-            let
-                updatedModel : Model route
-                updatedModel =
-                    model
-                        |> StaticResponses.batchUpdate batch
-            in
-            StaticResponses.nextStep
-                updatedModel
-                Nothing
-                |> nextStepToEffect site config updatedModel
+            StaticResponses.nextStep batch
+                model.staticResponses
+                model
+                |> nextStepToEffect model
 
         GotBuildError buildError ->
             let
@@ -618,560 +888,45 @@ update site config msg model =
                             buildError :: model.errors
                     }
             in
-            StaticResponses.nextStep
+            StaticResponses.nextStep (Json.Encode.object [])
+                updatedModel.staticResponses
                 updatedModel
-                Nothing
-                |> nextStepToEffect site config updatedModel
+                |> nextStepToEffect updatedModel
 
 
 nextStepToEffect :
-    SiteConfig
-    -> ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
-    -> Model route
-    -> ( StaticResponses, StaticResponses.NextStep route )
+    Model route
+    -> StaticResponses.NextStep route Effect
     -> ( Model route, Effect )
-nextStepToEffect site config model ( updatedStaticResponsesModel, nextStep ) =
+nextStepToEffect model nextStep =
     case nextStep of
-        StaticResponses.Continue updatedAllRawResponses httpRequests maybeRoutes ->
-            let
-                updatedUnprocessedPages : List ( Path, route )
-                updatedUnprocessedPages =
-                    case maybeRoutes of
-                        Just newRoutes ->
-                            newRoutes
-                                |> List.map
-                                    (\route ->
-                                        ( Path.join (config.routeToPath route)
-                                        , route
-                                        )
-                                    )
-
-                        Nothing ->
-                            model.unprocessedPages
-
-                updatedModel : Model route
-                updatedModel =
-                    { model
-                        | allRawResponses = updatedAllRawResponses
-                        , staticResponses = updatedStaticResponsesModel
-                        , unprocessedPages = updatedUnprocessedPages
-                    }
-            in
-            if List.isEmpty httpRequests then
-                nextStepToEffect site
-                    config
-                    updatedModel
-                    (StaticResponses.nextStep
-                        updatedModel
-                        Nothing
-                    )
-
-            else
-                ( updatedModel
-                , (httpRequests
-                    |> List.map Effect.FetchHttp
-                  )
-                    |> Effect.Batch
-                )
-
-        StaticResponses.Finish toJsPayload ->
-            case toJsPayload of
-                StaticResponses.ApiResponse ->
-                    let
-                        apiResponse : Effect
-                        apiResponse =
-                            case model.maybeRequestJson of
-                                RenderRequest.SinglePage _ requestPayload _ ->
-                                    let
-                                        sharedDataResult : Result BuildError sharedData
-                                        sharedDataResult =
-                                            StaticHttpRequest.resolve
-                                                config.sharedData
-                                                model.allRawResponses
-                                                |> Result.mapError (StaticHttpRequest.toBuildError "")
-                                    in
-                                    case requestPayload of
-                                        RenderRequest.Api ( path, ApiRoute apiHandler ) ->
-                                            let
-                                                thing : DataSource (Maybe ApiRoute.Response)
-                                                thing =
-                                                    apiHandler.matchesToResponse path
-                                            in
-                                            StaticHttpRequest.resolve
-                                                thing
-                                                model.allRawResponses
-                                                |> Result.mapError (StaticHttpRequest.toBuildError "TODO - path from request")
-                                                |> (\response ->
-                                                        case response of
-                                                            Ok (Just okResponse) ->
-                                                                { body = okResponse
-                                                                , staticHttpCache = Dict.empty -- TODO do I need to serialize the full cache here, or can I handle that from the JS side?
-
-                                                                -- model.allRawResponses |> Dict.Extra.filterMap (\_ v -> v)
-                                                                , statusCode = 200
-                                                                }
-                                                                    |> ToJsPayload.SendApiResponse
-                                                                    |> Effect.SendSinglePage
-
-                                                            Ok Nothing ->
-                                                                render404Page config (Result.toMaybe sharedDataResult) model (Path.fromString path) NotFoundReason.NoMatchingRoute
-
-                                                            Err error ->
-                                                                [ error ]
-                                                                    |> ToJsPayload.Errors
-                                                                    |> Effect.SendSinglePage
-                                                   )
-
-                                        RenderRequest.Page payload ->
-                                            let
-                                                pageFoundResult : Result BuildError (Maybe NotFoundReason)
-                                                pageFoundResult =
-                                                    StaticHttpRequest.resolve
-                                                        (if model.isDevServer then
-                                                            -- TODO OPTIMIZATION this is redundant
-                                                            config.handleRoute payload.frontmatter
-
-                                                         else
-                                                            DataSource.succeed Nothing
-                                                        )
-                                                        model.allRawResponses
-                                                        |> Result.mapError (StaticHttpRequest.toBuildError (payload.path |> Path.toAbsolute))
-                                            in
-                                            case pageFoundResult of
-                                                Ok Nothing ->
-                                                    sendSinglePageProgress site model.allRawResponses config model payload
-
-                                                Ok (Just notFoundReason) ->
-                                                    render404Page config
-                                                        --Nothing
-                                                        (Result.toMaybe sharedDataResult)
-                                                        model
-                                                        payload.path
-                                                        notFoundReason
-
-                                                Err error ->
-                                                    [ error ] |> ToJsPayload.Errors |> Effect.SendSinglePage
-
-                                        RenderRequest.NotFound path ->
-                                            render404Page config
-                                                --Nothing
-                                                (Result.toMaybe sharedDataResult)
-                                                model
-                                                path
-                                                NotFoundReason.NoMatchingRoute
-                    in
-                    ( model
-                    , apiResponse
-                    )
-
-                StaticResponses.Errors errors ->
-                    ( model
-                    , errors |> ToJsPayload.Errors |> Effect.SendSinglePage
-                    )
-
-
-sendSinglePageProgress :
-    SiteConfig
-    -> RequestsAndPending
-    -> ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
-    -> Model route
-    -> { path : Path, frontmatter : route }
-    -> Effect
-sendSinglePageProgress site contentJson config model info =
-    let
-        ( page, route ) =
-            ( info.path, info.frontmatter )
-    in
-    case model.maybeRequestJson of
-        RenderRequest.SinglePage includeHtml _ _ ->
-            let
-                isAction : Maybe ActionRequest
-                isAction =
-                    model.maybeRequestJson
-                        |> RenderRequest.maybeRequestPayload
-                        |> Maybe.andThen (Decode.decodeValue isActionDecoder >> Result.withDefault Nothing)
-
-                pageFoundResult : Result BuildError (Maybe NotFoundReason)
-                pageFoundResult =
-                    -- TODO OPTIMIZATION this is redundant
-                    StaticHttpRequest.resolve
-                        (if model.isDevServer then
-                            config.handleRoute route
-
-                         else
-                            DataSource.succeed Nothing
-                        )
-                        model.allRawResponses
-                        |> Result.mapError (StaticHttpRequest.toBuildError currentUrl.path)
-
-                renderedResult : Result BuildError (PageServerResponse { head : List Head.Tag, view : String, title : String } errorPage)
-                renderedResult =
-                    case includeHtml of
-                        RenderRequest.OnlyJson ->
-                            pageDataResult
-                                |> Result.map
-                                    (\okPageData ->
-                                        case okPageData of
-                                            PageServerResponse.RenderPage responseInfo _ ->
-                                                PageServerResponse.RenderPage
-                                                    { statusCode = responseInfo.statusCode
-                                                    , headers = responseInfo.headers
-                                                    }
-                                                    { head = []
-                                                    , view = "This page was not rendered because it is a JSON-only request."
-                                                    , title = "This page was not rendered because it is a JSON-only request."
-                                                    }
-
-                                            PageServerResponse.ServerResponse serverResponse ->
-                                                PageServerResponse.ServerResponse serverResponse
-
-                                            PageServerResponse.ErrorPage error record ->
-                                                PageServerResponse.ErrorPage error record
-                                    )
-
-                        RenderRequest.HtmlAndJson ->
-                            Result.map2 Tuple.pair pageDataResult sharedDataResult
-                                |> Result.map
-                                    (\( pageData_, sharedData ) ->
-                                        case pageData_ of
-                                            PageServerResponse.RenderPage responseInfo pageData ->
-                                                let
-                                                    currentPage : { path : Path, route : route }
-                                                    currentPage =
-                                                        { path = page, route = urlToRoute config currentUrl }
-
-                                                    maybeActionData : Maybe actionData
-                                                    maybeActionData =
-                                                        case isAction of
-                                                            Just _ ->
-                                                                case actionDataResult of
-                                                                    Ok (PageServerResponse.RenderPage _ actionData) ->
-                                                                        Just actionData
-
-                                                                    _ ->
-                                                                        Nothing
-
-                                                            Nothing ->
-                                                                Nothing
-
-                                                    pageModel : userModel
-                                                    pageModel =
-                                                        config.init
-                                                            Pages.Flags.PreRenderFlags
-                                                            sharedData
-                                                            pageData
-                                                            maybeActionData
-                                                            (Just
-                                                                { path =
-                                                                    { path = currentPage.path
-                                                                    , query = Nothing
-                                                                    , fragment = Nothing
-                                                                    }
-                                                                , metadata = currentPage.route
-                                                                , pageUrl = Nothing
-                                                                }
-                                                            )
-                                                            |> Tuple.first
-
-                                                    viewValue : { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
-                                                    viewValue =
-                                                        (config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData maybeActionData |> .view) pageModel
-                                                in
-                                                PageServerResponse.RenderPage responseInfo
-                                                    { head = config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData maybeActionData |> .head
-                                                    , view = viewValue.body |> bodyToString
-                                                    , title = viewValue.title
-                                                    }
-
-                                            PageServerResponse.ServerResponse serverResponse ->
-                                                PageServerResponse.ServerResponse serverResponse
-
-                                            PageServerResponse.ErrorPage error record ->
-                                                let
-                                                    currentPage : { path : Path, route : route }
-                                                    currentPage =
-                                                        { path = page, route = urlToRoute config currentUrl }
-
-                                                    pageModel : userModel
-                                                    pageModel =
-                                                        config.init
-                                                            Pages.Flags.PreRenderFlags
-                                                            sharedData
-                                                            pageData
-                                                            Nothing
-                                                            (Just
-                                                                { path =
-                                                                    { path = currentPage.path
-                                                                    , query = Nothing
-                                                                    , fragment = Nothing
-                                                                    }
-                                                                , metadata = currentPage.route
-                                                                , pageUrl = Nothing
-                                                                }
-                                                            )
-                                                            |> Tuple.first
-
-                                                    pageData : pageData
-                                                    pageData =
-                                                        config.errorPageToData error
-
-                                                    viewValue : { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
-                                                    viewValue =
-                                                        (config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData Nothing |> .view) pageModel
-                                                in
-                                                PageServerResponse.RenderPage
-                                                    { statusCode = config.errorStatusCode error
-                                                    , headers = record.headers
-                                                    }
-                                                    { head = config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData Nothing |> .head
-                                                    , view = viewValue.body |> List.map (HtmlPrinter.htmlToString Nothing) |> String.join "\n"
-                                                    , title = viewValue.title
-                                                    }
-                                    )
-
-                currentUrl : Url
-                currentUrl =
-                    { protocol = Url.Https
-                    , host = site.canonicalUrl
-                    , port_ = Nothing
-                    , path = page |> Path.toRelative
-                    , query = Nothing
-                    , fragment = Nothing
-                    }
-
-                pageDataResult : Result BuildError (PageServerResponse pageData errorPage)
-                pageDataResult =
-                    -- TODO OPTIMIZATION can these three be included in StaticResponses.Finish?
-                    StaticHttpRequest.resolve
-                        (case isAction of
-                            Just _ ->
-                                config.action (urlToRoute config currentUrl)
-                                    |> DataSource.andThen
-                                        (\something ->
-                                            case something of
-                                                PageServerResponse.ErrorPage a b ->
-                                                    PageServerResponse.ErrorPage a b
-                                                        |> DataSource.succeed
-
-                                                PageServerResponse.RenderPage _ _ ->
-                                                    -- TODO the headers/response codes are ignored from the action here
-                                                    -- is that okay? Should you always do a redirect or another kind of
-                                                    -- server response if you want to control the headers/response code for an action (like logout & redirect, for example)?
-                                                    config.data (urlToRoute config currentUrl)
-
-                                                PageServerResponse.ServerResponse a ->
-                                                    PageServerResponse.ServerResponse a
-                                                        |> DataSource.succeed
-                                        )
-
-                            Nothing ->
-                                config.data (urlToRoute config currentUrl)
-                        )
-                        contentJson
-                        |> Result.mapError (StaticHttpRequest.toBuildError currentUrl.path)
-
-                actionDataResult : Result BuildError (PageServerResponse actionData errorPage)
-                actionDataResult =
-                    -- TODO OPTIMIZATION can these three be included in StaticResponses.Finish?
-                    StaticHttpRequest.resolve
-                        (config.action (urlToRoute config currentUrl))
-                        contentJson
-                        |> Result.mapError (StaticHttpRequest.toBuildError currentUrl.path)
-
-                sharedDataResult : Result BuildError sharedData
-                sharedDataResult =
-                    StaticHttpRequest.resolve
-                        config.sharedData
-                        contentJson
-                        |> Result.mapError (StaticHttpRequest.toBuildError currentUrl.path)
-
-                globalHeadTags : DataSource (List Head.Tag)
-                globalHeadTags =
-                    (config.globalHeadTags |> Maybe.withDefault (\_ -> DataSource.succeed [])) HtmlPrinter.htmlToString
-
-                siteDataResult : Result BuildError (List Head.Tag)
-                siteDataResult =
-                    StaticHttpRequest.resolve
-                        globalHeadTags
-                        model.allRawResponses
-                        |> Result.mapError (StaticHttpRequest.toBuildError "Site.elm")
-            in
-            case Result.map3 (\a b c -> ( a, b, c )) pageFoundResult renderedResult siteDataResult of
-                Ok ( maybeNotFoundReason, renderedOrApiResponse, siteData ) ->
-                    case maybeNotFoundReason of
-                        Nothing ->
-                            let
-                                ( actionHeaders, byteEncodedPageData ) =
-                                    case pageDataResult of
-                                        Ok pageServerResponse ->
-                                            case pageServerResponse of
-                                                PageServerResponse.RenderPage ignored1 pageData ->
-                                                    -- TODO want to encode both shared and page data in dev server and HTML-embedded data
-                                                    -- but not for writing out the content.dat files - would be good to optimize this redundant data out
-                                                    --if model.isDevServer then
-                                                    case isAction of
-                                                        Just actionRequestKind ->
-                                                            case actionDataResult of
-                                                                Ok (PageServerResponse.RenderPage ignored2 actionData) ->
-                                                                    case actionRequestKind of
-                                                                        ActionResponseRequest ->
-                                                                            ( ignored2.headers
-                                                                            , sharedDataResult
-                                                                                |> Result.map (\sharedData -> ResponseSketch.HotUpdate pageData sharedData (Just actionData))
-                                                                                |> Result.withDefault (ResponseSketch.RenderPage pageData (Just actionData))
-                                                                                |> config.encodeResponse
-                                                                                |> Bytes.Encode.encode
-                                                                            )
-
-                                                                        ActionOnlyRequest ->
-                                                                            ---- TODO need to encode action data when only that is requested (not ResponseSketch?)
-                                                                            ( ignored2.headers
-                                                                            , actionData
-                                                                                |> config.encodeAction
-                                                                                |> Bytes.Encode.encode
-                                                                            )
-
-                                                                _ ->
-                                                                    ( ignored1.headers
-                                                                    , Bytes.Encode.encode (Bytes.Encode.unsignedInt8 0)
-                                                                    )
-
-                                                        Nothing ->
-                                                            ( ignored1.headers
-                                                            , sharedDataResult
-                                                                |> Result.map (\something -> ResponseSketch.HotUpdate pageData something Nothing)
-                                                                |> Result.withDefault (ResponseSketch.RenderPage pageData Nothing)
-                                                                |> config.encodeResponse
-                                                                |> Bytes.Encode.encode
-                                                            )
-
-                                                --else
-                                                --    pageData
-                                                --        |> ResponseSketch.RenderPage
-                                                --        |> config.encodeResponse
-                                                --        |> Bytes.Encode.encode
-                                                PageServerResponse.ServerResponse serverResponse ->
-                                                    -- TODO handle error?
-                                                    ( serverResponse.headers
-                                                    , PageServerResponse.toRedirect serverResponse
-                                                        |> Maybe.map
-                                                            (\{ location } ->
-                                                                location
-                                                                    |> ResponseSketch.Redirect
-                                                                    |> config.encodeResponse
-                                                            )
-                                                        -- TODO handle other cases besides redirects?
-                                                        |> Maybe.withDefault (Bytes.Encode.unsignedInt8 0)
-                                                        |> Bytes.Encode.encode
-                                                    )
-
-                                                PageServerResponse.ErrorPage error { headers } ->
-                                                    -- TODO this case should never happen
-                                                    ( headers
-                                                    , sharedDataResult
-                                                        |> Result.map
-                                                            (\sharedData ->
-                                                                ResponseSketch.HotUpdate (config.errorPageToData error)
-                                                                    sharedData
-                                                                    Nothing
-                                                            )
-                                                        |> Result.map config.encodeResponse
-                                                        |> Result.map Bytes.Encode.encode
-                                                        |> Result.withDefault (Bytes.Encode.encode (Bytes.Encode.unsignedInt8 0))
-                                                    )
-
-                                        _ ->
-                                            -- TODO handle error?
-                                            ( []
-                                            , Bytes.Encode.encode (Bytes.Encode.unsignedInt8 0)
-                                            )
-                            in
-                            case renderedOrApiResponse of
-                                PageServerResponse.RenderPage responseInfo rendered ->
-                                    { route = page |> Path.toRelative
-                                    , contentJson = Dict.empty
-                                    , html = rendered.view
-                                    , errors = []
-                                    , head = rendered.head ++ siteData
-                                    , title = rendered.title
-                                    , staticHttpCache = Dict.empty
-                                    , is404 = False
-                                    , statusCode = responseInfo.statusCode
-                                    , headers =
-                                        -- TODO should `responseInfo.headers` be used? Is there a problem in the case where there is both an action and data response in one? Do we need to make sure it is performed as two separate HTTP requests to ensure that the cookies are set correctly in that case?
-                                        actionHeaders
-                                    }
-                                        |> ToJsPayload.PageProgress
-                                        |> Effect.SendSinglePageNew byteEncodedPageData
-
-                                PageServerResponse.ServerResponse serverResponse ->
-                                    PageServerResponse.toRedirect serverResponse
-                                        |> Maybe.map
-                                            (\_ ->
-                                                { route = page |> Path.toRelative
-                                                , contentJson = Dict.empty
-                                                , html = "This is intentionally blank HTML"
-                                                , errors = []
-                                                , head = []
-                                                , title = "This is an intentionally blank title"
-                                                , staticHttpCache = Dict.empty
-                                                , is404 = False
-                                                , statusCode =
-                                                    case includeHtml of
-                                                        RenderRequest.OnlyJson ->
-                                                            -- if this is a redirect for a `content.dat`, we don't want to send an *actual* redirect status code because the redirect needs to be handled in Elm (not by the Browser)
-                                                            200
-
-                                                        RenderRequest.HtmlAndJson ->
-                                                            serverResponse.statusCode
-                                                , headers = serverResponse.headers
-                                                }
-                                                    |> ToJsPayload.PageProgress
-                                                    |> Effect.SendSinglePageNew byteEncodedPageData
-                                            )
-                                        |> Maybe.withDefault
-                                            ({ body = serverResponse |> PageServerResponse.toJson
-                                             , staticHttpCache = Dict.empty
-                                             , statusCode = serverResponse.statusCode
-                                             }
-                                                |> ToJsPayload.SendApiResponse
-                                                |> Effect.SendSinglePage
-                                            )
-
-                                PageServerResponse.ErrorPage error responseInfo ->
-                                    -- TODO this case should never happen
-                                    { route = page |> Path.toRelative
-                                    , contentJson = Dict.empty
-                                    , html = "UNEXPECTED!" --HtmlPrinter.htmlToString rendered.body
-                                    , errors = []
-                                    , head = [] -- rendered.head ++ siteData -- TODO this should call ErrorPage.head maybe?
-                                    , title = "UNEXPECTED CASE" --rendered.title
-                                    , staticHttpCache = Dict.empty
-                                    , is404 = False
-                                    , statusCode = config.errorStatusCode error
-                                    , headers = responseInfo.headers
-                                    }
-                                        |> ToJsPayload.PageProgress
-                                        |> Effect.SendSinglePageNew byteEncodedPageData
+        StaticResponses.Continue httpRequests updatedStaticResponsesModel ->
+            ( { model
+                | staticResponses = updatedStaticResponsesModel
+              }
+            , Effect.FetchHttp httpRequests
+            )
 
-                        Just notFoundReason ->
-                            render404Page config (Result.toMaybe sharedDataResult) model page notFoundReason
+        StaticResponses.FinishedWithErrors errors ->
+            ( model
+            , errors |> ToJsPayload.Errors |> Effect.SendSinglePage
+            )
 
-                Err error ->
-                    [ error ]
-                        |> ToJsPayload.Errors
-                        |> Effect.SendSinglePage
+        StaticResponses.Finish finalValue ->
+            ( model
+            , finalValue
+            )
 
 
 render404Page :
     ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
     -> Maybe sharedData
-    -> Model route
-    -> Path
+    -> Bool
+    -> UrlPath
     -> NotFoundReason
     -> Effect
-render404Page config sharedData model path notFoundReason =
-    case ( model.isDevServer, sharedData ) of
+render404Page config sharedData isDevServer path notFoundReason =
+    case ( isDevServer, sharedData ) of
         ( False, Just justSharedData ) ->
             let
                 byteEncodedPageData : Bytes
@@ -1198,11 +953,11 @@ render404Page config sharedData model path notFoundReason =
                 pageData =
                     config.errorPageToData config.notFoundPage
 
-                pathAndRoute : { path : Path, route : route }
+                pathAndRoute : { path : UrlPath, route : route }
                 pathAndRoute =
                     { path = path, route = config.notFoundRoute }
 
-                viewValue : { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
+                viewValue : { title : String, body : List (Html (PagesMsg userMsg)) }
                 viewValue =
                     (config.view Dict.empty
                         Dict.empty
@@ -1216,7 +971,7 @@ render404Page config sharedData model path notFoundReason =
                     )
                         pageModel
             in
-            { route = Path.toAbsolute path
+            { route = UrlPath.toAbsolute path
             , contentJson = Dict.empty
             , html = viewValue.body |> bodyToString
             , errors = []
@@ -1225,7 +980,7 @@ render404Page config sharedData model path notFoundReason =
             , staticHttpCache = Dict.empty
             , is404 = True
             , statusCode = 404
-            , headers = []
+            , headers = Dict.empty
             }
                 |> ToJsPayload.PageProgress
                 |> Effect.SendSinglePageNew byteEncodedPageData
@@ -1245,7 +1000,7 @@ render404Page config sharedData model path notFoundReason =
                     }
                         |> NotFoundReason.document config.pathPatterns
             in
-            { route = Path.toAbsolute path
+            { route = UrlPath.toAbsolute path
             , contentJson = Dict.empty
             , html = bodyToString notFoundDocument.body
             , errors = []
@@ -1257,7 +1012,7 @@ render404Page config sharedData model path notFoundReason =
             --model.allRawResponses |> Dict.Extra.filterMap (\_ v -> v)
             , is404 = True
             , statusCode = 404
-            , headers = []
+            , headers = Dict.empty
             }
                 |> ToJsPayload.PageProgress
                 |> Effect.SendSinglePageNew byteEncodedPageData
@@ -1275,3 +1030,66 @@ urlToRoute config url =
 
     else
         config.urlToRoute url
+
+
+toRedirectResponse :
+    ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage
+    -> { b | path : UrlPath }
+    -> RenderRequest.IncludeHtml
+    -> { c | headers : List ( String, String ), statusCode : Int }
+    -> { response | statusCode : Int, headers : List ( String, String ) }
+    -> Maybe Effect
+toRedirectResponse config serverRequestPayload includeHtml serverResponse responseMetadata =
+    PageServerResponse.toRedirect responseMetadata
+        |> Maybe.map
+            (\_ ->
+                let
+                    ( _, byteEncodedPageData ) =
+                        ( serverResponse.headers
+                        , PageServerResponse.toRedirect serverResponse
+                            |> Maybe.map
+                                (\{ location } ->
+                                    location
+                                        |> ResponseSketch.Redirect
+                                        |> config.encodeResponse
+                                )
+                            |> Maybe.withDefault (Bytes.Encode.unsignedInt8 0)
+                            |> Bytes.Encode.encode
+                        )
+                in
+                { route = serverRequestPayload.path |> UrlPath.toRelative
+                , contentJson = Dict.empty
+                , html = "This is intentionally blank HTML"
+                , errors = []
+                , head = []
+                , title = "This is an intentionally blank title"
+                , staticHttpCache = Dict.empty
+                , is404 = False
+                , statusCode =
+                    case includeHtml of
+                        RenderRequest.OnlyJson ->
+                            -- if this is a redirect for a `content.dat`, we don't want to send an *actual* redirect status code because the redirect needs to be handled in Elm (not by the Browser)
+                            200
+
+                        RenderRequest.HtmlAndJson ->
+                            responseMetadata.statusCode
+                , headers = responseMetadata.headers |> combineHeaders
+                }
+                    |> ToJsPayload.PageProgress
+                    |> Effect.SendSinglePageNew byteEncodedPageData
+            )
+
+
+combineHeaders : List ( String, String ) -> Dict String (List String)
+combineHeaders headers =
+    headers
+        |> List.foldl
+            (\( key, value ) dict ->
+                Dict.update key
+                    (Maybe.map ((::) value)
+                        >> Maybe.withDefault [ value ]
+                        >> Just
+                    )
+                    dict
+            )
+            Dict.empty