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

package/src/Pages/Internal/NotFoundReason.elm

@@ -44,11 +44,11 @@ type NotFoundReason
 document :
     List RoutePattern
     -> Payload
-    -> { title : String, body : Html msg }
+    -> { title : String, body : List (Html msg) }
 document pathPatterns payload =
     { title = "Page not found"
     , body =
-        Html.div
+        [ Html.div
             [ Attr.id "not-found-reason"
             , Attr.style "padding" "30px"
             ]
@@ -110,6 +110,7 @@ document pathPatterns payload =
                     , Html.text <| "TODO"
                     ]
             )
+        ]
     }
 
 

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

@@ -829,13 +829,13 @@ sendSinglePageProgress site contentJson config model info =
                                                             )
                                                             |> Tuple.first
 
-                                                    viewValue : { title : String, body : Html (Pages.Msg.Msg userMsg) }
+                                                    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 |> HtmlPrinter.htmlToString
+                                                    , view = viewValue.body |> bodyToString
                                                     , title = viewValue.title
                                                     }
 
@@ -871,7 +871,7 @@ sendSinglePageProgress site contentJson config model info =
                                                     pageData =
                                                         config.errorPageToData error
 
-                                                    viewValue : { title : String, body : Html (Pages.Msg.Msg userMsg) }
+                                                    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
@@ -880,7 +880,7 @@ sendSinglePageProgress site contentJson config model info =
                                                     , headers = record.headers
                                                     }
                                                     { head = config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData Nothing |> .head
-                                                    , view = viewValue.body |> HtmlPrinter.htmlToString
+                                                    , view = viewValue.body |> List.map HtmlPrinter.htmlToString |> String.join "\n"
                                                     , title = viewValue.title
                                                     }
                                     )
@@ -1143,7 +1143,7 @@ render404Page config sharedData model path notFoundReason =
                 pathAndRoute =
                     { path = path, route = config.notFoundRoute }
 
-                viewValue : { title : String, body : Html (Pages.Msg.Msg userMsg) }
+                viewValue : { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
                 viewValue =
                     (config.view Dict.empty
                         Dict.empty
@@ -1159,7 +1159,7 @@ render404Page config sharedData model path notFoundReason =
             in
             { route = Path.toAbsolute path
             , contentJson = Dict.empty
-            , html = viewValue.body |> HtmlPrinter.htmlToString
+            , html = viewValue.body |> bodyToString
             , errors = []
             , head = config.view Dict.empty Dict.empty Nothing pathAndRoute Nothing justSharedData pageData Nothing |> .head
             , title = viewValue.title
@@ -1179,7 +1179,7 @@ render404Page config sharedData model path notFoundReason =
                         |> config.encodeResponse
                         |> Bytes.Encode.encode
 
-                notFoundDocument : { title : String, body : Html msg }
+                notFoundDocument : { title : String, body : List (Html msg) }
                 notFoundDocument =
                     { path = path
                     , reason = notFoundReason
@@ -1188,7 +1188,7 @@ render404Page config sharedData model path notFoundReason =
             in
             { route = Path.toAbsolute path
             , contentJson = Dict.empty
-            , html = HtmlPrinter.htmlToString notFoundDocument.body
+            , html = bodyToString notFoundDocument.body
             , errors = []
             , head = []
             , title = notFoundDocument.title
@@ -1204,6 +1204,11 @@ render404Page config sharedData model path notFoundReason =
                 |> Effect.SendSinglePageNew byteEncodedPageData
 
 
+bodyToString : List (Html msg) -> String
+bodyToString body =
+    body |> List.map HtmlPrinter.htmlToString |> String.join "\n"
+
+
 urlToRoute : ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage -> Url -> route
 urlToRoute config url =
     if url.path |> String.startsWith "/____elm-pages-internal____" then

package/src/Pages/Internal/Platform.elm

@@ -58,7 +58,7 @@ type alias Program userModel userMsg pageData actionData sharedData errorPage =
 mainView :
     ProgramConfig userMsg userModel route pageData actionData sharedData effect (Msg userMsg pageData actionData sharedData errorPage) errorPage
     -> Model userModel pageData actionData sharedData
-    -> { title : String, body : Html (Pages.Msg.Msg userMsg) }
+    -> { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
 mainView config model =
     case model.notFound of
         Just info ->
@@ -95,7 +95,7 @@ mainView config model =
                 Err error ->
                     { title = "Page Data Error"
                     , body =
-                        Html.div [] [ Html.text error ]
+                        [ Html.div [] [ Html.text error ] ]
                     }
 
 
@@ -124,9 +124,9 @@ view config model =
     { title = title
     , body =
         [ onViewChangeElement model.url
-        , body |> Html.map UserMsg
         , AriaLiveAnnouncer.view model.ariaNavigationAnnouncement
         ]
+            ++ List.map (Html.map UserMsg) body
     }
 
 

package/src/Pages/ProgramConfig.elm

@@ -65,7 +65,7 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
         -> pageData
         -> Maybe actionData
         ->
-            { view : userModel -> { title : String, body : Html (Pages.Msg.Msg userMsg) }
+            { view : userModel -> { title : String, body : List (Html (Pages.Msg.Msg userMsg)) }
             , head : List Head.Tag
             }
     , handleRoute : route -> DataSource (Maybe NotFoundReason)