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

Update pokedex example.

Browse Source
This commit is contained in:
Dillon Kearns 2021-12-15 09:26:23 -08:00
parent b2f514d0b0
commit dacba7358e
4 changed files with 94 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/pokedex/src/Page/Index.elm
View File

@ -16,7 +16,7 @@ import View exposing (View)
type alias Model =
()
{}
type alias Msg =

2
examples/pokedex/src/Page/PokedexNumber_.elm
View File

@ -17,7 +17,7 @@ import View exposing (View)
type alias Model =
()
{}
type alias Msg =

1
examples/pokedex/src/Site.elm
View File

@ -14,7 +14,6 @@ type alias Data =
config : SiteConfig Data
config =
\routes ->
{ data = data
, canonicalUrl = "https://elm-pages.com"
, manifest = manifest

175
generator/src/Page.elm
View File

@ -5,7 +5,7 @@ module Page exposing
, prerender, single
, Builder(..)
, PageWithState
--, serverless, prerenderWithFallback
, serverless, prerenderWithFallback
)
{-|
@ -77,8 +77,7 @@ When there are Dynamic Route Segments, you need to tell `elm-pages` which pages
-}
--import DataSource.ServerRequest as ServerRequest exposing (ServerRequest)
import DataSource.ServerRequest as ServerRequest exposing (ServerRequest)
import Browser.Navigation
import DataSource exposing (DataSource)
import Head
@ -306,88 +305,88 @@ prerender { data, head, pages } =
--{-| -}
--prerenderWithFallback :
-- { data : routeParams -> DataSource data
-- , pages : DataSource (List routeParams)
-- , handleFallback : routeParams -> DataSource Bool
-- , head : StaticPayload data routeParams -> List Head.Tag
-- }
-- -> Builder routeParams data
--prerenderWithFallback { data, head, pages, handleFallback } =
-- WithData
-- { data = data
-- , staticRoutes = pages
-- , head = head
-- , serverless = False
-- , handleRoute =
-- \moduleContext toRecord routeParams ->
-- handleFallback routeParams
-- |> DataSource.andThen
-- (\handleFallbackResult ->
-- if handleFallbackResult then
-- DataSource.succeed Nothing
--
-- else
-- -- we want to lazily evaluate this in our on-demand builders
-- -- so we try handle fallback first and short-circuit in those cases
-- -- TODO - we could make an optimization to handle this differently
-- -- between on-demand builders and the dev server
-- -- we only need to match the pre-rendered routes in the dev server,
-- -- not in on-demand builders
-- pages
-- |> DataSource.map
-- (\allRoutes ->
-- if allRoutes |> List.member routeParams then
-- Nothing
--
-- else
-- Just <|
-- NotFoundReason.NotPrerenderedOrHandledByFallback
-- { moduleName = moduleContext.moduleName
-- , routePattern = moduleContext.routePattern
-- , matchedRouteParams = toRecord routeParams
-- }
-- (allRoutes
-- |> List.map toRecord
-- )
-- )
-- )
-- , kind = "prerender-with-fallback"
-- }
--
--
--{-| -}
--serverless :
-- { data : (ServerRequest decodedRequest -> DataSource decodedRequest) -> routeParams -> DataSource data
-- , routeFound : routeParams -> DataSource Bool
-- , head : StaticPayload data routeParams -> List Head.Tag
-- }
-- -> Builder routeParams data
--serverless { data, head, routeFound } =
-- WithData
-- { data = data ServerRequest.toStaticHttp
-- , staticRoutes = DataSource.succeed []
-- , head = head
-- , serverless = True
-- , handleRoute =
-- \moduleContext toRecord routeParams ->
-- routeFound routeParams
-- |> DataSource.map
-- (\found ->
-- if found then
-- Nothing
--
-- else
-- Just
-- (NotFoundReason.UnhandledServerRoute
-- { moduleName = moduleContext.moduleName
-- , routePattern = moduleContext.routePattern
-- , matchedRouteParams = toRecord routeParams
-- }
-- )
-- )
-- , kind = "serverless"
-- }
--
--
{-| -}
prerenderWithFallback :
{ data : routeParams -> DataSource data
, pages : DataSource (List routeParams)
, handleFallback : routeParams -> DataSource Bool
, head : StaticPayload data routeParams -> List Head.Tag
}
-> Builder routeParams data
prerenderWithFallback { data, head, pages, handleFallback } =
WithData
{ data = data
, staticRoutes = pages
, head = head
, serverless = False
, handleRoute =
\moduleContext toRecord routeParams ->
handleFallback routeParams
|> DataSource.andThen
(\handleFallbackResult ->
if handleFallbackResult then
DataSource.succeed Nothing
else
-- we want to lazily evaluate this in our on-demand builders
-- so we try handle fallback first and short-circuit in those cases
-- TODO - we could make an optimization to handle this differently
-- between on-demand builders and the dev server
-- we only need to match the pre-rendered routes in the dev server,
-- not in on-demand builders
pages
|> DataSource.map
(\allRoutes ->
if allRoutes |> List.member routeParams then
Nothing
else
Just <|
Pages.Internal.NotFoundReason.NotPrerenderedOrHandledByFallback
{ moduleName = moduleContext.moduleName
, routePattern = moduleContext.routePattern
, matchedRouteParams = toRecord routeParams
}
(allRoutes
|> List.map toRecord
)
)
)
, kind = "prerender-with-fallback"
}
{-| -}
serverless :
{ data : (ServerRequest decodedRequest -> DataSource decodedRequest) -> routeParams -> DataSource data
, routeFound : routeParams -> DataSource Bool
, head : StaticPayload data routeParams -> List Head.Tag
}
-> Builder routeParams data
serverless { data, head, routeFound } =
WithData
{ data = data ServerRequest.toStaticHttp
, staticRoutes = DataSource.succeed []
, head = head
, serverless = True
, handleRoute =
\moduleContext toRecord routeParams ->
routeFound routeParams
|> DataSource.map
(\found ->
if found then
Nothing
else
Just
(Pages.Internal.NotFoundReason.UnhandledServerRoute
{ moduleName = moduleContext.moduleName
, routePattern = moduleContext.routePattern
, matchedRouteParams = toRecord routeParams
}
)
)
, kind = "serverless"
}