Merge pull request #259 from dillonkearns/page-builder-refinements

Refine Page Builder API
dillonkearns · Dec 11, 2021 · fd04b17 · fd04b17
2 parents 43a6399 + 4465252
commit fd04b17
Show file tree

Hide file tree

Showing 33 changed files with 337 additions and 255 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14
+      - name: Use Node.js 16
         uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 16
       # Re-use node_modules between runs until package-lock.json changes.
       - name: Cache node_modules
         id: cache-node_modules
@@ -105,10 +105,10 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14
+      - name: Use Node.js 16
         uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 16
       # Re-use node_modules between runs until package-lock.json changes.
       - name: Cache node_modules
         id: cache-node_modules

diff --git a/examples/base-path/package-lock.json b/examples/base-path/package-lock.json
diff --git a/examples/base-path/src/Page/Index.elm b/examples/base-path/src/Page/Index.elm
@@ -16,7 +16,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/base-path/src/Page/SubPage.elm b/examples/base-path/src/Page/SubPage.elm
@@ -17,7 +17,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/docs/package-lock.json b/examples/docs/package-lock.json
diff --git a/examples/docs/src/Page/Blog.elm b/examples/docs/src/Page/Blog.elm
@@ -48,7 +48,7 @@ type alias RouteParams =
 
 
 type alias Model =
-    ()
+    {}
 
 
 view :

diff --git a/examples/docs/src/Page/Blog/Slug_.elm b/examples/docs/src/Page/Blog/Slug_.elm
@@ -25,7 +25,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =
@@ -41,13 +41,13 @@ page =
     Page.prerender
         { data = data
         , head = head
-        , routes = routes
+        , pages = pages
         }
         |> Page.buildNoState { view = view }
 
 
-routes : DataSource.DataSource (List RouteParams)
-routes =
+pages : DataSource.DataSource (List RouteParams)
+pages =
     Article.blogPostsGlob
         |> DataSource.map
             (List.map

diff --git a/examples/docs/src/Page/Docs/Section__.elm b/examples/docs/src/Page/Docs/Section__.elm
@@ -30,7 +30,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =
@@ -45,16 +45,16 @@ page : Page RouteParams Data
 page =
     Page.prerender
         { head = head
-        , routes = routes
+        , pages = pages
         , data = data
         }
         |> Page.buildNoState
             { view = view
             }
 
 
-routes : DataSource (List RouteParams)
-routes =
+pages : DataSource (List RouteParams)
+pages =
     DocsSection.all
         |> DataSource.map
             (List.map

diff --git a/examples/docs/src/Page/Index.elm b/examples/docs/src/Page/Index.elm
@@ -43,7 +43,7 @@ import View.CodeTab as CodeTab
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =
@@ -145,13 +145,13 @@ page : Page RouteParams Data
 page =
     Page.prerender
         { head = head
-        , routes = routes
+        , pages = pages
         , data = data
         }
         |> Page.buildNoState { view = view }
 
-routes : DataSource (List RouteParams)
-routes =
+pages : DataSource (List RouteParams)
+pages =
     DataSource.succeed [ { name = "elm-pages" } ]
 
 data : RouteParams -> DataSource Data

diff --git a/examples/docs/src/Page/Showcase.elm b/examples/docs/src/Page/Showcase.elm
@@ -18,7 +18,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =
@@ -29,7 +29,7 @@ type alias RouteParams =
     {}
 
 
-page : PageWithState RouteParams Data () Msg
+page : PageWithState RouteParams Data Model Msg
 page =
     Page.single
         { head = head

diff --git a/examples/end-to-end/package-lock.json b/examples/end-to-end/package-lock.json
diff --git a/examples/end-to-end/src/Page/FileData.elm b/examples/end-to-end/src/Page/FileData.elm
@@ -14,7 +14,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/end-to-end/src/Page/Index.elm b/examples/end-to-end/src/Page/Index.elm
@@ -13,7 +13,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/end-to-end/src/Page/Links.elm b/examples/end-to-end/src/Page/Links.elm
@@ -13,7 +13,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/escaping/package-lock.json b/examples/escaping/package-lock.json
diff --git a/examples/escaping/src/Page/Escaping.elm b/examples/escaping/src/Page/Escaping.elm
@@ -17,7 +17,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/escaping/src/Page/Index.elm b/examples/escaping/src/Page/Index.elm
@@ -14,7 +14,7 @@ import View exposing (View)
 
 
 type alias Model =
-    ()
+    {}
 
 
 type alias Msg =

diff --git a/examples/pokedex/src/Page/PokedexNumber_.elm b/examples/pokedex/src/Page/PokedexNumber_.elm
@@ -32,7 +32,7 @@ page : Page RouteParams Data
 page =
     Page.prerenderWithFallback
         { head = head
-        , routes = routes
+        , pages = pages
         , data = data
         , handleFallback =
             \{ pokedexNumber } ->
@@ -47,8 +47,8 @@ page =
         |> Page.buildNoState { view = view }
 
 
-routes : DataSource (List RouteParams)
-routes =
+pages : DataSource (List RouteParams)
+pages =
     DataSource.succeed []
 
 

diff --git a/examples/routing/package-lock.json b/examples/routing/package-lock.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ import View exposing (View) @@
     type alias Model =
-        ()
+        {}
     type alias Msg =
@@ Expand Down @@