dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-11-29 09:32:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Wire through error message from failed static requests.

Browse Source
This commit is contained in:
Dillon Kearns 2019-10-29 13:10:00 -07:00
parent c313a1ce6a
commit 350408b8a2
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Pages/Internal/Platform/Cli.elm
View File

@ -125,6 +125,7 @@ type Error
= MissingSecret BuildError
| MetadataDecodeError BuildError
| InternalError BuildError
| FailedStaticHttpRequestError BuildError
type alias ErrorContext =
@ -334,22 +335,12 @@ init toModel contentCache siteMetadata config cliMsgConstructor flags =
Err errors ->
Dict.empty
in
case Decode.decodeValue (Decode.field "secrets" Decode.string) flags of
Ok _ ->
( Model staticResponses secrets (pageErrors |> List.map MetadataDecodeError) |> toModel
, sendStaticResponsesIfDone
(pageErrors |> List.map MetadataDecodeError)
Dict.empty
config.manifest
)
Err error ->
( Model staticResponses
Secrets.empty
[ InternalError <| { message = [ Terminal.text <| "Failed to parse flags: " ++ Decode.errorToString error ] } ]
|> toModel
, NoEffect
)
( Model staticResponses secrets (pageErrors |> List.map MetadataDecodeError) |> toModel
, sendStaticResponsesIfDone
(pageErrors |> List.map MetadataDecodeError)
staticResponses
config.manifest
)
Err metadataParserErrors ->
( Model Dict.empty
@ -578,14 +569,22 @@ sendStaticResponsesIfDone errors staticResponses manifest =
failedRequests =
staticResponses
|> Dict.Extra.filterMap
(\path (NotFetched (StaticHttpRequest.Request ( urls, lookup )) rawResponses) ->
|> Dict.toList
|> List.filterMap
(\( path, NotFetched (StaticHttpRequest.Request ( urls, lookup )) rawResponses ) ->
case lookup rawResponses of
Ok _ ->
Nothing
Err error ->
Just error
{ message =
[ Terminal.text path
, Terminal.text "\n\n"
, Terminal.text error
]
}
|> FailedStaticHttpRequestError
|> Just
)
in
if pendingRequests then
@ -593,7 +592,7 @@ sendStaticResponsesIfDone errors staticResponses manifest =
else
SendJsData
(if List.isEmpty errors && Dict.isEmpty failedRequests then
(if List.isEmpty errors && List.isEmpty failedRequests then
Success
(ToJsSuccessPayload
(encodeStaticResponses staticResponses)
@ -601,8 +600,7 @@ sendStaticResponsesIfDone errors staticResponses manifest =
)
else
-- Debug.todo <| errorsToString errors
Errors <| errorsToString errors
Errors <| errorsToString (failedRequests ++ errors)
)
@ -625,6 +623,9 @@ errorToString error =
InternalError buildError ->
buildError.message |> Terminal.toString
FailedStaticHttpRequestError buildError ->
buildError.message |> Terminal.toString
encodeStaticResponses : StaticResponses -> Dict String (Dict String String)
encodeStaticResponses staticResponses =