enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Iterate patch

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2026-03-24 17:20:59 +00:00
parent 3802f6c150
commit e663479ab4
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/app-builder-lib.patch
+16 -13
View File
@@ -1,24 +1,27 @@
diff --git a/out/node-module-collector/moduleManager.js b/out/node-module-collector/moduleManager.js
index f483d9387a3270afc884b8478f19dd2825477a04..a6b2a28befda5881e45368a07ae793f64f4aed41 100644
index f483d9387a3270afc884b8478f19dd2825477a04..a718d92825b4813bc27eb10775a70d8e0731fcf7 100644
--- a/out/node-module-collector/moduleManager.js
+++ b/out/node-module-collector/moduleManager.js
@@ -115,8 +115,7 @@ class ModuleManager {
@@ -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,8 +116,12 @@ class ModuleManager {
return { packageDir: path.dirname(direct), packageJson: json };
}
}
- // 2) upward hoisted search, then 3) downward non-hoisted search
- return (await this.upwardSearch(parentDir, pkgName, requiredRange)) || (await this.downwardSearch(parentDir, pkgName, requiredRange)) || null;
+ return (await this.upwardSearch(parentDir, pkgName, requiredRange)) || null;
+ // 2) upward hoisted search, then 3) downward non-hoisted search, then 4) downward from workspace root
+ const workspaceRoot = await searchModule.getProjectRootPath(parentDir);
+ return (await this.upwardSearch(parentDir, pkgName, requiredRange)) ||
+ (await this.downwardSearch(parentDir, pkgName, requiredRange)) ||
+ (await this.downwardSearch(workspaceRoot, pkgName, requiredRange)) ||
+ null;
}
semverSatisfies(found, range) {
if ((0, builder_util_1.isEmptyOrSpaces)(range) || range === "*") {
@@ -157,6 +156,9 @@ class ModuleManager {
let current = path.resolve(parentDir);
const root = path.parse(current).root;
while (true) {
+ const pkg = await this.downwardSearch(current, pkgName, requiredRange);
+ if (pkg) return pkg;
+
const candidate = path.join(current, "node_modules", pkgName, "package.json");
if (await this.exists[candidate]) {
const json = await this.json[candidate];
pnpm-lock.yaml
Generated
+6 -6
View File
@@ -74,7 +74,7 @@ patchedDependencies:
hash: 7bdf6150f2905bc2f055a6bcaa7b9d78fa7ffde82e800bcc454ac7b0096bd65e
path: patches/@vector-im__matrix-wysiwyg.patch
app-builder-lib:
hash: 1d15e15843e088318d05b3390c07e37d5d5fe66355da1783f5a86db93c82b9c0
hash: 2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6
path: patches/app-builder-lib.patch
await-lock:
hash: b767a571946a4f8710ac54b1a7bec8a7c1570f9b85d75922392fae20d0578964
@@ -222,7 +222,7 @@ importers:
version: 8.56.1(eslint@8.57.1)(typescript@5.9.3)
app-builder-lib:
specifier: 26.8.2
version: 26.8.2(patch_hash=1d15e15843e088318d05b3390c07e37d5d5fe66355da1783f5a86db93c82b9c0)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
version: 26.8.2(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
chokidar:
specifier: ^5.0.0
version: 5.0.0
@@ -17464,7 +17464,7 @@ snapshots:
app-builder-bin@5.0.0-alpha.12: {}
app-builder-lib@26.8.2(patch_hash=1d15e15843e088318d05b3390c07e37d5d5fe66355da1783f5a86db93c82b9c0)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2):
app-builder-lib@26.8.2(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2):
dependencies:
'@develar/schema-utils': 2.6.5
'@electron/asar': 3.4.1
@@ -18839,7 +18839,7 @@ snapshots:
dmg-builder@26.8.2(electron-builder-squirrel-windows@26.8.2):
dependencies:
app-builder-lib: 26.8.2(patch_hash=1d15e15843e088318d05b3390c07e37d5d5fe66355da1783f5a86db93c82b9c0)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
app-builder-lib: 26.8.2(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
builder-util: 26.8.1
fs-extra: 10.1.0
iconv-lite: 0.6.3
@@ -18989,7 +18989,7 @@ snapshots:
electron-builder-squirrel-windows@26.8.2(dmg-builder@26.8.2):
dependencies:
app-builder-lib: 26.8.2(patch_hash=1d15e15843e088318d05b3390c07e37d5d5fe66355da1783f5a86db93c82b9c0)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
app-builder-lib: 26.8.2(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
builder-util: 26.8.1
electron-winstaller: 5.4.0
transitivePeerDependencies:
@@ -18998,7 +18998,7 @@ snapshots:
electron-builder@26.8.2(electron-builder-squirrel-windows@26.8.2):
dependencies:
app-builder-lib: 26.8.2(patch_hash=1d15e15843e088318d05b3390c07e37d5d5fe66355da1783f5a86db93c82b9c0)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
app-builder-lib: 26.8.2(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.8.2)(electron-builder-squirrel-windows@26.8.2)
builder-util: 26.8.1
builder-util-runtime: 9.5.1
chalk: 4.1.2