Mercurial > prosody-hg

comparison loader.lua @ 14062:ef586363d90f 13.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loader: Fix path setup Since prosody etc usually add a path containing "prosody", the substitution did not happen and community modules using the old import style did not work.
author Kim Alvefur <zash@zash.se>
date Mon, 09 Feb 2026 01:53:50 +0100
parents 2f61ebcf37c0
children 76ece4dd9782
comparison
equal deleted inserted replaced
14059:2bdddcfad61d 14062:ef586363d90f
1 -- Allow for both require"util.foo" and require"prosody.util.foo" for a 1 -- Allow for both require"util.foo" and require"prosody.util.foo" for a
2 -- transition period while we update all require calls. 2 -- transition period while we update all require calls.
3 3
4 if (...) == "prosody.loader" then 4 if (...) == "prosody.loader" then
5 if not package.path:find "prosody" then 5 -- For require"util.foo" also look in paths equivalent to "prosody.util.foo"
6 -- For require"util.foo" also look in paths equivalent to "prosody.util.foo" 6 package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
7 package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2"); 7 package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
8 package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
9 end
10 else 8 else
11 -- When requiring "prosody.x", also look for "x" 9 -- When requiring "prosody.x", also look for "x"
12 for i = #package.searchers, 1, -1 do 10 for i = #package.searchers, 1, -1 do
13 local search = package.searchers[i]; 11 local search = package.searchers[i];
14 table.insert(package.searchers, i, function(module_name) 12 table.insert(package.searchers, i, function(module_name)