Skip submodules if they have already been loaded as a part of main mo…

…dule See: metarhia#1938
DmitryScaletta · Nov 12, 2023 · 095c928 · 095c928
1 parent 52dd114
commit 095c928
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/deps.js b/lib/deps.js
@@ -56,12 +56,14 @@ const loadModule = (name) => {
   for (const subName of subNames) {
     try {
       const sub = appRequire(name + '/' + subName);
+      if (lib[subName] && lib[subName] === sub[subName]) continue;
       lib[subName] = sub;
     } catch (e) {
       if (e.message.startsWith("Cannot find module '")) {
         const moduleName = e.message.substring(20, e.message.indexOf("'\n"));
         const optional = pkg.peerDependenciesMeta?.[moduleName].optional;
-        if (optional) continue; else throw e;
+        if (optional) continue;
+        else throw e;
       }
     }
   }