elm-pages 3.0.0-beta.27 → 3.0.0-beta.29

package/src/Scaffold/Route.elm

@@ -161,7 +161,7 @@ single input =
 
 {-| -}
 buildNoState :
-    { view : { maybeUrl : Elm.Expression, sharedModel : Elm.Expression, app : Elm.Expression } -> Elm.Expression
+    { view : { shared : Elm.Expression, app : Elm.Expression } -> Elm.Expression
     }
     -> Builder
     -> { path : String, body : String }
@@ -170,10 +170,9 @@ buildNoState definitions builder_ =
         ServerRender declarations builder ->
             userFunction builder.moduleName
                 { view =
-                    \maybeUrl sharedModel _ app ->
+                    \app shared _ ->
                         definitions.view
-                            { maybeUrl = maybeUrl
-                            , sharedModel = sharedModel
+                            { shared = shared
                             , app = app
                             }
                 , localState = Nothing
@@ -192,10 +191,9 @@ buildNoState definitions builder_ =
         PreRender declarations builder ->
             userFunction builder.moduleName
                 { view =
-                    \maybeUrl sharedModel _ app ->
+                    \app shared _ ->
                         definitions.view
-                            { maybeUrl = maybeUrl
-                            , sharedModel = sharedModel
+                            { shared = shared
                             , app = app
                             }
                 , localState = Nothing
@@ -229,26 +227,23 @@ addDeclarations declarations builder =
 {-| -}
 buildWithLocalState :
     { view :
-        { maybeUrl : Elm.Expression, sharedModel : Elm.Expression, model : Elm.Expression, app : Elm.Expression } -> Elm.Expression
+        { shared : Elm.Expression, model : Elm.Expression, app : Elm.Expression } -> Elm.Expression
     , update :
-        { pageUrl : Elm.Expression
-        , sharedModel : Elm.Expression
+        { shared : Elm.Expression
         , app : Elm.Expression
         , msg : Elm.Expression
         , model : Elm.Expression
         }
         -> Elm.Expression
     , init :
-        { pageUrl : Elm.Expression
-        , sharedModel : Elm.Expression
+        { shared : Elm.Expression
         , app : Elm.Expression
         }
         -> Elm.Expression
     , subscriptions :
-        { maybePageUrl : Elm.Expression
-        , routeParams : Elm.Expression
+        { routeParams : Elm.Expression
         , path : Elm.Expression
-        , sharedModel : Elm.Expression
+        , shared : Elm.Expression
         , model : Elm.Expression
         }
         -> Elm.Expression
@@ -262,38 +257,34 @@ buildWithLocalState definitions builder_ =
         ServerRender declarations builder ->
             userFunction builder.moduleName
                 { view =
-                    \maybeUrl sharedModel model app ->
+                    \app shared model ->
                         definitions.view
-                            { maybeUrl = maybeUrl
-                            , sharedModel = sharedModel
+                            { shared = shared
                             , model = model
                             , app = app
                             }
                 , localState =
                     Just
                         { update =
-                            \pageUrl sharedModel app msg model ->
+                            \app shared msg model ->
                                 definitions.update
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     , msg = msg
                                     , model = model
                                     }
                         , init =
-                            \pageUrl sharedModel app ->
+                            \app shared ->
                                 definitions.init
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     }
                         , subscriptions =
-                            \maybePageUrl routeParams path sharedModel model ->
+                            \routeParams path shared model ->
                                 definitions.subscriptions
-                                    { maybePageUrl = maybePageUrl
-                                    , routeParams = routeParams
+                                    { routeParams = routeParams
                                     , path = path
-                                    , sharedModel = sharedModel
+                                    , shared = shared
                                     , model = model
                                     }
                         , state = LocalState
@@ -313,38 +304,34 @@ buildWithLocalState definitions builder_ =
         PreRender declarations builder ->
             userFunction builder.moduleName
                 { view =
-                    \maybeUrl sharedModel model app ->
+                    \app shared model ->
                         definitions.view
-                            { maybeUrl = maybeUrl
-                            , sharedModel = sharedModel
+                            { shared = shared
                             , model = model
                             , app = app
                             }
                 , localState =
                     Just
                         { update =
-                            \pageUrl sharedModel app msg model ->
+                            \app shared msg model ->
                                 definitions.update
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     , msg = msg
                                     , model = model
                                     }
                         , init =
-                            \pageUrl sharedModel app ->
+                            \app shared ->
                                 definitions.init
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     }
                         , subscriptions =
-                            \maybePageUrl routeParams path sharedModel model ->
+                            \routeParams path shared model ->
                                 definitions.subscriptions
-                                    { maybePageUrl = maybePageUrl
-                                    , routeParams = routeParams
+                                    { routeParams = routeParams
                                     , path = path
-                                    , sharedModel = sharedModel
+                                    , shared = shared
                                     , model = model
                                     }
                         , state = LocalState
@@ -368,26 +355,23 @@ buildWithLocalState definitions builder_ =
 {-| -}
 buildWithSharedState :
     { view :
-        { maybeUrl : Elm.Expression, sharedModel : Elm.Expression, model : Elm.Expression, app : Elm.Expression } -> Elm.Expression
+        { shared : Elm.Expression, model : Elm.Expression, app : Elm.Expression } -> Elm.Expression
     , update :
-        { pageUrl : Elm.Expression
-        , sharedModel : Elm.Expression
+        { shared : Elm.Expression
         , app : Elm.Expression
         , msg : Elm.Expression
         , model : Elm.Expression
         }
         -> Elm.Expression
     , init :
-        { pageUrl : Elm.Expression
-        , sharedModel : Elm.Expression
+        { shared : Elm.Expression
         , app : Elm.Expression
         }
         -> Elm.Expression
     , subscriptions :
-        { maybePageUrl : Elm.Expression
-        , routeParams : Elm.Expression
+        { routeParams : Elm.Expression
         , path : Elm.Expression
-        , sharedModel : Elm.Expression
+        , shared : Elm.Expression
         , model : Elm.Expression
         }
         -> Elm.Expression
@@ -401,38 +385,34 @@ buildWithSharedState definitions builder_ =
         ServerRender declarations builder ->
             userFunction builder.moduleName
                 { view =
-                    \maybeUrl sharedModel model app ->
+                    \app shared model ->
                         definitions.view
-                            { maybeUrl = maybeUrl
-                            , sharedModel = sharedModel
+                            { shared = shared
                             , model = model
                             , app = app
                             }
                 , localState =
                     Just
                         { update =
-                            \pageUrl sharedModel app msg model ->
+                            \app shared msg model ->
                                 definitions.update
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     , msg = msg
                                     , model = model
                                     }
                         , init =
-                            \pageUrl sharedModel app ->
+                            \app shared ->
                                 definitions.init
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     }
                         , subscriptions =
-                            \maybePageUrl routeParams path sharedModel model ->
+                            \routeParams path shared model ->
                                 definitions.subscriptions
-                                    { maybePageUrl = maybePageUrl
-                                    , routeParams = routeParams
+                                    { routeParams = routeParams
                                     , path = path
-                                    , sharedModel = sharedModel
+                                    , shared = shared
                                     , model = model
                                     }
                         , state = SharedState
@@ -452,38 +432,34 @@ buildWithSharedState definitions builder_ =
         PreRender declarations builder ->
             userFunction builder.moduleName
                 { view =
-                    \maybeUrl sharedModel model app ->
+                    \app shared model ->
                         definitions.view
-                            { maybeUrl = maybeUrl
-                            , sharedModel = sharedModel
+                            { shared = shared
                             , model = model
                             , app = app
                             }
                 , localState =
                     Just
                         { update =
-                            \pageUrl sharedModel app msg model ->
+                            \app shared msg model ->
                                 definitions.update
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     , msg = msg
                                     , model = model
                                     }
                         , init =
-                            \pageUrl sharedModel app ->
+                            \app shared ->
                                 definitions.init
-                                    { pageUrl = pageUrl
-                                    , sharedModel = sharedModel
+                                    { shared = shared
                                     , app = app
                                     }
                         , subscriptions =
-                            \maybePageUrl routeParams path sharedModel model ->
+                            \routeParams path shared model ->
                                 definitions.subscriptions
-                                    { maybePageUrl = maybePageUrl
-                                    , routeParams = routeParams
+                                    { routeParams = routeParams
                                     , path = path
-                                    , sharedModel = sharedModel
+                                    , shared = shared
                                     , model = model
                                     }
                         , state = SharedState
@@ -518,12 +494,12 @@ type ActionOrPages
 userFunction :
     List String
     ->
-        { view : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+        { view : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
         , localState :
             Maybe
-                { update : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-                , init : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-                , subscriptions : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                { update : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                , init : Elm.Expression -> Elm.Expression -> Elm.Expression
+                , subscriptions : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
                 , state : State
                 }
         , data : Elm.Expression -> Elm.Expression
@@ -537,31 +513,25 @@ userFunction moduleName definitions =
     let
         viewFn :
             { declaration : Elm.Declaration
-            , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-            , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+            , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+            , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
             }
         viewFn =
             case definitions.localState of
                 Just _ ->
-                    Elm.Declare.fn4 "view"
-                        ( "maybeUrl"
-                        , "PageUrl"
-                            |> Elm.Annotation.named [ "Pages", "PageUrl" ]
-                            |> Elm.Annotation.maybe
-                            |> Just
-                        )
-                        ( "sharedModel"
+                    Elm.Declare.fn3 "view"
+                        ( "app", Just appType )
+                        ( "shared"
                         , Just (Elm.Annotation.named [ "Shared" ] "Model")
                         )
                         ( "model", Just (Elm.Annotation.named [] "Model") )
-                        ( "app", Just appType )
-                        (\maybeUrl sharedModel model app ->
-                            definitions.view maybeUrl sharedModel model app
+                        (\app shared model ->
+                            definitions.view app shared model
                                 |> Elm.withType
                                     (Elm.Annotation.namedWith [ "View" ]
                                         "View"
-                                        [ Elm.Annotation.namedWith [ "Pages", "Msg" ]
-                                            "Msg"
+                                        [ Elm.Annotation.namedWith [ "PagesMsg" ]
+                                            "PagesMsg"
                                             [ localType "Msg"
                                             ]
                                         ]
@@ -572,25 +542,30 @@ userFunction moduleName definitions =
                     let
                         viewDeclaration :
                             { declaration : Elm.Declaration
-                            , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-                            , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                            , call : Elm.Expression -> Elm.Expression -> Elm.Expression
+                            , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression
                             }
                         viewDeclaration =
-                            Elm.Declare.fn3 "view"
-                                ( "maybeUrl"
-                                , "PageUrl"
-                                    |> Elm.Annotation.named [ "Pages", "PageUrl" ]
-                                    |> Elm.Annotation.maybe
-                                    |> Just
-                                )
-                                ( "sharedModel"
+                            Elm.Declare.fn2 "view"
+                                ( "app", Just appType )
+                                ( "shared"
                                 , Just (Elm.Annotation.named [ "Shared" ] "Model")
                                 )
-                                ( "app", Just appType )
-                                (definitions.view Elm.unit)
+                                (\app shared ->
+                                    definitions.view app shared Elm.unit
+                                        |> Elm.withType
+                                            (Elm.Annotation.namedWith [ "View" ]
+                                                "View"
+                                                [ Elm.Annotation.namedWith [ "PagesMsg" ]
+                                                    "PagesMsg"
+                                                    [ localType "Msg"
+                                                    ]
+                                                ]
+                                            )
+                                )
                     in
                     { declaration = viewDeclaration.declaration
-                    , call = \_ -> viewDeclaration.call
+                    , call = \app shared _ -> viewDeclaration.call app shared
                     , callFrom = \a _ c d -> viewDeclaration.callFrom a c d
                     }
 
@@ -598,11 +573,11 @@ userFunction moduleName definitions =
             Maybe
                 { updateFn :
                     { declaration : Elm.Declaration
-                    , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
-                    , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+                    , callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
                     }
-                , initFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression }
-                , subscriptionsFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression }
+                , initFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression }
+                , subscriptionsFn : { declaration : Elm.Declaration, call : Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression, callFrom : List String -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression }
                 , state : State
                 }
         localDefinitions =
@@ -610,29 +585,18 @@ userFunction moduleName definitions =
                 |> Maybe.map
                     (\localState ->
                         { updateFn =
-                            Elm.Declare.fn5 "update"
-                                ( "pageUrl"
-                                , "PageUrl"
-                                    |> Elm.Annotation.named [ "Pages", "PageUrl" ]
-                                    |> Just
-                                )
-                                ( "sharedModel", Just (Elm.Annotation.named [ "Shared" ] "Model") )
+                            Elm.Declare.fn4 "update"
                                 ( "app", Just appType )
+                                ( "shared", Just (Elm.Annotation.named [ "Shared" ] "Model") )
                                 ( "msg", Just (Elm.Annotation.named [] "Msg") )
                                 ( "model", Just (Elm.Annotation.named [] "Model") )
                                 localState.update
                         , initFn =
-                            Elm.Declare.fn3 "init"
-                                ( "pageUrl"
-                                , "PageUrl"
-                                    |> Elm.Annotation.named [ "Pages", "PageUrl" ]
-                                    |> Elm.Annotation.maybe
-                                    |> Just
-                                )
-                                ( "sharedModel", Just (Elm.Annotation.named [ "Shared" ] "Model") )
+                            Elm.Declare.fn2 "init"
                                 ( "app", Just appType )
-                                (\pageUrl sharedModel app ->
-                                    localState.init pageUrl sharedModel app
+                                ( "shared", Just (Elm.Annotation.named [ "Shared" ] "Model") )
+                                (\shared app ->
+                                    localState.init app shared
                                         |> Elm.withType
                                             (Elm.Annotation.tuple
                                                 (localType "Model")
@@ -640,20 +604,14 @@ userFunction moduleName definitions =
                                             )
                                 )
                         , subscriptionsFn =
-                            Elm.Declare.fn5
+                            Elm.Declare.fn4
                                 "subscriptions"
-                                ( "maybePageUrl"
-                                , "PageUrl"
-                                    |> Elm.Annotation.named [ "Pages", "PageUrl" ]
-                                    |> Elm.Annotation.maybe
-                                    |> Just
-                                )
                                 ( "routeParams", "RouteParams" |> Elm.Annotation.named [] |> Just )
                                 ( "path", Elm.Annotation.namedWith [ "Path" ] "Path" [] |> Just )
-                                ( "sharedModel", Just (Elm.Annotation.named [ "Shared" ] "Model") )
+                                ( "shared", Just (Elm.Annotation.named [ "Shared" ] "Model") )
                                 ( "model", localType "Model" |> Just )
-                                (\maybePageUrl routeParams path sharedModel model ->
-                                    localState.subscriptions maybePageUrl routeParams path sharedModel model
+                                (\routeParams path shared model ->
+                                    localState.subscriptions routeParams path shared model
                                         |> Elm.withType (Elm.Annotation.namedWith [] "Sub" [ localType "Msg" ])
                                 )
                         , state = localState.state
@@ -822,7 +780,7 @@ userFunction moduleName definitions =
 
                         Nothing ->
                             buildNoState_
-                                { view = viewFn.call Elm.unit
+                                { view = \app shared -> viewFn.call app shared Elm.unit
                                 }
                                 >> Elm.withType
                                     (Elm.Annotation.namedWith [ "RouteBuilder" ]
@@ -887,7 +845,7 @@ myType dataType =
 appType : Elm.Annotation.Annotation
 appType =
     Elm.Annotation.namedWith [ "RouteBuilder" ]
-        "StaticPayload"
+        "App"
         [ Elm.Annotation.named [] "Data"
         , Elm.Annotation.named [] "ActionData"
         , Elm.Annotation.named [] "RouteParams"
@@ -953,7 +911,7 @@ serverRender_ serverRenderArg =
                               , Elm.Annotation.function
                                     [ Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ Elm.Annotation.var "data"
                                         , Elm.Annotation.var "action"
                                         , Elm.Annotation.var "routeParams"
@@ -1018,7 +976,7 @@ preRender_ serverRenderArg =
                               , Elm.Annotation.function
                                     [ Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ Elm.Annotation.var "data"
                                         , Elm.Annotation.var "action"
                                         , Elm.Annotation.var "routeParams"
@@ -1070,7 +1028,7 @@ single_ serverRenderArg =
                               , Elm.Annotation.function
                                     [ Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ Elm.Annotation.var "data"
                                         , Elm.Annotation.var "action"
                                         , Elm.Annotation.var "routeParams"
@@ -1106,23 +1064,20 @@ buildWithLocalState_ :
         -> Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
-        -> Elm.Expression
     , init :
-        Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+        Elm.Expression -> Elm.Expression -> Elm.Expression
     , update :
         Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
-        -> Elm.Expression
     , subscriptions :
         Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
         -> Elm.Expression
-        -> Elm.Expression
     , state : State
     }
     -> Elm.Expression
@@ -1144,17 +1099,11 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                         [ Elm.Annotation.record
                             [ ( "view"
                               , Elm.Annotation.function
-                                    [ Elm.Annotation.maybe
-                                        (Elm.Annotation.namedWith
-                                            [ "Pages", "PageUrl" ]
-                                            "PageUrl"
-                                            []
-                                        )
-                                    , Elm.Annotation.namedWith [ "Shared" ] "Model" []
+                                    [ Elm.Annotation.namedWith [ "Shared" ] "Model" []
                                     , Elm.Annotation.var "model"
                                     , Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ Elm.Annotation.var "data"
                                         , Elm.Annotation.var "action"
                                         , Elm.Annotation.var "routeParams"
@@ -1164,24 +1113,18 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                                         [ "View" ]
                                         "View"
                                         [ Elm.Annotation.namedWith
-                                            [ "Pages", "Msg" ]
-                                            "Msg"
-                                            [ Elm.Annotation.var "msg" ]
+                                            [ "PagesMsg" ]
+                                            "PagesMsg"
+                                            [ Elm.Annotation.named [] "Msg" ]
                                         ]
                                     )
                               )
                             , ( "init"
                               , Elm.Annotation.function
-                                    [ Elm.Annotation.maybe
-                                        (Elm.Annotation.namedWith
-                                            [ "Pages", "PageUrl" ]
-                                            "PageUrl"
-                                            []
-                                        )
-                                    , Elm.Annotation.namedWith [ "Shared" ] "Model" []
+                                    [ Elm.Annotation.namedWith [ "Shared" ] "Model" []
                                     , Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ Elm.Annotation.var "data"
                                         , Elm.Annotation.var "action"
                                         , Elm.Annotation.var "routeParams"
@@ -1198,14 +1141,10 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                               )
                             , ( "update"
                               , Elm.Annotation.function
-                                    [ Elm.Annotation.namedWith
-                                        [ "Pages", "PageUrl" ]
-                                        "PageUrl"
-                                        []
-                                    , Elm.Annotation.namedWith [ "Shared" ] "Model" []
+                                    [ Elm.Annotation.namedWith [ "Shared" ] "Model" []
                                     , Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ localType "Data"
                                         , localType "ActionData"
                                         , localType "RouteParams"
@@ -1236,13 +1175,7 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                               )
                             , ( "subscriptions"
                               , Elm.Annotation.function
-                                    [ Elm.Annotation.maybe
-                                        (Elm.Annotation.namedWith
-                                            [ "Pages", "PageUrl" ]
-                                            "PageUrl"
-                                            []
-                                        )
-                                    , Elm.Annotation.var "routeParams"
+                                    [ Elm.Annotation.var "routeParams"
                                     , Elm.Annotation.namedWith [ "Path" ] "Path" []
                                     , Elm.Annotation.namedWith [ "Shared" ] "Model" []
                                     , Elm.Annotation.var "model"
@@ -1279,17 +1212,12 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                     (\functionReducedUnpack ->
                         Elm.functionReduced
                             "unpack"
-                            (\functionReducedUnpack0 ->
+                            (\functionReducedUnpack_2_1_2_0_2_2_0_1_0_2_0_0 ->
                                 Elm.functionReduced
                                     "unpack"
-                                    (\functionReducedUnpack_2_1_2_0_2_2_0_1_0_2_0_0 ->
-                                        Elm.functionReduced
-                                            "unpack"
-                                            (buildWithLocalStateArg.view
-                                                functionReducedUnpack
-                                                functionReducedUnpack0
-                                                functionReducedUnpack_2_1_2_0_2_2_0_1_0_2_0_0
-                                            )
+                                    (buildWithLocalStateArg.view
+                                        functionReducedUnpack
+                                        functionReducedUnpack_2_1_2_0_2_2_0_1_0_2_0_0
                                     )
                             )
                     )
@@ -1301,13 +1229,8 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                     (\functionReducedUnpack ->
                         Elm.functionReduced
                             "unpack"
-                            (\functionReducedUnpack0 ->
-                                Elm.functionReduced
-                                    "unpack"
-                                    (buildWithLocalStateArg.init
-                                        functionReducedUnpack
-                                        functionReducedUnpack0
-                                    )
+                            (buildWithLocalStateArg.init
+                                functionReducedUnpack
                             )
                     )
                 )
@@ -1318,21 +1241,16 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                     (\functionReducedUnpack ->
                         Elm.functionReduced
                             "unpack"
-                            (\functionReducedUnpack0 ->
+                            (\functionReducedUnpack_2_1_2_0_2_2_2_1_0_2_0_0 ->
                                 Elm.functionReduced
                                     "unpack"
-                                    (\functionReducedUnpack_2_1_2_0_2_2_2_1_0_2_0_0 ->
+                                    (\functionReducedUnpack_2_1_2_1_2_0_2_2_2_1_0_2_0_0 ->
                                         Elm.functionReduced
                                             "unpack"
-                                            (\functionReducedUnpack_2_1_2_1_2_0_2_2_2_1_0_2_0_0 ->
-                                                Elm.functionReduced
-                                                    "unpack"
-                                                    (buildWithLocalStateArg.update
-                                                        functionReducedUnpack
-                                                        functionReducedUnpack0
-                                                        functionReducedUnpack_2_1_2_0_2_2_2_1_0_2_0_0
-                                                        functionReducedUnpack_2_1_2_1_2_0_2_2_2_1_0_2_0_0
-                                                    )
+                                            (buildWithLocalStateArg.update
+                                                functionReducedUnpack
+                                                functionReducedUnpack_2_1_2_0_2_2_2_1_0_2_0_0
+                                                functionReducedUnpack_2_1_2_1_2_0_2_2_2_1_0_2_0_0
                                             )
                                     )
                             )
@@ -1345,21 +1263,16 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
                     (\functionReducedUnpack ->
                         Elm.functionReduced
                             "unpack"
-                            (\functionReducedUnpack0 ->
+                            (\functionReducedUnpack_2_1_2_0_2_2_3_1_0_2_0_0 ->
                                 Elm.functionReduced
                                     "unpack"
-                                    (\functionReducedUnpack_2_1_2_0_2_2_3_1_0_2_0_0 ->
+                                    (\functionReducedUnpack_2_1_2_1_2_0_2_2_3_1_0_2_0_0 ->
                                         Elm.functionReduced
                                             "unpack"
-                                            (\functionReducedUnpack_2_1_2_1_2_0_2_2_3_1_0_2_0_0 ->
-                                                Elm.functionReduced
-                                                    "unpack"
-                                                    (buildWithLocalStateArg.subscriptions
-                                                        functionReducedUnpack
-                                                        functionReducedUnpack0
-                                                        functionReducedUnpack_2_1_2_0_2_2_3_1_0_2_0_0
-                                                        functionReducedUnpack_2_1_2_1_2_0_2_2_3_1_0_2_0_0
-                                                    )
+                                            (buildWithLocalStateArg.subscriptions
+                                                functionReducedUnpack
+                                                functionReducedUnpack_2_1_2_0_2_2_3_1_0_2_0_0
+                                                functionReducedUnpack_2_1_2_1_2_0_2_2_3_1_0_2_0_0
                                             )
                                     )
                             )
@@ -1372,7 +1285,7 @@ buildWithLocalState_ buildWithLocalStateArg buildWithLocalStateArg0 =
 
 buildNoState_ :
     { view :
-        Elm.Expression -> Elm.Expression -> Elm.Expression -> Elm.Expression
+        Elm.Expression -> Elm.Expression -> Elm.Expression
     }
     -> Elm.Expression
     -> Elm.Expression
@@ -1387,16 +1300,10 @@ buildNoState_ buildNoStateArg buildNoStateArg0 =
                         [ Elm.Annotation.record
                             [ ( "view"
                               , Elm.Annotation.function
-                                    [ Elm.Annotation.maybe
-                                        (Elm.Annotation.namedWith
-                                            [ "Pages", "PageUrl" ]
-                                            "PageUrl"
-                                            []
-                                        )
-                                    , Elm.Annotation.namedWith [ "Shared" ] "Model" []
+                                    [ Elm.Annotation.namedWith [ "Shared" ] "Model" []
                                     , Elm.Annotation.namedWith
                                         [ "RouteBuilder" ]
-                                        "StaticPayload"
+                                        "App"
                                         [ Elm.Annotation.named [] "Data"
                                         , Elm.Annotation.named [] "ActionData"
                                         , Elm.Annotation.named [] "RouteParams"
@@ -1406,9 +1313,9 @@ buildNoState_ buildNoStateArg buildNoStateArg0 =
                                         [ "View" ]
                                         "View"
                                         [ Elm.Annotation.namedWith
-                                            [ "Pages", "Msg" ]
-                                            "Msg"
-                                            [ Elm.Annotation.unit ]
+                                            [ "PagesMsg" ]
+                                            "PagesMsg"
+                                            [ Elm.Annotation.named [] "Msg" ]
                                         ]
                                     )
                               )
@@ -1438,16 +1345,12 @@ buildNoState_ buildNoStateArg buildNoStateArg0 =
             [ Tuple.pair
                 "view"
                 (Elm.functionReduced
-                    "buildNoStateUnpack"
-                    (\functionReducedUnpack ->
+                    "unpack"
+                    (\functionReducedUnpack0 ->
                         Elm.functionReduced
                             "unpack"
-                            (\functionReducedUnpack0 ->
-                                Elm.functionReduced
-                                    "unpack"
-                                    (buildNoStateArg.view functionReducedUnpack
-                                        functionReducedUnpack0
-                                    )
+                            (buildNoStateArg.view
+                                functionReducedUnpack0
                             )
                     )
                 )