Improve flexibility around vendored librariesmain

compat53 is vendored since #1757 as it is required to run luarocks with lua 5.1 or 5.2.

However, this introduced some issues as the GNUmakefile install rule places these in the same place where `luarocks install compat53` would install them. This means you get conflicts if you install the actual package:
```
Warning: /.../prefix/share/lua/5.1/compat53/init.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/init.lua~
Warning: /.../prefix/share/lua/5.1/compat53/module.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/module.lua~
Warning: /.../prefix/share/lua/5.1/compat53/file_mt.lua is not tracked by this installation of LuaRocks. Moving it to /.../prefix/share/lua/5.1/compat53/file_mt.lua~
```

It is also not ideal for linux package maintainers to include a vendored package, see: https://github.com/luarocks/luarocks/pull/1757#issuecomment-3409873412.

To solve these issues, this patchset makes the following changes:
- GNUmakefile now places the compat53 files under `luarocks/vendor/compat53` (which is added internally to the luarocks script's `package.path`). This way a user's installation of compat53 does not interfere at all with luarocks one.
- Added `--with-system-compat53` option to configure script for external packaging systems.
- Fixed install.bat's logic for deciding whether to vendor compat53, as the current script includes it for every version.

install.bat already places luarocks sources outside of LUAPATH, so that part can stay as is.

I've also inverted the version check to avoid the need for future patches like: #1850.

50 files changed, 93 insertions, 55 deletions

diff --git a/.gitattributes b/.gitattributes
index 4f593865..9c1b9df1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
 *.tl linguist-language=Lua
+
+vendor/** linguist-vendored
diff --git a/.luacheckrc b/.luacheckrc
index cf70fdf4..7a9c62ee 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -26,7 +26,7 @@ ignore = {
 }
 
 exclude_files = {
-   "src/luarocks/vendor/**/*.lua",
+   "vendor/**/*.lua",
 }
 
 include_files = {
diff --git a/GNUmakefile b/GNUmakefile
index c938756d..0e28818b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,6 +18,16 @@ LUAROCKS_FILES = $(shell find src/luarocks/ -type f -name '*.lua')
 
 LUA_ENV_VARS = LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4 LUA_PATH_5_5 LUA_CPATH LUA_CPATH_5_2 LUA_CPATH_5_3 LUA_CPATH_5_4 LUA_CPATH_5_5
 
+luarockspackagepath := $(luadir)/?.lua
+
+ifndef WITH_SYSTEM_ROCKS
+luarockspackagepath := $(luarockspackagepath);$(luadir)/luarocks/vendor/?.lua
+vendored_rocks = 1
+ifneq ($(filter $(LUA_VERSION),5.1 5.2),)
+vendored_compat53 = 1
+endif
+endif
+
 all: build
 
 # ----------------------------------------
@@ -54,7 +64,7 @@ luarocks: config.unix $(builddir)/config-$(LUA_VERSION).lua
         rm -f src/luarocks/core/hardcoded.lua
         echo "#!/bin/sh" > luarocks
         echo "unset $(LUA_ENV_VARS)" >> luarocks
-        echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
+        echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;$(CURDIR)/vendor/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
         chmod +rx ./luarocks
         ./luarocks init
 
@@ -62,7 +72,7 @@ luarocks-admin: config.unix
         rm -f src/luarocks/core/hardcoded.lua
         echo "#!/bin/sh" > luarocks-admin
         echo "unset $(LUA_ENV_VARS)" >> luarocks-admin
-        echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
+        echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;$(CURDIR)/vendor/?.lua;;" exec "$(LUA)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
         chmod +rx ./luarocks-admin
 
 $(builddir)/luarocks: src/bin/luarocks config.unix
@@ -71,7 +81,7 @@ $(builddir)/luarocks: src/bin/luarocks config.unix
         'package.loaded["luarocks.core.hardcoded"] = { '\
         "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
         'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
-        'package.path=[[$(luadir)/?.lua;]] .. package.path\n'\
+        'package.path=[[$(luarockspackagepath);]] .. package.path\n'\
         'local list = package.searchers or package.loaders; table.insert(list, 1, function(name) if name:match("^luarocks%%.") then return loadfile([[$(luadir)/]] .. name:gsub([[%%.]], [[/]]) .. [[.lua]]) end end)\n'; \
         tail -n +2 src/bin/luarocks \
         )> "$@"
@@ -82,7 +92,7 @@ $(builddir)/luarocks-admin: src/bin/luarocks-admin config.unix
         'package.loaded["luarocks.core.hardcoded"] = { '\
         "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
         'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
-        'package.path=[[$(luadir)/?.lua;]] .. package.path\n'\
+        'package.path=[[$(luarockspackagepath);]] .. package.path\n'\
         'local list = package.searchers or package.loaders; table.insert(list, 1, function(name) if name:match("^luarocks%%.") then return loadfile([[$(luadir)/]] .. name:gsub([[%%.]], [[/]]) .. [[.lua]]) end end)\n'; \
         tail -n +2 src/bin/luarocks-admin \
         )> "$@"
@@ -119,15 +129,25 @@ install: all install-config
         do \
            $(INSTALL_DATA) "$$f" '$(DESTDIR)$(luadir)'/`echo $$f | sed 's,^src/,,'`; \
         done
-ifeq (,$(findstring $(LUA_VERSION),"5.3" "5.4" "5.5"))
-        find src/compat53/ -type d | while read f; \
+ifdef vendored_rocks
+        find vendor/ -type d | while read f; \
         do \
-           mkdir -p '$(DESTDIR)$(luadir)'/`echo $$f | sed 's,^src/,,'`; \
+           mkdir -p '$(DESTDIR)$(luadir)/luarocks'/`echo $$f`; \
         done
-        find src/compat53/ -type f -name '*.lua' | while read f; \
+        find vendor/ -maxdepth 1 -type f -name '*.lua' | while read f; \
         do \
-           $(INSTALL_DATA) "$$f" '$(DESTDIR)$(luadir)'/`echo $$f | sed 's,^src/,,'`; \
+           $(INSTALL_DATA) "$$f" '$(DESTDIR)$(luadir)/luarocks'/`echo $$f`; \
         done
+ifdef vendored_compat53
+        find vendor/compat53/ -type d | while read f; \
+        do \
+           mkdir -p '$(DESTDIR)$(luadir)/luarocks'/`echo $$f`; \
+        done
+        find vendor/compat53/ -type f -name '*.lua' | while read f; \
+        do \
+           $(INSTALL_DATA) "$$f" '$(DESTDIR)$(luadir)/luarocks'/`echo $$f`; \
+        done
+endif
 endif
 
 install-config:
diff --git a/binary/all_in_one b/binary/all_in_one
index e3d595d7..1b096936 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -44,7 +44,7 @@ end
 local LUA_MODULES = TARGET_DIR .. "/lua_modules"
 local CONFIG_DIR = TARGET_DIR .. "/.luarocks"
 
-package.path = "./src/?.lua;" .. package.path
+package.path = "./src/?.lua;" .. "./vendor/?.lua;" .. package.path
 
 local fs = require("luarocks.fs")
 local cfg = require("luarocks.core.cfg")
@@ -385,17 +385,17 @@ end
 
 local function nonnull(x) return x ~= nil end
 
-local function generate(main_program, dir, skip)
+local function generate(main_program, src_dir, vendor_dir, skip)
    local program_name = main_program:gsub(".*/", "")
 
-   local hardcoded = write_hardcoded_module(dir)
+   local hardcoded = write_hardcoded_module(src_dir)
 
    local out = {}
    table.insert(out, ([[static const char* progname = %q;]]):format(program_name))
    table.insert(out, c_preamble)
    load_main(out, main_program, program_name)
    local lua_modules = LUA_MODULES .. "/share/lua/" .. cfg.lua_version
-   declare_modules(out, { dir, lua_modules }, skip)
+   declare_modules(out, { src_dir, vendor_dir, lua_modules }, skip)
    local a_files = declare_libraries(out, LUA_MODULES .. "/lib/lua/" .. cfg.lua_version)
    table.insert(out, c_main)
 
@@ -497,7 +497,7 @@ local function main()
       end
    end
 
-   generate(MAIN_PROGRAM, "src", { EXCLUDE, "^bin/?" })
+   generate(MAIN_PROGRAM, "src", "vendor", { EXCLUDE, "^bin/?" })
 end
 
 main()
diff --git a/configure b/configure
index 170f4ede..7253dc61 100755
--- a/configure
+++ b/configure
@@ -143,6 +143,9 @@ For specialized uses of LuaRocks:
                                (e.g. when only deploying binary packages)
                                you do not need lua.h installed. This flag
                                skips the check for lua.h in "configure".
+  --with-system-rocks          Use an external installation of rocks required
+                               for running luarocks instead instead of the
+                               vendored versions.
 
 EOF
 }
@@ -301,6 +304,9 @@ do
    --disable-incdir-check)
       DISABLE_INCDIR_CHECK=yes
       ;;
+   --with-system-rocks)
+      WITH_SYSTEM_ROCKS=yes
+      ;;
 
    # Old options that no longer apply
    # --------------------------------
@@ -500,6 +506,7 @@ LUA_BINDIR=$LUA_BINDIR
 LUA_INCDIR=$LUA_INCDIR
 LUA_LIBDIR=$LUA_LIBDIR
 FORCE_CONFIG=$FORCE_CONFIG
+WITH_SYSTEM_ROCKS=$WITH_SYSTEM_ROCKS
 EOF
 
 echo
diff --git a/install.bat b/install.bat
index 31c78288..cd73b1e1 100644
--- a/install.bat
+++ b/install.bat
@@ -1024,14 +1024,17 @@ end
 if not exec(S[[XCOPY /S src\luarocks\*.* "$LUADIR\luarocks" >NUL]]) then

         die()

 end

-if vars.LUA_VERSION ~= "5.3" or vars.LUA_VERSION ~= "5.4" or vars.LUA_VERSION ~= "5.5" then

-        -- Copy the vendored lua-copmat53 source files

+if not exec(S[[XCOPY vendor\*.* "$LUADIR\luarocks" >NUL]]) then

+        die()

+end

+if vars.LUA_VERSION == "5.1" or vars.LUA_VERSION == "5.2" then

+        -- Copy the vendored lua-compat53 source files

         if not exists(S[[$LUADIR\compat53]]) then

                 if not mkdir(S[[$LUADIR\compat53]]) then

                         die()

                 end

         end

-        if not exec(S[[XCOPY /S src\compat53\*.* "$LUADIR\compat53" >NUL]]) then

+        if not exec(S[[XCOPY /S vendor\compat53\*.* "$LUADIR\compat53" >NUL]]) then

                 die()

         end

 end

diff --git a/luarocks-dev-1.rockspec b/luarocks-dev-1.rockspec
index 677b07cf..fd8ff2b3 100644
--- a/luarocks-dev-1.rockspec
+++ b/luarocks-dev-1.rockspec
@@ -20,6 +20,11 @@ description = {
    maintainer = "Hisham Muhammad",
    license = "MIT",
 }
+dependencies = {
+   "compat53",
+   "argparse",
+   "dkjson",
+}
 test_dependencies = {
    "luacov",
    "busted-htest",
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 4b359b7f..d37444e2 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -593,6 +593,7 @@ local function create_env(testing_paths)
    table.insert(lua_path, dir_path(deps_tree, "share", "lua", lua_v, "?.lua"))
    table.insert(lua_path, dir_path(deps_tree, "share", "lua", lua_v, "?", "init.lua"))
    table.insert(lua_path, dir_path(testing_paths.src_dir, "?.lua"))
+   table.insert(lua_path, dir_path(testing_paths.src_dir, "..", "vendor", "?.lua"))
    env_variables.LUA_PATH = table.concat(lua_path, ";") .. ";"
 
    local lua_cpath = {}
diff --git a/src/luarocks/admin/cmd/add.tl b/src/luarocks/admin/cmd/add.tl
index 56be7044..0989c82b 100644
--- a/src/luarocks/admin/cmd/add.tl
+++ b/src/luarocks/admin/cmd/add.tl
@@ -12,7 +12,7 @@ local fs = require("luarocks.fs")
 local cache = require("luarocks.admin.cache")
 local index = require("luarocks.admin.index")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/admin/cmd/make_manifest.tl b/src/luarocks/admin/cmd/make_manifest.tl
index 8f6efd3c..26ee1f46 100644
--- a/src/luarocks/admin/cmd/make_manifest.tl
+++ b/src/luarocks/admin/cmd/make_manifest.tl
@@ -12,7 +12,7 @@ local deps = require("luarocks.deps")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/admin/cmd/refresh_cache.tl b/src/luarocks/admin/cmd/refresh_cache.tl
index b0be9984..a60cb6c0 100644
--- a/src/luarocks/admin/cmd/refresh_cache.tl
+++ b/src/luarocks/admin/cmd/refresh_cache.tl
@@ -7,7 +7,7 @@ local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local cache = require("luarocks.admin.cache")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/admin/cmd/remove.tl b/src/luarocks/admin/cmd/remove.tl
index 0b1aa65b..1ba630f2 100644
--- a/src/luarocks/admin/cmd/remove.tl
+++ b/src/luarocks/admin/cmd/remove.tl
@@ -12,7 +12,7 @@ local fs = require("luarocks.fs")
 local cache = require("luarocks.admin.cache")
 local index = require("luarocks.admin.index")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 4890593d..ed757276 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -20,7 +20,7 @@ local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local fun = require("luarocks.fun")
 local fs = require("luarocks.fs")
-local argparse = require("luarocks.vendor.argparse")
+local argparse = require("argparse")
 
 
 
diff --git a/src/luarocks/cmd.tl b/src/luarocks/cmd.tl
index 6645e583..3f743bb6 100644
--- a/src/luarocks/cmd.tl
+++ b/src/luarocks/cmd.tl
@@ -20,7 +20,7 @@ local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
 local fun = require("luarocks.fun")
 local fs = require("luarocks.fs")
-local argparse = require("luarocks.vendor.argparse")
+local argparse = require("argparse")
 
 local type Tree = require("luarocks.core.types.tree").Tree
 
diff --git a/src/luarocks/cmd/build.tl b/src/luarocks/cmd/build.tl
index 31e9bee9..8cad506c 100644
--- a/src/luarocks/cmd/build.tl
+++ b/src/luarocks/cmd/build.tl
@@ -19,7 +19,7 @@ local search = require("luarocks.search")
 local make = require("luarocks.cmd.make")
 local repos = require("luarocks.repos")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 local type BOpts = require("luarocks.core.types.bopts").BOpts
diff --git a/src/luarocks/cmd/config.lua b/src/luarocks/cmd/config.lua
index 4ab40081..e8bda657 100644
--- a/src/luarocks/cmd/config.lua
+++ b/src/luarocks/cmd/config.lua
@@ -10,7 +10,7 @@ local util = require("luarocks.util")
 local deps = require("luarocks.deps")
 local dir = require("luarocks.dir")
 local fs = require("luarocks.fs")
-local json = require("luarocks.vendor.dkjson")
+local json = require("dkjson")
 
 
 
diff --git a/src/luarocks/cmd/config.tl b/src/luarocks/cmd/config.tl
index cdda3fb9..66b60944 100644
--- a/src/luarocks/cmd/config.tl
+++ b/src/luarocks/cmd/config.tl
@@ -10,9 +10,9 @@ local util = require("luarocks.util")
 local deps = require("luarocks.deps")
 local dir = require("luarocks.dir")
 local fs = require("luarocks.fs")
-local json = require("luarocks.vendor.dkjson")
+local json = require("dkjson")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/doc.tl b/src/luarocks/cmd/doc.tl
index 9e7bee2a..b8a1667c 100644
--- a/src/luarocks/cmd/doc.tl
+++ b/src/luarocks/cmd/doc.tl
@@ -13,7 +13,7 @@ local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local download = require("luarocks.download")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
diff --git a/src/luarocks/cmd/download.tl b/src/luarocks/cmd/download.tl
index 3b85443b..2e8175cb 100644
--- a/src/luarocks/cmd/download.tl
+++ b/src/luarocks/cmd/download.tl
@@ -7,7 +7,7 @@ end
 local util = require("luarocks.util")
 local download = require("luarocks.download")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/init.tl b/src/luarocks/cmd/init.tl
index 313c6df9..5846f96f 100644
--- a/src/luarocks/cmd/init.tl
+++ b/src/luarocks/cmd/init.tl
@@ -12,7 +12,7 @@ local util = require("luarocks.util")
 local persist = require("luarocks.persist")
 local write_rockspec = require("luarocks.cmd.write_rockspec")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/install.tl b/src/luarocks/cmd/install.tl
index 95d42f8e..8ed54a89 100644
--- a/src/luarocks/cmd/install.tl
+++ b/src/luarocks/cmd/install.tl
@@ -17,7 +17,7 @@ local search = require("luarocks.search")
 local queries = require("luarocks.queries")
 local cfg = require("luarocks.core.cfg")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 local type IOpts = require("luarocks.core.types.installs").IOpts
diff --git a/src/luarocks/cmd/lint.tl b/src/luarocks/cmd/lint.tl
index 116dba12..247610cf 100644
--- a/src/luarocks/cmd/lint.tl
+++ b/src/luarocks/cmd/lint.tl
@@ -8,7 +8,7 @@ local util = require("luarocks.util")
 local download = require("luarocks.download")
 local fetch = require("luarocks.fetch")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/list.tl b/src/luarocks/cmd/list.tl
index 9a0948f0..f47c7889 100644
--- a/src/luarocks/cmd/list.tl
+++ b/src/luarocks/cmd/list.tl
@@ -19,7 +19,7 @@ local path = require("luarocks.path")
 
 local type Outdated = list.Outdated
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/make.tl b/src/luarocks/cmd/make.tl
index fc467b31..e77c523b 100644
--- a/src/luarocks/cmd/make.tl
+++ b/src/luarocks/cmd/make.tl
@@ -17,7 +17,7 @@ local deps = require("luarocks.deps")
 local dir = require("luarocks.dir")
 local fs = require("luarocks.fs")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/new_version.tl b/src/luarocks/cmd/new_version.tl
index d929376b..bf66b72c 100644
--- a/src/luarocks/cmd/new_version.tl
+++ b/src/luarocks/cmd/new_version.tl
@@ -12,7 +12,7 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local type_rockspec = require("luarocks.type.rockspec")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/pack.tl b/src/luarocks/cmd/pack.tl
index 750ae9c9..0d41a7eb 100644
--- a/src/luarocks/cmd/pack.tl
+++ b/src/luarocks/cmd/pack.tl
@@ -8,7 +8,7 @@ local util = require("luarocks.util")
 local pack = require("luarocks.pack")
 local queries = require("luarocks.queries")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/path.tl b/src/luarocks/cmd/path.tl
index 998aa222..13e75373 100644
--- a/src/luarocks/cmd/path.tl
+++ b/src/luarocks/cmd/path.tl
@@ -8,7 +8,7 @@ local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 local fs = require("luarocks.fs")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/purge.tl b/src/luarocks/cmd/purge.tl
index 2801f357..5cec693f 100644
--- a/src/luarocks/cmd/purge.tl
+++ b/src/luarocks/cmd/purge.tl
@@ -14,7 +14,7 @@ local cfg = require("luarocks.core.cfg")
 local remove = require("luarocks.remove")
 local queries = require("luarocks.queries")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/remove.tl b/src/luarocks/cmd/remove.tl
index 77ee359d..af1fbe6b 100644
--- a/src/luarocks/cmd/remove.tl
+++ b/src/luarocks/cmd/remove.tl
@@ -13,7 +13,7 @@ local path = require("luarocks.path")
 local deps = require("luarocks.deps")
 local queries = require("luarocks.queries")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/search.tl b/src/luarocks/cmd/search.tl
index 7b27e8a1..6cf95bb4 100644
--- a/src/luarocks/cmd/search.tl
+++ b/src/luarocks/cmd/search.tl
@@ -10,7 +10,7 @@ local search = require("luarocks.search")
 local queries = require("luarocks.queries")
 local results = require("luarocks.results")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/show.tl b/src/luarocks/cmd/show.tl
index 56d70277..da93a74d 100644
--- a/src/luarocks/cmd/show.tl
+++ b/src/luarocks/cmd/show.tl
@@ -22,7 +22,7 @@ local repos = require("luarocks.repos")
 local type Return = show.Return
 local type RenderData = {string: string | {string}}
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/test.tl b/src/luarocks/cmd/test.tl
index a258e4a3..8e945987 100644
--- a/src/luarocks/cmd/test.tl
+++ b/src/luarocks/cmd/test.tl
@@ -7,7 +7,7 @@ end
 local util = require("luarocks.util")
 local test = require("luarocks.test")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/unpack.tl b/src/luarocks/cmd/unpack.tl
index 6d05ecde..5395fbee 100644
--- a/src/luarocks/cmd/unpack.tl
+++ b/src/luarocks/cmd/unpack.tl
@@ -11,7 +11,7 @@ local build = require("luarocks.build")
 local dir = require("luarocks.dir")
 local search = require("luarocks.search")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index a12b30c0..edfe4f89 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -20,7 +20,7 @@ local Api = require("luarocks.upload.api")
 
 local type Response = upload.Response
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
diff --git a/src/luarocks/cmd/which.tl b/src/luarocks/cmd/which.tl
index 85a798ac..9b08acac 100644
--- a/src/luarocks/cmd/which.tl
+++ b/src/luarocks/cmd/which.tl
@@ -8,7 +8,7 @@ local loader = require("luarocks.loader")
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl
index 2ec4eea9..cb48ca3f 100644
--- a/src/luarocks/cmd/write_rockspec.tl
+++ b/src/luarocks/cmd/write_rockspec.tl
@@ -12,7 +12,7 @@ local rockspecs = require("luarocks.rockspecs")
 local type_rockspec = require("luarocks.type.rockspec")
 local util = require("luarocks.util")
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 local type Args = require("luarocks.core.types.args").Args
 
diff --git a/src/luarocks/core/persist.lua b/src/luarocks/core/persist.lua
index c9ccb4a0..0d44aa16 100644
--- a/src/luarocks/core/persist.lua
+++ b/src/luarocks/core/persist.lua
@@ -2,7 +2,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 local persist = {}
 
 
-local json = require("luarocks.vendor.dkjson")
+local json = require("dkjson")
 
 
 
diff --git a/src/luarocks/core/persist.tl b/src/luarocks/core/persist.tl
index 268d2bb6..cafcfc60 100644
--- a/src/luarocks/core/persist.tl
+++ b/src/luarocks/core/persist.tl
@@ -2,7 +2,7 @@
 local record persist
 end
 
-local json = require("luarocks.vendor.dkjson")
+local json = require("dkjson")
 
 --------------------------------------------------------------------------------
 
@@ -64,7 +64,7 @@ function persist.load_into_table(filename: string, tbl?: {string:any}) : {string
    setmetatable(result, save_mt)
 
    if not ok then
-      return nil, tostring(err), errcode 
+      return nil, tostring(err), errcode
    end
    return result, globals
 end
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index e6762d76..3074965b 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -24,7 +24,7 @@ local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local persist = require("luarocks.persist")
 local multipart = require("luarocks.upload.multipart")
-local json = require("luarocks.vendor.dkjson")
+local json = require("dkjson")
 local dir_sep = package.config:sub(1, 1)
 
 
diff --git a/src/luarocks/upload/api.tl b/src/luarocks/upload/api.tl
index dc0b568c..e89ecf6e 100644
--- a/src/luarocks/upload/api.tl
+++ b/src/luarocks/upload/api.tl
@@ -24,7 +24,7 @@ local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local persist = require("luarocks.persist")
 local multipart = require("luarocks.upload.multipart")
-local json = require("luarocks.vendor.dkjson")
+local json = require("dkjson")
 local dir_sep = package.config:sub(1, 1)
 
 local type Parameters = multipart.Parameters
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index f2fb5a5a..6411c9b9 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -48,7 +48,7 @@ util.starts_with = core.starts_with
 local type Fn = util.Fn
 local type Rockspec = require("luarocks.core.types.rockspec").Rockspec
 
-local type Parser = require("luarocks.vendor.argparse").Parser
+local type Parser = require("argparse").Parser
 
 
 local scheduled_functions: {Fn} = {}
diff --git a/teal.sh b/teal.sh
index 86420139..67fa8a83 100755
--- a/teal.sh
+++ b/teal.sh
@@ -10,7 +10,7 @@ do
    luaname=$(echo $tealname | sed 's/.tl$/.lua/g')
    if [ $tealname -nt $luaname ] || [ "$1" = "--all" ]
    then
-      tl gen --check -I ../types $tealname -o $luaname
+      tl gen --check -I ../types -I ../vendor $tealname -o $luaname
       i=$[i+1]
    fi
 done
diff --git a/tlconfig.lua b/tlconfig.lua
index 342d167b..2d89ea23 100644
--- a/tlconfig.lua
+++ b/tlconfig.lua
@@ -1,6 +1,6 @@
 return {
     build_dir = "build",
     source_dir = "src",
-    include_dir = { "src", "types" },
+    include_dir = { "src", "types", "vendor" },
     gen_target = "5.1",
 }
diff --git a/src/luarocks/vendor/argparse.d.tl b/vendor/argparse.d.tl
index 812786c4..812786c4 100644
--- a/src/luarocks/vendor/argparse.d.tl
+++ b/vendor/argparse.d.tl
diff --git a/src/luarocks/vendor/argparse.lua b/vendor/argparse.lua
index 2c2585dd..2c2585dd 100644
--- a/src/luarocks/vendor/argparse.lua
+++ b/vendor/argparse.lua
diff --git a/src/compat53/file_mt.lua b/vendor/compat53/file_mt.lua
index 6433619d..6433619d 100644
--- a/src/compat53/file_mt.lua
+++ b/vendor/compat53/file_mt.lua
diff --git a/src/compat53/init.lua b/vendor/compat53/init.lua
index b5075713..b5075713 100644
--- a/src/compat53/init.lua
+++ b/vendor/compat53/init.lua
diff --git a/src/compat53/module.lua b/vendor/compat53/module.lua
index b580e536..b580e536 100644
--- a/src/compat53/module.lua
+++ b/vendor/compat53/module.lua
diff --git a/src/luarocks/vendor/dkjson.d.tl b/vendor/dkjson.d.tl
index 4245e8aa..4245e8aa 100644
--- a/src/luarocks/vendor/dkjson.d.tl
+++ b/vendor/dkjson.d.tl
diff --git a/src/luarocks/vendor/dkjson.lua b/vendor/dkjson.lua
index 7a867241..7a867241 100644
--- a/src/luarocks/vendor/dkjson.lua
+++ b/vendor/dkjson.lua