WIP: move Pkg out of the sysimage

base/sysimg.jl

@@ -70,9 +70,6 @@ let
 
  # 5-depth packages
  :Downloads,
-
- # 6-depth packages
- :Pkg,
  ]
  # PackageCompiler can filter out stdlibs so it can be empty
  maxlen = maximum(textwidth.(string.(stdlibs)); init=0)

contrib/generate_precompile.jl

@@ -147,16 +147,6 @@ if Artifacts !== nothing
  """
 end
 
-
-Pkg = get(Base.loaded_modules,
- Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg"),
- nothing)
-
-if Pkg !== nothing
- # TODO: Split Pkg precompile script into REPL and script part
- repl_script = Pkg.precompile_script * repl_script # do larger workloads first for better parallelization
-end
-
 FileWatching = get(Base.loaded_modules,
  Base.PkgId(Base.UUID("7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"), "FileWatching"),
  nothing)
@@ -179,7 +169,6 @@ end
 
 
 const JULIA_PROMPT = "julia> "
-const PKG_PROMPT = "pkg> "
 const SHELL_PROMPT = "shell> "
 const HELP_PROMPT = "help?> "
 
@@ -352,7 +341,6 @@ generate_precompile_statements() = try # Make sure `ansi_enablecursor` is printe
  while !eof(output_copy)
  strbuf *= String(readavailable(output_copy))
  occursin(JULIA_PROMPT, strbuf) && break
- occursin(PKG_PROMPT, strbuf) && break
  occursin(SHELL_PROMPT, strbuf) && break
  occursin(HELP_PROMPT, strbuf) && break
  sleep(0.1)
@@ -439,7 +427,7 @@ generate_precompile_statements() = try # Make sure `ansi_enablecursor` is printe
  if have_repl
  # Seems like a reasonable number right now, adjust as needed
  # comment out if debugging script
- n_succeeded > 1500 || @warn "Only $n_succeeded precompile statements"
+ n_succeeded > 650 || @warn "Only $n_succeeded precompile statements"
  end
 
  fetch(step1) == :ok || throw("Step 1 of collecting precompiles failed.")

pkgimage.mk

@@ -114,7 +114,7 @@ $(eval $(call sysimg_builder,LibCURL,LibCURL_jll MozillaCACerts_jll))
 $(eval $(call sysimg_builder,Downloads,ArgTools FileWatching LibCURL NetworkOptions))
 
 # 6-depth packages
-$(eval $(call sysimg_builder,Pkg,Dates LibGit2 Libdl Logging Printf Random SHA UUIDs)) # Markdown REPL
+$(eval $(call pkgimg_builder,Pkg,Dates LibGit2 Libdl Logging Printf Random SHA UUIDs)) # Markdown REPL
 
 # 7-depth packages
 $(eval $(call pkgimg_builder,LazyArtifacts,Artifacts Pkg))

stdlib/REPL/src/REPL.jl

@@ -1096,6 +1096,31 @@ function setup_interface(
  edit_insert(s, '?')
  end
  end,
+ ']' => function (s::MIState,o...)
+ if isempty(s) || position(LineEdit.buffer(s)) == 0
+ pkgid = Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg")
+ if Base.locate_package(pkgid) !== nothing # Only try load Pkg if we can find it
+ Pkg = Base.require(Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg"))
+ # Pkg should have loaded its REPL mode by now, let's find it so we can transition to it.
+ pkg_mode = nothing
+ for mode in repl.interface.modes
+ if mode isa LineEdit.Prompt && mode.complete isa Pkg.REPLMode.PkgCompletionProvider
+ pkg_mode = mode
+ break
+ end
+ end
+ # TODO: Cache the `pkg_mode`?
+ if pkg_mode !== nothing
+ buf = copy(LineEdit.buffer(s))
+ transition(s, pkg_mode) do
+ LineEdit.state(s, pkg_mode).input_buffer = buf
+ end
+ return
+ end
+ end
+ end
+ edit_insert(s, ']')
+ end,
 
  # Bracketed Paste Mode
  "\e[200~" => (s::MIState,o...)->begin

test/precompile.jl

@@ -397,8 +397,8 @@ precompile_test_harness(false) do dir
  [:ArgTools, :Artifacts, :Base64, :CompilerSupportLibraries_jll, :CRC32c, :Dates,
  :Downloads, :FileWatching, :Future, :InteractiveUtils, :libblastrampoline_jll,
  :LibCURL, :LibCURL_jll, :LibGit2, :Libdl, :LinearAlgebra,
- :Logging, :Markdown, :Mmap, :MozillaCACerts_jll, :NetworkOptions, :OpenBLAS_jll, :Pkg, :Printf,
- :p7zip_jll, :REPL, :Random, :SHA, :Serialization, :Sockets,
+ :Logging, :Markdown, :Mmap, :MozillaCACerts_jll, :NetworkOptions, :OpenBLAS_jll, :Printf,
+ :REPL, :Random, :SHA, :Serialization, :Sockets,
  :TOML, :Tar, :Test, :UUIDs, :Unicode,
  :nghttp2_jll]
  ),