dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-12-02 22:45:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace one call to permanent error function.

Browse Source
This commit is contained in:
Dillon Kearns 2020-10-07 11:45:54 -07:00
parent 962c397d75
commit 560be03e85
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Pages/Internal/Platform/StaticResponses.elm
View File

@ -452,7 +452,7 @@ nextStep config siteMetadata mode secrets allRawResponses errors (StaticResponse
|> List.concatMap
(\( path, NotFetched request rawResponses ) ->
let
( status, continuationRequests ) =
staticRequestsStatus =
StaticHttpRequest.cacheRequestResolution
ApplicationType.Cli
request
@ -469,10 +469,12 @@ nextStep config siteMetadata mode secrets allRawResponses errors (StaticResponse
)
maybePermanentError =
StaticHttpRequest.permanentError
ApplicationType.Cli
request
usableRawResponses
case staticRequestsStatus of
StaticHttpRequest.HasPermanentError theError ->
Just theError
_ ->
Nothing
decoderErrors =
maybePermanentError

23
src/Pages/StaticHttpRequest.elm
View File

@ -1,4 +1,4 @@
module Pages.StaticHttpRequest exposing (Error(..), Request(..), cacheRequestResolution, permanentError, resolve, resolveUrls, strippedResponses, toBuildError, urls)
module Pages.StaticHttpRequest exposing (Error(..), Request(..), Status(..), cacheRequestResolution, permanentError, resolve, resolveUrls, strippedResponses, toBuildError, urls)
import BuildError exposing (BuildError)
import Dict exposing (Dict)
@ -145,14 +145,15 @@ cacheRequestResolution :
ApplicationType
-> Request value
-> RequestsAndPending
-> ( Status value, List (Secrets.Value Pages.StaticHttp.Request.Request) )
-> Status value
cacheRequestResolution =
cacheRequestResolutionHelp []
type Status value
= CompleteWithError Error
| Complete value
= Incomplete (List (Secrets.Value Pages.StaticHttp.Request.Request))
| HasPermanentError Error
| Complete value -- TODO include stripped responses?
cacheRequestResolutionHelp :
@ -160,7 +161,7 @@ cacheRequestResolutionHelp :
-> ApplicationType
-> Request value
-> RequestsAndPending
-> ( Status value, List (Secrets.Value Pages.StaticHttp.Request.Request) )
-> Status value
cacheRequestResolutionHelp foundUrls appType request rawResponses =
case request of
Request ( urlList, lookupFn ) ->
@ -169,7 +170,15 @@ cacheRequestResolutionHelp foundUrls appType request rawResponses =
cacheRequestResolutionHelp urlList appType nextRequest rawResponses
Err error ->
( CompleteWithError error, urlList ++ foundUrls )
case error of
MissingHttpResponse string ->
Incomplete (urlList ++ foundUrls)
DecoderError string ->
HasPermanentError error
UserCalledStaticHttpFail string ->
HasPermanentError error
Done value ->
( Complete value, [] )
Complete value