From 4cf647c49b2e891aa1198c610095a6df83972655 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sat, 5 Sep 2026 11:21:02 +0000
Subject: [PATCH] patch: ignore package.json & support framework path

---
 packages/hydrooj/src/commands/patch.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/hydrooj/src/commands/patch.ts b/packages/hydrooj/src/commands/patch.ts
index 3be7c4816..54b134310 100644
--- a/packages/hydrooj/src/commands/patch.ts
+++ b/packages/hydrooj/src/commands/patch.ts
@@ -10,8 +10,8 @@ const logger = new Logger('patch');
 
 function locateFile(file: string): string | null {
     const candidates = [file];
-    if (file.startsWith('packages/')) {
-        candidates.push(file.replace(/^packages\//, ''), file.replace(/^packages\//, '@hydrooj/'));
+    if (['packages/', 'framework/'].some((p) => file.startsWith(p))) {
+        candidates.push(file.replace(/^(packages|framework)\//, ''), file.replace(/^(packages|framework)\//, '@hydrooj/'));
     }
     for (const candidate of candidates) {
         try {
@@ -45,6 +45,10 @@ export function register(cli: CAC) {
                     const match = line.match(/diff --git a\/(.+?) b\/(.+?)(?:\s|$)/);
                     if (!match) continue;
                     const filename = match[2];
+                    if (path.basename(filename) === 'package.json') {
+                        logger.info('Skipping %s (package.json changes are ignored)', filename);
+                        continue;
+                    }
                     const startLine = i;
                     let endLine = lines.length;
                     for (let j = i + 1; j < lines.length; j++) {