elm-pages 2.1.11 → 3.0.0-beta.1

package/src/Pages/Internal/Platform/ToJsPayload.elm

@@ -1,10 +1,12 @@
 module Pages.Internal.Platform.ToJsPayload exposing
-    ( ToJsSuccessPayloadNew
+    ( NewThingForPort
+    , ToJsSuccessPayloadNew
     , ToJsSuccessPayloadNewCombined(..)
     , successCodecNew2
     )
 
 import BuildError exposing (BuildError)
+import Bytes exposing (Bytes)
 import Codec exposing (Codec)
 import Dict exposing (Dict)
 import Head
@@ -22,6 +24,8 @@ type alias ToJsSuccessPayloadNew =
     , title : String
     , staticHttpCache : Dict String String
     , is404 : Bool
+    , statusCode : Int
+    , headers : List ( String, String )
     }
 
 
@@ -44,6 +48,12 @@ errorCodec =
         |> Codec.buildObject
 
 
+type alias NewThingForPort =
+    { oldThing : Json.Encode.Value
+    , binaryPageData : Bytes
+    }
+
+
 successCodecNew : String -> String -> Codec ToJsSuccessPayloadNew
 successCodecNew canonicalSiteUrl currentPagePath =
     Codec.object ToJsSuccessPayloadNew
@@ -63,6 +73,10 @@ successCodecNew canonicalSiteUrl currentPagePath =
             .staticHttpCache
             (Codec.dict Codec.string)
         |> Codec.field "is404" .is404 Codec.bool
+        |> Codec.field "statusCode" .statusCode Codec.int
+        |> Codec.field "headers"
+            .headers
+            (Codec.dict Codec.string |> Codec.map Dict.toList Dict.fromList)
         |> Codec.buildObject
 
 
@@ -74,10 +88,8 @@ headCodec canonicalSiteUrl currentPagePath =
 
 type ToJsSuccessPayloadNewCombined
     = PageProgress ToJsSuccessPayloadNew
-    | SendApiResponse { body : String, staticHttpCache : Dict String String, statusCode : Int }
-    | ReadFile String
-    | Glob String
-    | DoHttp { masked : Pages.StaticHttp.Request.Request, unmasked : Pages.StaticHttp.Request.Request }
+    | SendApiResponse { body : Json.Encode.Value, staticHttpCache : Dict String String, statusCode : Int }
+    | DoHttp Pages.StaticHttp.Request.Request Bool
     | Port String
     | Errors (List BuildError)
     | ApiResponse
@@ -86,7 +98,7 @@ type ToJsSuccessPayloadNewCombined
 successCodecNew2 : String -> String -> Codec ToJsSuccessPayloadNewCombined
 successCodecNew2 canonicalSiteUrl currentPagePath =
     Codec.custom
-        (\errorsTag vApiResponse success vReadFile vGlob vDoHttp vSendApiResponse vPort value ->
+        (\errorsTag vApiResponse success vDoHttp vSendApiResponse vPort value ->
             case value of
                 ApiResponse ->
                     vApiResponse
@@ -97,14 +109,8 @@ successCodecNew2 canonicalSiteUrl currentPagePath =
                 PageProgress payload ->
                     success payload
 
-                ReadFile filePath ->
-                    vReadFile filePath
-
-                Glob globPattern ->
-                    vGlob globPattern
-
-                DoHttp requestUrl ->
-                    vDoHttp requestUrl
+                DoHttp requestUrl _ ->
+                    vDoHttp requestUrl requestUrl.useCache
 
                 SendApiResponse record ->
                     vSendApiResponse record
@@ -115,19 +121,14 @@ successCodecNew2 canonicalSiteUrl currentPagePath =
         |> Codec.variant1 "Errors" Errors errorCodec
         |> Codec.variant0 "ApiResponse" ApiResponse
         |> Codec.variant1 "PageProgress" PageProgress (successCodecNew canonicalSiteUrl currentPagePath)
-        |> Codec.variant1 "ReadFile" ReadFile Codec.string
-        |> Codec.variant1 "Glob" Glob Codec.string
-        |> Codec.variant1 "DoHttp"
+        |> Codec.variant2 "DoHttp"
             DoHttp
-            (Codec.object (\masked unmasked -> { masked = masked, unmasked = unmasked })
-                |> Codec.field "masked" .masked Pages.StaticHttp.Request.codec
-                |> Codec.field "unmasked" .unmasked Pages.StaticHttp.Request.codec
-                |> Codec.buildObject
-            )
+            Pages.StaticHttp.Request.codec
+            Codec.bool
         |> Codec.variant1 "ApiResponse"
             SendApiResponse
             (Codec.object (\body staticHttpCache statusCode -> { body = body, staticHttpCache = staticHttpCache, statusCode = statusCode })
-                |> Codec.field "body" .body Codec.string
+                |> Codec.field "body" .body Codec.value
                 |> Codec.field "staticHttpCache"
                     .staticHttpCache
                     (Codec.dict Codec.string)