🦛 Fix #542

src/evaluation/WorkspaceManager.jl

@@ -16,14 +16,14 @@ end
 
 "These expressions get evaluated inside every newly create module inside a `Workspace`."
 const workspace_preamble = [
-    :(using Markdown, InteractiveUtils, Main.PlutoRunner), 
+    :(using Main.PlutoRunner, Main.PlutoRunner.Markdown, Main.PlutoRunner.InteractiveUtils),
     :(show, showable, showerror, repr, string, print, println), # https://github.com/JuliaLang/julia/issues/18181
 ]
 
 "These expressions get evaluated whenever a new `Workspace` process is created."
 const process_preamble = [
     :(ccall(:jl_exit_on_sigint, Cvoid, (Cint,), 0)),
-    :(include($(project_relative_path("src", "runner", "PlutoRunner.jl")))),
+    :(include($(project_relative_path("src", "runner", "Loader.jl")))),
     :(ENV["GKSwstype"] = "nul"), 
     :(ENV["JULIA_REVISE_WORKER_ONLY"] = "1"), 
 ]

src/runner/Loader.jl

@@ -0,0 +1,15 @@
+const my_dir = @__DIR__
+const pluto_dir = joinpath(my_dir, "..", "..")
+
+pushfirst!(LOAD_PATH, pluto_dir)
+
+#
+include(joinpath(my_dir, "PlutoRunner.jl"))
+#
+
+let
+    i = findfirst(isequal(pluto_dir), LOAD_PATH)
+    if i !== nothing
+        deleteat!(LOAD_PATH, i)
+    end
+end

src/runner/PlutoRunner.jl

@@ -7,6 +7,10 @@
 
 module PlutoRunner
 
+# import these two so that they can be imported from Main on the worker process if it launches without the stdlibs in its LOAD_PATH
+import Markdown
+import InteractiveUtils
+
 using Markdown
 import Markdown: html, htmlinline, LaTeX, withtag, htmlesc
 import Distributed