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

package/codegen/elm-pages-codegen.js

@@ -35312,7 +35312,11 @@ var $author$project$GenerateMain$otherFile = F2(
 						$author$project$Elm$string('Model mismatch')),
 						_Utils_Tuple2(
 						'body',
-						$author$project$Gen$Html$text('Model mismatch'))
+						$author$project$Elm$list(
+							_List_fromArray(
+								[
+									$author$project$Gen$Html$text('Model mismatch')
+								])))
 					])));
 		var view = A3(
 			$author$project$Elm$Declare$function,
@@ -35424,9 +35428,10 @@ var $author$project$GenerateMain$otherFile = F2(
 													_Utils_Tuple2('title', $author$project$Elm$Annotation$string),
 													_Utils_Tuple2(
 													'body',
-													$author$project$Gen$Html$annotation_.html(
-														$author$project$Gen$Pages$Msg$annotation_.msg(
-															A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg'))))
+													$author$project$Elm$Annotation$list(
+														$author$project$Gen$Html$annotation_.html(
+															$author$project$Gen$Pages$Msg$annotation_.msg(
+																A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')))))
 												])))),
 									_Utils_Tuple2(
 									'head',
@@ -35790,12 +35795,16 @@ var $author$project$GenerateMain$otherFile = F2(
 																				$author$project$Elm$string('Page not found')),
 																				_Utils_Tuple2(
 																				'body',
-																				A2(
-																					$author$project$Gen$Html$div,
-																					_List_Nil,
+																				$author$project$Elm$list(
 																					_List_fromArray(
 																						[
-																							$author$project$Gen$Html$text('This page could not be found.')
+																							A2(
+																							$author$project$Gen$Html$div,
+																							_List_Nil,
+																							_List_fromArray(
+																								[
+																									$author$project$Gen$Html$text('This page could not be found.')
+																								]))
 																						])))
 																			]));
 																})),

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 3296225071, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1130841854, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 3296225071,
+  initialSeed: 1130841854,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 1016531122, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 2471752417, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1016531122,
+  initialSeed: 2471752417,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/src/SharedTemplate.elm

@@ -34,7 +34,7 @@ type alias SharedTemplate msg sharedModel sharedData mappedMsg =
         -> sharedModel
         -> (msg -> mappedMsg)
         -> View mappedMsg
-        -> { body : Html mappedMsg, title : String }
+        -> { body : List (Html mappedMsg), title : String }
     , data : DataSource.DataSource sharedData
     , subscriptions : Path -> sharedModel -> Sub msg
     , onPageChange :

package/generator/src/generate-template-module-connector.js

@@ -63,32 +63,10 @@ async function generateTemplateModuleConnector(basePath, phase) {
 }
 
 async function runElmCodegenCli(templates, basePath, phase) {
-  // await runElmCodegenInstall();
-  // try {
-  //   await compileCliApp(
-  //     // { debug: true },
-  //     {},
-  //     `Generate.elm`,
-  //     path.join(process.cwd(), "elm-stuff/elm-pages-codegen.js"),
-  //     path.join(__dirname, "../../codegen"),
-
-  //     path.join(process.cwd(), "elm-stuff/elm-pages-codegen.js")
-  //   );
-  // } catch (error) {
-  //   console.log(restoreColorSafe(error));
-  //   process.exit(1);
-  //   // throw error;
-  // }
-
   const filePath = path.join(__dirname, `../../codegen/elm-pages-codegen.js`);
 
-  // TODO use uncached require here to prevent stale code from running
-
   const promise = new Promise((resolve, reject) => {
     const elmPagesCodegen = require(filePath).Elm.Generate;
-      // path.join(
-      // process.cwd(),
-      // "./elm-stuff/elm-pages-codegen.js")
 
     const app = elmPagesCodegen.init({
       flags: { templates: templates, basePath, phase },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",

package/src/DataSource/File.elm

@@ -171,7 +171,7 @@ just the metadata.
             (Decode.field "tags" (Decode.list Decode.string))
 
 If you wanted to use this to get this metadata for all blog posts in a folder, you could use
-the [`DataSource`](DataSource) API along with [`DataSource.Glob`](DataSource.Glob).
+the [`DataSource`](DataSource) API along with [`DataSource.Glob`](DataSource-Glob).
 
     import DataSource exposing (DataSource)
     import DataSource.File as File

package/src/DataSource/Internal/Request.elm

@@ -1,10 +1,5 @@
 module DataSource.Internal.Request exposing (request)
 
-{-| Build a `DataSource.Http` request (analogous to [Http.request](https://package.elm-lang.org/packages/elm/http/latest/Http#request)).
-This function takes in all the details to build a `DataSource.Http` request, but you can build your own simplified helper functions
-with this as a low-level detail, or you can use functions like [DataSource.Http.get](#get).
--}
-
 import DataSource exposing (DataSource)
 import DataSource.Http exposing (Body, Expect)
 

package/src/Form.elm

@@ -575,7 +575,7 @@ field name (Field fieldParser kind) (Form definitions parseFn toInitialValues) =
 
 {-| Declare a hidden field for the form.
 
-Unlike [`field`](#field) declarations which are rendered using [`Form.ViewField`](Form-ViewField)
+Unlike [`field`](#field) declarations which are rendered using [`Form.FieldView`](Form-FieldView)
 functions, `hiddenField` inputs are automatically inserted into the form when you render it.
 
 You define the field's validations the same way as for `field`, with the

package/src/Head/Seo.elm

@@ -49,10 +49,12 @@ with the `head` function that you pass to your Pages config (`Pages.application`
 
 -}
 
+import DateOrDateTime exposing (DateOrDateTime)
 import Head
 import Head.Twitter as Twitter
 import LanguageTag.Country
 import LanguageTag.Language
+import MimeType exposing (MimeType)
 import Pages.Url
 
 
@@ -235,9 +237,9 @@ website common =
 article :
     { tags : List String
     , section : Maybe String
-    , publishedTime : Maybe Iso8601DateTime
-    , modifiedTime : Maybe Iso8601DateTime
-    , expirationTime : Maybe Iso8601DateTime
+    , publishedTime : Maybe DateOrDateTime
+    , modifiedTime : Maybe DateOrDateTime
+    , expirationTime : Maybe DateOrDateTime
     }
     -> Common
     -> List Head.Tag
@@ -252,7 +254,7 @@ book :
     ->
         { tags : List String
         , isbn : Maybe String
-        , releaseDate : Maybe Iso8601DateTime
+        , releaseDate : Maybe DateOrDateTime
         }
     -> List Head.Tag
 book common details =
@@ -354,7 +356,7 @@ tagsForAudio : Audio -> List ( String, Maybe Head.AttributeValue )
 tagsForAudio audio =
     [ ( "og:audio", audio.url |> Head.raw |> Just )
     , ( "og:audio:secure_url", audio.url |> Head.raw |> Just )
-    , ( "og:audio:type", audio.mimeType |> Maybe.map Head.raw )
+    , ( "og:audio:type", audio.mimeType |> Maybe.map (MimeType.toString >> Head.raw) )
     ]
 
 
@@ -371,14 +373,14 @@ type ContentDetails
     | Article
         { tags : List String
         , section : Maybe String
-        , publishedTime : Maybe Iso8601DateTime
-        , modifiedTime : Maybe Iso8601DateTime
-        , expirationTime : Maybe Iso8601DateTime
+        , publishedTime : Maybe DateOrDateTime
+        , modifiedTime : Maybe DateOrDateTime
+        , expirationTime : Maybe DateOrDateTime
         }
     | Book
         { tags : List String
         , isbn : Maybe String
-        , releaseDate : Maybe Iso8601DateTime
+        , releaseDate : Maybe DateOrDateTime
         }
     | Song
         {-
@@ -399,20 +401,6 @@ type ContentDetails
         }
 
 
-{-| <https://en.wikipedia.org/wiki/ISO_8601>
--}
-type alias Iso8601DateTime =
-    -- TODO should be more type-safe here
-    String
-
-
-{-| <https://en.wikipedia.org/wiki/Media_type>
--}
-type alias MimeType =
-    -- TODO should be more type-safe here
-    String
-
-
 {-| See <https://ogp.me/#structured>
 -}
 type alias Image =
@@ -448,6 +436,7 @@ tagsForVideo video =
     , ( "og:video:secure_url", video.url |> Head.raw |> Just )
     , ( "og:video:width", video.dimensions |> Maybe.map .width |> Maybe.map String.fromInt |> Maybe.map Head.raw )
     , ( "og:video:height", video.dimensions |> Maybe.map .height |> Maybe.map String.fromInt |> Maybe.map Head.raw )
+    , ( "og:video:type", video.mimeType |> Maybe.map (MimeType.toString >> Head.raw) )
     ]
 
 
@@ -466,9 +455,9 @@ tags (Content common details) =
                     -}
                     [ ( "og:type", "article" |> Head.raw |> Just )
                     , ( "article:section", articleDetails.section |> Maybe.map Head.raw )
-                    , ( "article:published_time", articleDetails.publishedTime |> Maybe.map Head.raw )
-                    , ( "article:modified_time", articleDetails.modifiedTime |> Maybe.map Head.raw )
-                    , ( "article:expiration_time", articleDetails.expirationTime |> Maybe.map Head.raw )
+                    , ( "article:published_time", articleDetails.publishedTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
+                    , ( "article:modified_time", articleDetails.modifiedTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
+                    , ( "article:expiration_time", articleDetails.expirationTime |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
                     ]
                         ++ List.map
                             (\tag -> ( "article:tag", tag |> Head.raw |> Just ))
@@ -477,7 +466,7 @@ tags (Content common details) =
                 Book bookDetails ->
                     [ ( "og:type", "book" |> Head.raw |> Just )
                     , ( "og:isbn", bookDetails.isbn |> Maybe.map Head.raw )
-                    , ( "og:release_date", bookDetails.releaseDate |> Maybe.map Head.raw )
+                    , ( "og:release_date", bookDetails.releaseDate |> Maybe.map (DateOrDateTime.dateOrDateTimeToIso8601String >> Head.raw) )
                     ]
                         ++ List.map
                             (\tag -> ( "book:tag", tag |> Head.raw |> Just ))

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)