disable sandbox in window generation + Kaleido_jll step back

JuliaHealth · Feb 11, 2025 · c0ce80e · c0ce80e
1 parent e208255
commit c0ce80e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/KomaMRIPlots/Project.toml b/KomaMRIPlots/Project.toml
@@ -5,6 +5,7 @@ version = "0.9.0"
 
 [deps]
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
+Kaleido_jll = "f7e6163d-2fa5-5f23-b69c-1db539e41963"
 KomaMRIBase = "d0bc0b20-b151-4d03-b2a4-6ca51751cb9c"
 MAT = "23992714-dd62-5051-b70f-ba57cb901cac"
 PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a"
@@ -19,6 +20,7 @@ KomaPlotsPlutoPlotlyExt = "PlutoPlotly"
 
 [compat]
 Interpolations = "0.13, 0.14, 0.15"
+Kaleido_jll = "0.2.1"
 KomaMRIBase = "0.9"
 MAT = "0.10"
 PlotlyJS = "0.18"

diff --git a/src/KomaMRI.jl b/src/KomaMRI.jl
@@ -27,6 +27,6 @@ include("KomaUI.jl")
 # Export the UI and the observables
 export KomaUI
 export sys_ui, seq_ui, obj_ui, raw_ui, img_ui
-export @unsafe_blink
+
 
 end
diff --git a/src/KomaUI.jl b/src/KomaUI.jl
@@ -327,19 +327,3 @@ function update_blink_window_progress!(w::Window, block, Nblocks)
     return nothing
 end
 
-macro unsafe_blink() # https://github.com/JuliaGizmos/Blink.jl/issues/325#issuecomment-2252670794
-    return @eval AtomShell begin
-        function init(; debug = false)
-            electron() # Check path exists
-            p, dp = port(), port()
-            debug && inspector(dp)
-            dbg = debug ? "--debug=$dp" : []
-            proc = (debug ? run_rdr : run)(
-                `$(electron()) --no-sandbox $dbg $mainjs port $p`; wait=false)
-            conn = try_connect(ip"127.0.0.1", p)
-            shell = Electron(proc, conn)
-            initcbs(shell)
-            return shell
-        end
-    end
-end
diff --git a/src/ui/ExportUIFunctions.jl b/src/ui/ExportUIFunctions.jl
@@ -39,6 +39,7 @@ function setup_blink_window(; darkmode=true, frame=true, dev_tools=false, show_w
             "width" => 1200,
             "height" => 800,
             :show => show_window,
+            "webPreferences" => Dict("sandbox" => false) # Disable sandbox
         );
         async=false,
     )

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -40,7 +40,6 @@ end
     using Blink
     # Opens KomaUI
 
-    @unsafe_blink
     w = KomaUI(return_window=true)
     @testset "Open UI" begin
         @test "index" == @js w document.getElementById("content").dataset.content