fixup! Support submodules in autoloader

metarhia · Aug 8, 2023 · ff9bef6 · ff9bef6
1 parent fd27844
commit ff9bef6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/deps.js b/lib/deps.js
@@ -45,17 +45,17 @@ const loadPlugins = (lib) => {
 };
 
 const validSubmodules = (key) => {
-  if (key === '.') return false;
-  if (key === './package.json') return false;
-  return !key.includes('*');
+  if (key === '') return false;
+  if (key === 'package.json') return false;
+  return !key.includes('*') && !key.includes('.');
 };
 
 const loadModule = (name) => {
   const lib = appRequire(name);
   const pkg = require(`${CWD}/node_modules/${name}/package.json`);
   if (!pkg.exports) return lib;
-  const subKeys = Object.keys(pkg.exports).filter(validSubmodules);
-  const subNames = subKeys.map((key) => key.substring(2));
+  const subKeys = Object.keys(pkg.exports).map((key) => key.substring(2));
+  const subNames = subKeys.filter(validSubmodules);
   for (const subName of subNames) {
     const sub = appRequire(name + '/' + subName);
     const key = name + '/' + subName;