Merge remote-tracking branch 'origin/main' into release/v1.4

Author: CodFrm

.husky/pre-push

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Skip checks: SKIP_PRE_PUSH=1 git push or git push --no-verify
+if [ "$SKIP_PRE_PUSH" = "1" ]; then
+  echo "⏭ SKIP_PRE_PUSH=1, skipping pre-push checks"
+  exit 0
+fi
+
+# Only run checks when pushing to main or release/* branches
+remote="$1"
+need_check=0
+
+while read local_ref local_sha remote_ref remote_sha; do
+  branch=$(echo "$remote_ref" | sed 's|refs/heads/||')
+
+  if [ "$branch" = "main" ] || echo "$branch" | grep -q "^release"; then
+    need_check=1
+    echo "🔍 Detected push target: $branch"
+  fi
+done
+
+if [ "$need_check" = "0" ]; then
+  exit 0
+fi
+
+echo ""
+echo "▶ Running lint..."
+pnpm run lint || exit 1
+
+echo ""
+echo "▶ Running tests..."
+pnpm run test:ci || exit 1
+
+echo ""
+echo "✅ All checks passed! (build and e2e tests will run in CI)"

e2e/gm-api.spec.ts

@@ -20,12 +20,13 @@ const test = base.extend<{
       args: ["--headless=new", ...chromeArgs],
     });
     let [bg] = ctx1.serviceWorkers();
-    if (!bg) bg = await ctx1.waitForEvent("serviceworker");
+    if (!bg) bg = await ctx1.waitForEvent("serviceworker", { timeout: 30_000 });
     const extensionId = bg.url().split("/")[2];
     const extPage = await ctx1.newPage();
     await extPage.goto("chrome://extensions/");
     await extPage.waitForLoadState("domcontentloaded");
-    await extPage.waitForTimeout(1_000);
+    // Wait for developerPrivate API to be available instead of a fixed delay
+    await extPage.waitForFunction(() => !!(chrome as any).developerPrivate, { timeout: 10_000 });
     await extPage.evaluate(async (id) => {
       await (chrome as any).developerPrivate.updateExtensionConfiguration({
         extensionId: id,
@@ -40,6 +41,10 @@ const test = base.extend<{
       headless: false,
       args: ["--headless=new", ...chromeArgs],
     });
+    // Ensure service worker is registered before handing context to fixtures,
+    // preventing extensionId fixture from timing out with the global 10s timeout.
+    const [sw] = context.serviceWorkers();
+    if (!sw) await context.waitForEvent("serviceworker", { timeout: 30_000 });
     await use(context);
     await context.close();
     fs.rmSync(userDataDir, { recursive: true, force: true });
@@ -117,24 +122,25 @@ async function runTestScript(
 
   const page = await context.newPage();
   const logs: string[] = [];
-  page.on("console", (msg) => logs.push(msg.text()));
-
-  await page.goto(targetUrl, { waitUntil: "domcontentloaded" });
-
-  // Wait for test results to appear in console
-  const deadline = Date.now() + timeoutMs;
   let passed = -1;
   let failed = -1;
-  while (Date.now() < deadline) {
-    for (const log of logs) {
-      const passMatch = log.match(/通过[:：]\s*(\d+)/);
-      const failMatch = log.match(/失败[:：]\s*(\d+)/);
+
+  // Resolve as soon as both pass and fail counts appear in console output
+  const resultReady = new Promise<void>((resolve) => {
+    page.on("console", (msg) => {
+      const text = msg.text();
+      logs.push(text);
+      const passMatch = text.match(/通过[:：]\s*(\d+)/);
+      const failMatch = text.match(/失败[:：]\s*(\d+)/);
       if (passMatch) passed = parseInt(passMatch[1], 10);
       if (failMatch) failed = parseInt(failMatch[1], 10);
-    }
-    if (passed >= 0 && failed >= 0) break;
-    await page.waitForTimeout(500);
-  }
+      if (passed >= 0 && failed >= 0) resolve();
+    });
+  });
+
+  await page.goto(targetUrl, { waitUntil: "domcontentloaded" });
+  // Race: resolve immediately when results arrive, or fall through after timeout
+  await Promise.race([resultReady, page.waitForTimeout(timeoutMs)]);
 
   await page.close();
   return { passed, failed, logs };

e2e/utils.ts

@@ -36,18 +36,22 @@ export async function openEditorPage(context: BrowserContext, extensionId: strin
 /** Install a script by injecting code into the Monaco editor and saving */
 export async function installScriptByCode(context: BrowserContext, extensionId: string, code: string): Promise<void> {
   const page = await openEditorPage(context, extensionId);
-  // Wait for Monaco editor to be ready
+  // Wait for Monaco editor DOM and default template content to be ready
   await page.locator(".monaco-editor").waitFor({ timeout: 30_000 });
   await page.locator(".view-lines").waitFor({ timeout: 15_000 });
-  // Click into editor to ensure focus
+  // Click to focus and wait for the cursor to appear (confirms editor is interactive)
   await page.locator(".monaco-editor .view-lines").click();
-  await page.waitForTimeout(500);
-  // Select all existing content and replace via clipboard
+  await page.locator(".cursors-layer .cursor").waitFor({ timeout: 5_000 });
+  // Select all existing content
   await page.keyboard.press("ControlOrMeta+a");
-  await page.waitForTimeout(500);
+  // Capture current content fingerprint, then paste replacement
+  const initialText = await page.locator(".view-lines").textContent();
   await page.evaluate((text) => navigator.clipboard.writeText(text), code);
   await page.keyboard.press("ControlOrMeta+v");
-  await page.waitForTimeout(2000);
+  // Wait for Monaco to finish rendering the pasted content (content will differ from template)
+  await page.waitForFunction((init) => document.querySelector(".view-lines")?.textContent !== init, initialText, {
+    timeout: 10_000,
+  });
   // Save
   await page.keyboard.press("ControlOrMeta+s");
   // Wait for save: try arco-message first, then verify via script list
@@ -61,13 +65,9 @@ export async function installScriptByCode(context: BrowserContext, extensionId:
     // For scripts with @require/@resource, the message may not appear.
     // Verify save by checking the script list on the options page.
     const listPage = await openOptionsPage(context, extensionId);
-    await listPage.waitForTimeout(2_000);
     const emptyState = listPage.locator(".arco-empty");
-    // Wait until at least one script appears (no empty state)
-    for (let i = 0; i < 30; i++) {
-      if ((await emptyState.count()) === 0) break;
-      await listPage.waitForTimeout(1_000);
-    }
+    // Wait until at least one script appears (no empty state), up to 30s
+    await emptyState.waitFor({ state: "detached", timeout: 30_000 }).catch(() => {});
     await listPage.close();
   }
   await page.close();

package.json

@@ -7,6 +7,7 @@
   "private": true,
   "scripts": {
     "preinstall": "pnpm dlx only-allow pnpm",
+    "prepare": "husky",
     "test": "vitest --test-timeout=500 --no-coverage --isolate=false --reporter=verbose",
     "test:ci": "vitest run --test-timeout=500 --no-coverage --isolate=false --reporter=default --reporter.summary=false",
     "coverage": "vitest run --coverage",
@@ -84,6 +85,7 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-userscripts": "^0.5.6",
     "globals": "^16.5.0",
+    "husky": "^9.1.7",
     "iconv-lite": "^0.7.2",
     "jsdom": "^26.1.0",
     "jszip": "^3.10.1",
@@ -104,4 +106,4 @@
     "**/*.scss",
     "**/*.less"
   ]
-}
+}