elm-pages 3.0.0-beta.3 → 3.0.0-beta.31

package/generator/template/app/Shared.elm

@@ -1,9 +1,9 @@
 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)
@@ -19,13 +19,16 @@ template =
     , view = view
     , data = data
     , subscriptions = subscriptions
-    , onPageChange = Nothing
+    , onPageChange = Just OnPageChange
     }
 
 
 type Msg
-    = SharedMsg SharedMsg
-    | MenuClicked
+    = OnPageChange
+        { path : Path
+        , query : Maybe String
+        , fragment : Maybe String
+        }
 
 
 type alias Data =
@@ -37,13 +40,12 @@ type SharedMsg
 
 
 type alias Model =
-    { showMenu : Bool
+    { showMobileMenu : Bool
     }
 
 
 init :
-    Maybe Browser.Navigation.Key
-    -> Pages.Flags.Flags
+    Pages.Flags.Flags
     ->
         Maybe
             { path :
@@ -54,21 +56,18 @@ init :
             , metadata : route
             , pageUrl : Maybe PageUrl
             }
-    -> ( Model, Cmd Msg )
-init navigationKey flags maybePagePath =
-    ( { showMenu = False }
-    , Cmd.none
+    -> ( Model, Effect Msg )
+init flags maybePagePath =
+    ( { showMobileMenu = False }
+    , 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 )
-
-        MenuClicked ->
-            ( { model | showMenu = not model.showMenu }, Cmd.none )
+        OnPageChange _ ->
+            ( { model | showMobileMenu = False }, Effect.none )
 
 
 subscriptions : Path -> Model -> Sub Msg
@@ -76,9 +75,9 @@ subscriptions _ _ =
     Sub.none
 
 
-data : DataSource.DataSource Data
+data : BackendTask FatalError Data
 data =
-    DataSource.succeed ()
+    BackendTask.succeed ()
 
 
 view :
@@ -90,32 +89,10 @@ view :
     -> Model
     -> (Msg -> msg)
     -> View msg
-    -> { body : Html msg, title : String }
-view sharedData page model toMsg pageView =
+    -> { body : List (Html msg), title : String }
+view stars 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.map toMsg
-            , Html.main_ [] pageView.body
-            ]
+        [ Html.div [] pageView.body
+        ]
     , title = pageView.title
     }

package/generator/template/app/Site.elm

@@ -1,19 +1,32 @@
-module Site exposing (config)
+module Site exposing (canonicalUrl, config)
 
-import DataSource exposing (DataSource)
+import BackendTask exposing (BackendTask)
+import FatalError exposing (FatalError)
 import Head
+import MimeType
+import Pages.Url
 import SiteConfig exposing (SiteConfig)
 
 
 config : SiteConfig
 config =
-    { canonicalUrl = "https://elm-pages.com"
+    { canonicalUrl = canonicalUrl
     , head = head
     }
 
 
-head : DataSource (List Head.Tag)
+head : BackendTask FatalError (List Head.Tag)
 head =
-    [ Head.sitemapLink "/sitemap.xml"
+    [ 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
+
+
+canonicalUrl : String
+canonicalUrl =
+    "https://elm-pages.com"

package/generator/template/app/View.elm

@@ -1,4 +1,4 @@
-module View exposing (View, map, placeholder)
+module View exposing (View, map)
 
 import Html exposing (Html)
 
@@ -14,10 +14,3 @@ 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/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

@@ -8,45 +8,53 @@
     "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-markdown": "7.0.1",
+            "dillonkearns/elm-pages-v3-beta": "12.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": "2.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/package.json

@@ -1,14 +1,20 @@
 {
   "name": "elm-pages-app",
+  "type": "module",
   "scripts": {
     "postinstall": "elm-tooling install",
     "start": "elm-pages dev",
     "build": "elm-pages build"
   },
   "devDependencies": {
-    "elm-optimize-level-2": "0.3.4",
-    "elm-pages": "2.1.10",
-    "elm-review": "^2.7.0",
-    "elm-tooling": "^1.7.0"
+    "elm-codegen": "^0.2.0",
+    "elm-optimize-level-2": "^0.3.5",
+    "elm-pages": "^3.0.0-beta.20",
+    "elm-review": "2.8.5",
+    "elm-tooling": "^1.10.0",
+    "vite": "^3.1.8"
+  },
+  "dependencies": {
+    "@netlify/functions": "^1.2.0"
   }
 }

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.3",
+  "type": "module",
+  "version": "3.0.0-beta.31",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -10,7 +11,7 @@
     "test": "./test.sh",
     "test:snapshot": "(cd examples/escaping && npm install && npm test) && (cd examples/base-path && npm install && npm test)",
     "cypress": "npm start & cypress run",
-    "build:generator": "elm-codegen install && (cd codegen && lamdera make Generate.elm --output elm-pages-codegen.js)",
+    "build:generator": "elm-codegen install && (cd codegen && lamdera make Generate.elm --output elm-pages-codegen.js && mv elm-pages-codegen.js elm-pages-codegen.cjs)",
     "review": "elm-review"
   },
   "repository": "https://github.com/dillonkearns/elm-pages",
@@ -24,53 +25,54 @@
   "author": "Dillon Kearns",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "busboy": "^1.0.0",
+    "busboy": "^1.6.0",
     "chokidar": "^3.5.3",
-    "commander": "^9.4.0",
+    "commander": "^10.0.0",
     "connect": "^3.7.0",
-    "cookie-signature": "^1.1.0",
+    "cookie-signature": "^1.2.1",
     "cross-spawn": "7.0.3",
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.15.5",
-    "fs-extra": "^10.1.0",
-    "globby": "11.0.4",
+    "esbuild": "^0.17.12",
+    "fs-extra": "^11.1.1",
+    "globby": "13.1.3",
     "gray-matter": "^4.0.3",
     "jsesc": "^3.0.2",
     "kleur": "^4.1.5",
-    "memfs": "^3.4.7",
+    "make-fetch-happen": "^11.0.3",
+    "memfs": "^3.4.13",
     "micromatch": "^4.0.5",
-    "node-fetch": "^2.6.7",
-    "object-hash": "^2.2.0",
     "serve-static": "^1.15.0",
-    "terser": "^5.14.2",
-    "vite": "^3.0.9",
-    "which": "^2.0.2"
+    "vite": "^4.2.1",
+    "terser": "^5.16.8",
+    "which": "^3.0.0"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.2",
-    "@types/fs-extra": "^9.0.13",
+    "@types/fs-extra": "^11.0.1",
+    "@types/make-fetch-happen": "^10.0.1",
     "@types/micromatch": "^4.0.2",
-    "@types/node": "12.20.12",
-    "@types/serve-static": "^1.15.0",
-    "cypress": "^10.6.0",
-    "elm-codegen": "^0.2.0",
-    "elm-optimize-level-2": "^0.1.5",
-    "elm-review": "^2.7.4",
-    "elm-test": "^0.19.1-revision9",
-    "elm-tooling": "^1.8.0",
+    "@types/node": "^18.15.7",
+    "@types/serve-static": "^1.15.1",
+    "cypress": "^12.8.1",
+    "elm-codegen": "^0.3.0",
+    "elm-optimize-level-2": "^0.3.5",
+    "elm-review": "^2.9.2",
+    "elm-test": "^0.19.1-revision11",
+    "elm-tooling": "^1.13.1",
     "elm-verify-examples": "^5.2.0",
-    "elmi-to-json": "^1.2.0",
-    "mocha": "^10.0.0",
-    "typescript": "^4.7.4"
+    "elmi-to-json": "^1.4.3",
+    "typescript": "^5.0.2",
+    "vite": "^4.2.1",
+    "vitest": "^0.29.7"
   },
   "files": [
     "generator/src/",
     "generator/review/",
     "generator/dead-code-review/",
     "src/",
-    "codegen/elm-pages-codegen.js",
+    "codegen/elm-pages-codegen.cjs",
     "generator/template/",
     "generator/static-code/"
   ],