elm-pages 3.0.0-beta.9 → 3.0.1

package/generator/template/app/Route/Greet.elm

@@ -0,0 +1,107 @@
+module Route.Greet exposing (ActionData, Data, Model, Msg, route)
+
+import BackendTask exposing (BackendTask)
+import BackendTask.Http
+import ErrorPage exposing (ErrorPage)
+import FatalError exposing (FatalError)
+import Head
+import Head.Seo as Seo
+import Html
+import Json.Decode as Decode
+import Pages.Url
+import PagesMsg exposing (PagesMsg)
+import RouteBuilder exposing (App, StatefulRoute, StatelessRoute)
+import Server.Request as Request exposing (Request)
+import Server.Response as Response exposing (Response)
+import Shared
+import View exposing (View)
+
+
+type alias Model =
+    {}
+
+
+type alias Msg =
+    ()
+
+
+type alias RouteParams =
+    {}
+
+
+route : StatelessRoute RouteParams Data ActionData
+route =
+    RouteBuilder.serverRender
+        { head = head
+        , data = data
+        , action = \_ _ -> BackendTask.fail (FatalError.fromString "No action.")
+        }
+        |> RouteBuilder.buildNoState { view = view }
+
+
+type alias Data =
+    { name : Maybe String
+    }
+
+
+type alias ActionData =
+    {}
+
+
+data : RouteParams -> Request -> BackendTask FatalError (Response Data ErrorPage)
+data routeParams request =
+    case request |> Request.queryParam "name" of
+        Just name ->
+            BackendTask.Http.getJson "http://worldtimeapi.org/api/timezone/America/Los_Angeles"
+                (Decode.field "utc_datetime" Decode.string)
+                |> BackendTask.allowFatal
+                |> BackendTask.map
+                    (\dateTimeString ->
+                        Response.render
+                            { name = Just dateTimeString }
+                    )
+
+        Nothing ->
+            BackendTask.succeed
+                (Response.render
+                    { name = Nothing }
+                )
+
+
+head :
+    App Data ActionData RouteParams
+    -> List Head.Tag
+head app =
+    Seo.summary
+        { canonicalUrlOverride = Nothing
+        , siteName = "elm-pages"
+        , image =
+            { url = Pages.Url.external "TODO"
+            , alt = "elm-pages logo"
+            , dimensions = Nothing
+            , mimeType = Nothing
+            }
+        , description = "TODO"
+        , locale = Nothing
+        , title = "TODO title" -- metadata.title -- TODO
+        }
+        |> Seo.website
+
+
+view :
+    App Data ActionData RouteParams
+    -> Shared.Model
+    -> View (PagesMsg Msg)
+view app shared =
+    { title = "Greetings"
+    , body =
+        [ Html.div []
+            [ case app.data.name of
+                Just name ->
+                    Html.text ("Hello " ++ name)
+
+                Nothing ->
+                    Html.text "Hello, I didn't find your name"
+            ]
+        ]
+    }

package/generator/template/app/Route/Hello.elm

@@ -0,0 +1,119 @@
+module Route.Hello exposing (ActionData, Data, Model, Msg(..), RouteParams, action, data, route)
+
+import BackendTask exposing (BackendTask)
+import BackendTask.Http
+import Effect exposing (Effect)
+import ErrorPage exposing (ErrorPage)
+import FatalError exposing (FatalError)
+import Head
+import Html
+import Json.Decode as Decode
+import PagesMsg exposing (PagesMsg)
+import RouteBuilder exposing (App)
+import Server.Request exposing (Request)
+import Server.Response
+import Shared
+import UrlPath exposing (UrlPath)
+import View exposing (View)
+
+
+type alias Model =
+    {}
+
+
+type Msg
+    = NoOp
+
+
+type alias RouteParams =
+    {}
+
+
+route =
+    RouteBuilder.serverRender { data = data, action = action, head = head }
+        |> RouteBuilder.buildWithLocalState
+            { view = view
+            , subscriptions = subscriptions
+            , update = update
+            , init = init
+            }
+
+
+init :
+    App Data ActionData RouteParams
+    -> Shared.Model
+    -> ( Model, Effect Msg )
+init app shared =
+    ( {}, Effect.none )
+
+
+update :
+    App Data ActionData RouteParams
+    -> Shared.Model
+    -> Msg
+    -> Model
+    -> ( Model, Effect Msg )
+update app shared msg model =
+    case msg of
+        NoOp ->
+            ( model, Effect.none )
+
+
+subscriptions :
+    RouteParams
+    -> UrlPath
+    -> Shared.Model
+    -> Model
+    -> Sub Msg
+subscriptions routeParams path shared model =
+    Sub.none
+
+
+type alias Data =
+    { stars : Int
+    }
+
+
+type alias ActionData =
+    {}
+
+
+data :
+    RouteParams
+    -> Request
+    -> BackendTask FatalError (Server.Response.Response Data ErrorPage)
+data routeParams request =
+    BackendTask.Http.getWithOptions
+        { url = "https://api.github.com/repos/dillonkearns/elm-pages"
+        , expect = BackendTask.Http.expectJson (Decode.field "stargazers_count" Decode.int)
+        , headers = []
+        , cacheStrategy = Just BackendTask.Http.IgnoreCache
+        , retries = Nothing
+        , timeoutInMs = Nothing
+        , cachePath = Nothing
+        }
+        |> BackendTask.allowFatal
+        |> BackendTask.map
+            (\stars -> Server.Response.render { stars = stars })
+
+
+head : App Data ActionData RouteParams -> List Head.Tag
+head app =
+    []
+
+
+view :
+    App Data ActionData RouteParams
+    -> Shared.Model
+    -> Model
+    -> View (PagesMsg Msg)
+view app shared model =
+    { title = "Hello", body = [ Html.text (String.fromInt app.data.stars) ] }
+
+
+action :
+    RouteParams
+    -> Request
+    -> BackendTask.BackendTask FatalError.FatalError (Server.Response.Response ActionData ErrorPage.ErrorPage)
+action routeParams request =
+    BackendTask.succeed (Server.Response.render {})

package/generator/template/app/Route/Index.elm

@@ -1,14 +1,15 @@
-module Route.Index exposing (Data, Model, Msg, route)
+module Route.Index exposing (ActionData, Data, Model, Msg, route)
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Head
 import Head.Seo as Seo
 import Html
-import Html.Attributes as Attr
-import Pages.PageUrl exposing (PageUrl)
 import Pages.Url
-import Path
-import RouteBuilder exposing (StatelessRoute, StaticPayload)
+import PagesMsg exposing (PagesMsg)
+import UrlPath
+import Route
+import RouteBuilder exposing (App, StatelessRoute)
 import Shared
 import View exposing (View)
 
@@ -26,6 +27,11 @@ type alias RouteParams =
 
 
 type alias Data =
+    { message : String
+    }
+
+
+type alias ActionData =
     {}
 
 
@@ -38,20 +44,22 @@ route =
         |> RouteBuilder.buildNoState { view = view }
 
 
-data : DataSource Data
+data : BackendTask FatalError Data
 data =
-    DataSource.succeed Data
+    BackendTask.succeed Data
+        |> BackendTask.andMap
+            (BackendTask.succeed "Hello!")
 
 
 head :
-    StaticPayload Data ActionData RouteParams
+    App Data ActionData RouteParams
     -> List Head.Tag
-head static =
+head app =
     Seo.summary
         { canonicalUrlOverride = Nothing
         , siteName = "elm-pages"
         , image =
-            { url = [ "images", "icon-png.png" ] |> Path.join |> Pages.Url.fromPath
+            { url = [ "images", "icon-png.png" ] |> UrlPath.join |> Pages.Url.fromPath
             , alt = "elm-pages logo"
             , dimensions = Nothing
             , mimeType = Nothing
@@ -64,24 +72,17 @@ head static =
 
 
 view :
-    Maybe PageUrl
+    App Data ActionData RouteParams
     -> Shared.Model
-    -> StaticPayload Data ActionData RouteParams
-    -> View Msg
-view maybeUrl sharedModel static =
+    -> View (PagesMsg Msg)
+view app shared =
     { title = "elm-pages is running"
     , body =
         [ Html.h1 [] [ Html.text "elm-pages is up and running!" ]
-        , Html.h2 [] [ Html.text "Learn more" ]
-        , Html.ul
-            []
-            [ Html.li []
-                [ Html.a [ Attr.href "https://elm-pages.com/docs/" ] [ Html.text "Framework documentation" ]
-                ]
-            , Html.li
-                []
-                [ Html.a [ Attr.href "https://package.elm-lang.org/packages/dillonkearns/elm-pages/latest/" ] [ Html.text "Elm package documentation" ]
-                ]
+        , Html.p []
+            [ Html.text <| "The message is: " ++ app.data.message
             ]
+        , Route.Blog__Slug_ { slug = "hello" }
+            |> Route.link [] [ Html.text "My blog post" ]
         ]
     }

package/generator/template/app/Shared.elm

@@ -1,12 +1,13 @@
 module Shared exposing (Data, Model, Msg(..), SharedMsg(..), template)
 
-import Browser.Navigation
-import DataSource
+import BackendTask exposing (BackendTask)
+import Effect exposing (Effect)
+import FatalError exposing (FatalError)
 import Html exposing (Html)
 import Html.Events
 import Pages.Flags
 import Pages.PageUrl exposing (PageUrl)
-import Path exposing (Path)
+import UrlPath exposing (UrlPath)
 import Route exposing (Route)
 import SharedTemplate exposing (SharedTemplate)
 import View exposing (View)
@@ -42,80 +43,78 @@ type alias Model =
 
 
 init :
-    Maybe Browser.Navigation.Key
-    -> Pages.Flags.Flags
+    Pages.Flags.Flags
     ->
         Maybe
             { path :
-                { path : Path
+                { path : UrlPath
                 , query : Maybe String
                 , fragment : Maybe String
                 }
             , metadata : route
             , pageUrl : Maybe PageUrl
             }
-    -> ( Model, Cmd Msg )
-init navigationKey flags maybePagePath =
+    -> ( Model, Effect Msg )
+init flags maybePagePath =
     ( { showMenu = False }
-    , Cmd.none
+    , Effect.none
     )
 
 
-update : Msg -> Model -> ( Model, Cmd Msg )
+update : Msg -> Model -> ( Model, Effect Msg )
 update msg model =
     case msg of
         SharedMsg globalMsg ->
-            ( model, Cmd.none )
+            ( model, Effect.none )
 
         MenuClicked ->
-            ( { model | showMenu = not model.showMenu }, Cmd.none )
+            ( { model | showMenu = not model.showMenu }, Effect.none )
 
 
-subscriptions : Path -> Model -> Sub Msg
+subscriptions : UrlPath -> Model -> Sub Msg
 subscriptions _ _ =
     Sub.none
 
 
-data : DataSource.DataSource Data
+data : BackendTask FatalError Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 
 
 view :
     Data
     ->
-        { path : Path
+        { path : UrlPath
         , route : Maybe Route
         }
     -> Model
     -> (Msg -> msg)
     -> View msg
-    -> { body : Html msg, title : String }
+    -> { body : List (Html msg), title : String }
 view sharedData page model toMsg pageView =
     { body =
-        Html.div []
-            [ Html.nav []
-                [ Html.button
-                    [ Html.Events.onClick MenuClicked ]
-                    [ Html.text
-                        (if model.showMenu then
-                            "Close Menu"
-
-                         else
-                            "Open Menu"
-                        )
-                    ]
-                , if model.showMenu then
-                    Html.ul []
-                        [ Html.li [] [ Html.text "Menu item 1" ]
-                        , Html.li [] [ Html.text "Menu item 2" ]
-                        ]
-
-                  else
-                    Html.text ""
+        [ Html.nav []
+            [ Html.button
+                [ Html.Events.onClick MenuClicked ]
+                [ Html.text
+                    (if model.showMenu then
+                        "Close Menu"
+
+                     else
+                        "Open Menu"
+                    )
                 ]
-                |> Html.map toMsg
-            , Html.main_ [] pageView.body
+            , if model.showMenu then
+                Html.ul []
+                    [ Html.li [] [ Html.text "Menu item 1" ]
+                    , Html.li [] [ Html.text "Menu item 2" ]
+                    ]
+
+              else
+                Html.text ""
             ]
+            |> Html.map toMsg
+        , Html.main_ [] pageView.body
+        ]
     , title = pageView.title
     }

package/generator/template/app/Site.elm

@@ -1,6 +1,7 @@
 module Site exposing (config)
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Head
 import SiteConfig exposing (SiteConfig)
 
@@ -12,13 +13,9 @@ config =
     }
 
 
-head : DataSource (List Head.Tag)
+head : BackendTask FatalError (List Head.Tag)
 head =
     [ Head.metaName "viewport" (Head.raw "width=device-width,initial-scale=1")
-    , Head.metaName "mobile-web-app-capable" (Head.raw "yes")
-    , Head.metaName "theme-color" (Head.raw "#ffffff")
-    , Head.metaName "apple-mobile-web-app-capable" (Head.raw "yes")
-    , Head.metaName "apple-mobile-web-app-status-bar-style" (Head.raw "black-translucent")
     , Head.sitemapLink "/sitemap.xml"
     ]
-        |> DataSource.succeed
+        |> BackendTask.succeed

package/generator/template/app/View.elm

@@ -1,23 +1,24 @@
-module View exposing (View, map, placeholder)
+module View exposing (View, map)
+
+{-|
+
+@docs View, map
+
+-}
 
 import Html exposing (Html)
 
 
+{-| -}
 type alias View msg =
     { title : String
     , body : List (Html msg)
     }
 
 
+{-| -}
 map : (msg1 -> msg2) -> View msg1 -> View msg2
 map fn doc =
     { title = doc.title
     , body = List.map (Html.map fn) doc.body
     }
-
-
-placeholder : String -> View msg
-placeholder moduleName =
-    { title = "Placeholder - " ++ moduleName
-    , body = [ Html.text moduleName ]
-    }

package/generator/template/codegen/elm.codegen.json

@@ -0,0 +1,18 @@
+{
+    "elm-codegen-version": "0.2.0",
+    "codegen-helpers": {
+        "packages": {
+            "elm/core": "1.0.5",
+            "dillonkearns/elm-form": "3.0.0",
+            "elm/html": "1.0.0",
+            "rtfeldman/elm-css": "18.0.0",
+            "dillonkearns/elm-pages": "10.0.0",
+            "elm/json": "1.1.3"
+        },
+        "local": [
+            ".elm-pages/",
+            "app/",
+            "src/"
+        ]
+    }
+}

package/generator/template/custom-backend-task.ts

@@ -0,0 +1,3 @@
+export async function hello(name) {
+  return `Hello ${name}!`;
+}

package/generator/template/elm-pages.config.mjs

@@ -1,5 +1,18 @@
 import { defineConfig } from "vite";
+import adapter from "elm-pages/adapter/netlify.js";
 
 export default {
   vite: defineConfig({}),
+  adapter,
+  headTagsTemplate(context) {
+    return `
+<link rel="stylesheet" href="/style.css" />
+<meta name="generator" content="elm-pages v${context.cliVersion}" />
+`;
+  },
+  preloadTagForFile(file) {
+    // add preload directives for JS assets and font assets, etc., skip for CSS files
+    // this function will be called with each file that is procesed by Vite, including any files in your headTagsTemplate in your config
+    return !file.endsWith(".css");
+  },
 };

package/generator/template/elm-tooling.json

@@ -1,7 +1,4 @@
 {
-    "entrypoints": [
-        "./src/Main.elm"
-    ],
     "tools": {
         "elm": "0.19.1",
         "elm-format": "0.8.5"

package/generator/template/elm.json

@@ -1,52 +1,61 @@
 {
     "type": "application",
     "source-directories": [
-        "app",
         "src",
+        "app",
         ".elm-pages"
     ],
     "elm-version": "0.19.1",
     "dependencies": {
         "direct": {
-            "dillonkearns/elm-pages": "9.0.0",
-            "elm/browser": "1.0.2",
-            "elm/core": "1.0.5",
-            "elm/html": "1.0.0",
-            "elm/json": "1.1.3",
-            "elm/url": "1.0.0"
-        },
-        "indirect": {
-            "MartinSStewart/elm-serialize": "1.2.6",
             "avh4/elm-color": "1.0.0",
-            "bburdette/toop": "1.2.0",
             "danfishgold/base64-bytes": "1.1.0",
             "danyx23/elm-mimetype": "4.0.1",
             "dillonkearns/elm-bcp47-language-tag": "1.0.1",
+            "dillonkearns/elm-form": "3.0.0",
+            "dillonkearns/elm-markdown": "7.0.1",
+            "dillonkearns/elm-pages": "10.0.0",
+            "elm/browser": "1.0.2",
             "elm/bytes": "1.0.8",
-            "elm/file": "1.0.5",
+            "elm/core": "1.0.5",
+            "elm/html": "1.0.0",
             "elm/http": "2.0.0",
+            "elm/json": "1.1.3",
             "elm/parser": "1.1.0",
-            "elm/project-metadata-utils": "1.0.2",
-            "elm/random": "1.0.0",
             "elm/regex": "1.0.0",
             "elm/time": "1.0.0",
-            "elm/virtual-dom": "1.0.2",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.3",
             "elm-community/dict-extra": "2.4.0",
-            "elm-community/list-extra": "8.5.1",
-            "elm-explorations/test": "1.2.2",
-            "fredcy/elm-parseint": "2.0.1",
-            "jfmengels/elm-review": "2.6.1",
-            "mgold/elm-nonempty-list": "4.2.0",
+            "elm-community/list-extra": "8.7.0",
+            "elm-community/result-extra": "2.4.0",
+            "jluckyiv/elm-utc-date-strings": "1.0.0",
+            "justinmimbs/date": "4.0.1",
+            "mdgriffith/elm-codegen": "3.0.0",
             "miniBill/elm-codec": "2.0.0",
-            "miniBill/elm-unicode": "1.0.2",
             "noahzgordon/elm-color-extra": "1.0.2",
+            "robinheghan/fnv1a": "1.0.0",
+            "rtfeldman/elm-css": "18.0.0",
+            "the-sett/elm-syntax-dsl": "6.0.2",
+            "turboMaCk/non-empty-list-alias": "1.3.1",
+            "vito/elm-ansi": "10.0.1"
+        },
+        "indirect": {
+            "Chadtech/elm-bool-extra": "2.4.2",
+            "dillonkearns/elm-cli-options-parser": "3.2.0",
+            "dillonkearns/elm-date-or-date-time": "2.0.0",
+            "elm/file": "1.0.5",
+            "elm/random": "1.0.0",
+            "elm-community/basics-extra": "4.1.0",
+            "elm-community/maybe-extra": "5.3.0",
+            "fredcy/elm-parseint": "2.0.1",
+            "miniBill/elm-unicode": "1.0.3",
             "robinheghan/murmur3": "1.0.0",
             "rtfeldman/elm-hex": "1.0.0",
-            "stil4m/elm-syntax": "7.2.8",
+            "rtfeldman/elm-iso8601-date-strings": "1.1.4",
+            "stil4m/elm-syntax": "7.2.9",
             "stil4m/structured-writer": "1.0.3",
-            "tripokey/elm-fuzzy": "5.2.1",
-            "vito/elm-ansi": "10.0.1",
-            "zwilias/json-decode-exploration": "6.0.0"
+            "the-sett/elm-pretty-printer": "3.0.0"
         }
     },
     "test-dependencies": {

package/generator/template/index.ts

@@ -5,8 +5,7 @@ type ElmPagesInit = {
 
 const config: ElmPagesInit = {
   load: async function (elmLoaded) {
-    const app = await elmLoaded;
-    console.log("App loaded", app);
+    await elmLoaded;
   },
   flags: function () {
     return "You can decode this in Shared.elm using Json.Decode.string!";

package/generator/template/netlify.toml

@@ -1,10 +1,13 @@
 [build]
   functions = "functions/"
   publish = "dist/"
-  command = "export ELM_HOME=\"$NETLIFY_BUILD_BASE/cache/elm\" && npm install --no-optional && npm run build"
+  command = "mkdir bin && export PATH=\"/opt/build/repo/bin:$PATH\" && echo $PATH && curl https://static.lamdera.com/bin/linux/lamdera -o bin/lamdera && chmod a+x bin/lamdera && export ELM_HOME=\"$NETLIFY_BUILD_BASE/cache/elm\" && npm install && npm run build"
 
 [dev]
   command = "npm start"
   targetPort = 1234
   autoLaunch = true
   framework = "#custom"
+
+[functions]
+  node_bundler = "esbuild"