mirror of
https://github.com/vector-im/element-web.git
synced 2026-07-07 15:58:53 +00:00
renovate[bot]
efeef6cd84
* Update electron-builder to v26.11.1 * Update patch * Make tsc happy --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
diff --git a/out/node-module-collector/moduleManager.js b/out/node-module-collector/moduleManager.js
|
|
index e9d6d16f8950c01417039d65ed1939009d642b7a..9f47c5e18fb34fe60e4f09bf512f9639aa2d90c0 100644
|
|
--- a/out/node-module-collector/moduleManager.js
|
|
+++ b/out/node-module-collector/moduleManager.js
|
|
@@ -5,6 +5,7 @@ const builder_util_1 = require("builder-util");
|
|
const fs = require("fs-extra");
|
|
const path = require("path");
|
|
const semver = require("semver");
|
|
+const searchModule = require("../electron/search-module");
|
|
var LogMessageByKey;
|
|
(function (LogMessageByKey) {
|
|
LogMessageByKey["PKG_DUPLICATE_REF"] = "duplicate dependency references";
|
|
@@ -115,15 +116,15 @@ class ModuleManager {
|
|
return { packageDir: path.dirname(direct), packageJson: json };
|
|
}
|
|
}
|
|
- // 2) upward hoisted search, then 3) downward non-hoisted search
|
|
+ // 2) upward hoisted search, then 3) downward non-hoisted search, then 4) downward from workspace root
|
|
const upward = await this.upwardSearch(parentDir, pkgName, requiredRange);
|
|
if (upward) {
|
|
return upward;
|
|
}
|
|
- if (skipDownwardSearch) {
|
|
- return null;
|
|
- }
|
|
- return (await this.downwardSearch(parentDir, pkgName, requiredRange)) || null;
|
|
+ const workspaceRoot = await searchModule.getProjectRootPath(parentDir);
|
|
+ return (await this.downwardSearch(parentDir, pkgName, requiredRange)) ||
|
|
+ (await this.downwardSearch(workspaceRoot, pkgName, requiredRange)) ||
|
|
+ null;
|
|
}
|
|
semverSatisfies(found, range) {
|
|
if ((0, builder_util_1.isEmptyOrSpaces)(range) || range === "*") {
|