Properly track Env config usage in RPC.elm as well

lamdera · Oct 27, 2024 · aeda61f · aeda61f
1 parent b2146db
commit aeda61f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/extra/Lamdera/AppConfig.hs b/extra/Lamdera/AppConfig.hs
@@ -62,13 +62,14 @@ writeUsage = do
     & writeUtf8 (cache </> ".lamdera-fe-config")
 
   findSecretUses graph "Backend" "app"
+    & Set.union (findSecretUses graph "RPC" "lamdera_handleEndpoints")
     & prep
     & writeUtf8 (cache </> ".lamdera-be-config")
 
 
 loadLamderaAppGraph :: IO GlobalGraph
 loadLamderaAppGraph = do
-  graph_ <- Lamdera.Graph.fullGraph ["src/Frontend.elm", "src/Backend.elm"]
+  graph_ <- Lamdera.Graph.fullGraph ["src/Frontend.elm", "src/Backend.elm", "src/RPC.elm"]
   case graph_ of
     Left err ->
       throw $ Reporting.Exit.makeToReport err
@@ -157,7 +158,7 @@ selectNextDeps (Global module_ _) node =
           -- the deps and then continue as normal
           globalDeps & onlyAuthorProjectDeps & Set.delete (Global module_ name)
         _ ->
-          -- When do we have mulitple names...? What does it mean?
+          -- When would we have mulitple names...? What does this mean?
           Set.empty
 
     Manager effectsType ->
@@ -374,6 +375,7 @@ checkUserConfig appName prodTokenM = do
 
     localConfigItems =
       findSecretUses graph "Backend" "app"
+        & Set.union (findSecretUses graph "RPC" "lamdera_handleEndpoints")
         & secretsNormalized
         & (++) localFrontendConfigItems
 

diff --git a/test/Test/Check.hs b/test/Test/Check.hs
@@ -67,13 +67,13 @@ suite = tests $
       _ <- io $ checkWithParamsProduction project "always-v0"
 
       "elm-stuff/lamdera/.lamdera-fe-config" & expectContains "frontendOnly"
-      "elm-stuff/lamdera/.lamdera-be-config" & expectContains "backendOnly"
-
       "elm-stuff/lamdera/.lamdera-fe-config" & expectContains "both"
-      "elm-stuff/lamdera/.lamdera-be-config" & expectContains "both"
-
       "elm-stuff/lamdera/.lamdera-fe-config" & expectContains "external"
 
+      "elm-stuff/lamdera/.lamdera-be-config" & expectContains "backendOnly"
+      "elm-stuff/lamdera/.lamdera-be-config" & expectContains "both"
+      "elm-stuff/lamdera/.lamdera-be-config" & expectContains "rpc"
+
       "frontend-app.js" & expectContains "fe-only-from-dashboard"
       "backend-app.js" & expectContains "be-only-from-dashboard"
 

diff --git a/test/scenario-always-v0/src/Env.elm b/test/scenario-always-v0/src/Env.elm
@@ -18,3 +18,7 @@ both =
 
 external =
     "env.external"
+
+
+rpc =
+    "env.rpc"
diff --git a/test/scenario-always-v0/src/Frontend.elm b/test/scenario-always-v0/src/Frontend.elm
@@ -30,10 +30,10 @@ app =
 init : Url.Url -> Nav.Key -> ( Model, Cmd FrontendMsg )
 init url key =
     let
-        selfRecursive =
+        selfRef =
             -- This causes the `init` expression to change from a AST.Optimized.Define to a AST.Optimized.Cycle
             -- which in the past wasn't properly handled by AppConfig.findSecretUses. This is a regression test.
-            init url key
+            init
 
         both =
             Env.both