From 18f642394d1b5984628b86c1096593b1f4ce84f8 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 8 Dec 2025 10:25:07 +0000 Subject: [PATCH 1/4] refactor: remove wait-on dependency Replace external wait-on package with inline waitForServer function. This reduces transitive dependencies (including axios) while providing equivalent functionality for the fake-extension dev script. --- injected/scripts/run-fake-extension.js | 24 ++- package-lock.json | 215 +------------------------ package.json | 3 +- 3 files changed, 24 insertions(+), 218 deletions(-) diff --git a/injected/scripts/run-fake-extension.js b/injected/scripts/run-fake-extension.js index 10375c383d..05abfdde37 100644 --- a/injected/scripts/run-fake-extension.js +++ b/injected/scripts/run-fake-extension.js @@ -1,6 +1,5 @@ #!/usr/bin/env node import { spawn } from 'child_process'; -import waitOn from 'wait-on'; import path from 'path'; import { fileURLToPath } from 'url'; @@ -25,6 +24,27 @@ function run(cmd, args, opts = {}) { }); } +/** + * Wait for a URL to become available. + * @param {string} url - The URL to poll + * @param {number} [timeout=30000] - Timeout in milliseconds + * @param {number} [interval=500] - Polling interval in milliseconds + * @returns {Promise} + */ +async function waitForServer(url, timeout = 30000, interval = 500) { + const start = Date.now(); + while (Date.now() - start < timeout) { + try { + const response = await fetch(url); + if (response.ok) return; + } catch { + // Server not ready yet, continue polling + } + await new Promise((resolve) => setTimeout(resolve, interval)); + } + throw new Error(`Timeout waiting for ${url}`); +} + async function main() { // 1. Build await run('npm', ['run', 'build']); @@ -60,7 +80,7 @@ async function main() { }); // 3. Wait for server - await waitOn({ resources: ['http://localhost:3220/index.html'] }); + await waitForServer('http://localhost:3220/index.html'); // 4. Run web-ext try { diff --git a/package-lock.json b/package-lock.json index 13d9a44cc0..df48f4cdaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,8 +30,7 @@ "ts-json-schema-generator": "^2.4.0", "typedoc": "^0.28.8", "typescript": "^5.8.3", - "typescript-eslint": "^8.36.0", - "wait-on": "^9.0.1" + "typescript-eslint": "^8.36.0" } }, "injected": { @@ -169,7 +168,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" }, @@ -193,7 +191,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=18" } @@ -358,7 +355,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": "^14 || ^16 || >=18" }, @@ -402,7 +398,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": "^14 || ^16 || >=18" } @@ -1169,60 +1164,6 @@ "@shikijs/vscode-textmate": "^10.0.2" } }, - "node_modules/@hapi/address": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-5.1.1.tgz", - "integrity": "sha512-A+po2d/dVoY7cYajycYI43ZbYMXukuopIsqCjh5QzsBCipDtdofHntljDlpccMjIfTy6UOkg+5KPriwYch2bXA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^11.0.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@hapi/formula": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-3.0.2.tgz", - "integrity": "sha512-hY5YPNXzw1He7s0iqkRQi+uMGh383CGdyyIGYtB+W5N3KHPXoqychklvHhKCC9M3Xtv0OCs/IHw+r4dcHtBYWw==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@hapi/hoek": { - "version": "11.0.7", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.7.tgz", - "integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@hapi/pinpoint": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.1.tgz", - "integrity": "sha512-EKQmr16tM8s16vTT3cA5L0kZZcTMU5DUOZTuvpnY738m+jyP3JIUj+Mm1xc1rsLkGBQ/gVnfKYPwOmPg1tUR4Q==", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@hapi/tlds": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@hapi/tlds/-/tlds-1.1.3.tgz", - "integrity": "sha512-QIvUMB5VZ8HMLZF9A2oWr3AFM430QC8oGd0L35y2jHpuW6bIIca6x/xL7zUf4J7L9WJ3qjz+iJII8ncaeMbpSg==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@hapi/topo": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-6.0.2.tgz", - "integrity": "sha512-KR3rD5inZbGMrHmgPxsJ9dbi6zEK+C3ZwUwTa+eMwWLz7oijWUTWD2pMSNNYJAU6Qq+65NkxXjqHr/7LM2Xkqg==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^11.0.2" - } - }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -1619,13 +1560,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@standard-schema/spec": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", - "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/chrome": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.1.1.tgz", @@ -1979,7 +1913,6 @@ "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.36.0", "@typescript-eslint/types": "8.36.0", @@ -2399,7 +2332,6 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3065,13 +2997,6 @@ "lodash": "^4.17.14" } }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, - "license": "MIT" - }, "node_modules/atomic-sleep": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz", @@ -3108,18 +3033,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/axios": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", - "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", - "dev": true, - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.4", - "proxy-from-env": "^1.1.0" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -3773,19 +3686,6 @@ "node": ">=8.0.0" } }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/commander": { "version": "13.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz", @@ -4414,16 +4314,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -4901,7 +4791,6 @@ "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -5674,23 +5563,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/form-data": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", - "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", - "dev": true, - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/formdata-polyfill": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", @@ -7067,25 +6939,6 @@ "dev": true, "license": "MIT" }, - "node_modules/joi": { - "version": "18.0.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-18.0.1.tgz", - "integrity": "sha512-IiQpRyypSnLisQf3PwuN2eIHAsAIGZIrLZkd4zdvIar2bDyhM91ubRjy8a3eYablXsh9BeI/c7dmPYHca5qtoA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/address": "^5.1.1", - "@hapi/formula": "^3.0.2", - "@hapi/hoek": "^11.0.7", - "@hapi/pinpoint": "^2.0.1", - "@hapi/tlds": "^1.1.1", - "@hapi/topo": "^6.0.2", - "@standard-schema/spec": "^1.0.0" - }, - "engines": { - "node": ">= 20" - } - }, "node_modules/jose": { "version": "5.9.6", "resolved": "https://registry.npmjs.org/jose/-/jose-5.9.6.tgz", @@ -7714,29 +7567,6 @@ "node": ">=4" } }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "license": "MIT", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -8582,7 +8412,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.1.1", @@ -8622,7 +8451,6 @@ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -8643,7 +8471,6 @@ "resolved": "https://registry.npmjs.org/preact/-/preact-10.28.0.tgz", "integrity": "sha512-rytDAoiXr3+t6OIP3WGlDd0ouCUG1iCWzkcY3++Nreuoi17y6T5i/zRhe6uYfoVcxq6YU+sBtJouuRDsq8vvqA==", "license": "MIT", - "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/preact" @@ -8718,13 +8545,6 @@ "dev": true, "license": "ISC" }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true, - "license": "MIT" - }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -9157,16 +8977,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/rxjs": { - "version": "7.8.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", - "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/safe-array-concat": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", @@ -9729,7 +9539,6 @@ "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@csstools/css-parser-algorithms": "^2.3.1", "@csstools/css-tokenizer": "^2.2.0", @@ -10013,7 +9822,6 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -10435,7 +10243,6 @@ "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -10766,26 +10573,6 @@ "node": ">=18" } }, - "node_modules/wait-on": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.1.tgz", - "integrity": "sha512-noeCAI+XbqWMXY23sKril0BSURhuLYarkVXwJv1uUWwoojZJE7pmX3vJ7kh7SZaNgPGzfsCSQIZM/AGvu0Q9pA==", - "dev": true, - "license": "MIT", - "dependencies": { - "axios": "^1.12.2", - "joi": "^18.0.1", - "lodash": "^4.17.21", - "minimist": "^1.2.8", - "rxjs": "^7.8.2" - }, - "bin": { - "wait-on": "bin/wait-on" - }, - "engines": { - "node": ">=20.0.0" - } - }, "node_modules/watchpack": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz", diff --git a/package.json b/package.json index e3528cfb67..4a5c54522e 100644 --- a/package.json +++ b/package.json @@ -50,8 +50,7 @@ "ts-json-schema-generator": "^2.4.0", "typedoc": "^0.28.8", "typescript": "^5.8.3", - "typescript-eslint": "^8.36.0", - "wait-on": "^9.0.1" + "typescript-eslint": "^8.36.0" }, "dependencies": { "immutable-json-patch": "^6.0.2", From ea6cb66356e4fe49a17d0e750192deee30f1ef84 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 8 Dec 2025 11:14:11 +0000 Subject: [PATCH 2/4] Add request timeout to waitForServer Co-authored-by: jkingston --- injected/scripts/run-fake-extension.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/injected/scripts/run-fake-extension.js b/injected/scripts/run-fake-extension.js index 05abfdde37..ab9b17aed6 100644 --- a/injected/scripts/run-fake-extension.js +++ b/injected/scripts/run-fake-extension.js @@ -34,11 +34,17 @@ function run(cmd, args, opts = {}) { async function waitForServer(url, timeout = 30000, interval = 500) { const start = Date.now(); while (Date.now() - start < timeout) { + const remaining = timeout - (Date.now() - start); + const controller = new AbortController(); + const requestTimeout = Math.max(100, Math.min(5000, remaining)); + const timer = setTimeout(() => controller.abort(), requestTimeout); try { - const response = await fetch(url); + const response = await fetch(url, { signal: controller.signal }); if (response.ok) return; } catch { // Server not ready yet, continue polling + } finally { + clearTimeout(timer); } await new Promise((resolve) => setTimeout(resolve, interval)); } From 8cbbaa85040117ad59a383c618ff323037290b49 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Tue, 9 Dec 2025 10:27:34 +0000 Subject: [PATCH 3/4] Refactor waitForServer function for improved timeout handling --- injected/scripts/run-fake-extension.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/injected/scripts/run-fake-extension.js b/injected/scripts/run-fake-extension.js index ab9b17aed6..0d18ae8103 100644 --- a/injected/scripts/run-fake-extension.js +++ b/injected/scripts/run-fake-extension.js @@ -32,21 +32,15 @@ function run(cmd, args, opts = {}) { * @returns {Promise} */ async function waitForServer(url, timeout = 30000, interval = 500) { - const start = Date.now(); - while (Date.now() - start < timeout) { - const remaining = timeout - (Date.now() - start); - const controller = new AbortController(); - const requestTimeout = Math.max(100, Math.min(5000, remaining)); - const timer = setTimeout(() => controller.abort(), requestTimeout); + const deadline = Date.now() + timeout; + while (Date.now() < deadline) { try { - const response = await fetch(url, { signal: controller.signal }); + const response = await fetch(url, { signal: AbortSignal.timeout(5000) }); if (response.ok) return; } catch { - // Server not ready yet, continue polling - } finally { - clearTimeout(timer); + // Server not ready yet } - await new Promise((resolve) => setTimeout(resolve, interval)); + await new Promise(resolve => setTimeout(resolve, interval)); } throw new Error(`Timeout waiting for ${url}`); } From df5215dc9eb18e2685824c9d6bc943f6be8c3279 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Tue, 9 Dec 2025 16:36:57 +0000 Subject: [PATCH 4/4] Lint fix --- injected/scripts/run-fake-extension.js | 2 +- special-pages/pages/new-tab/app/mock-transport.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/injected/scripts/run-fake-extension.js b/injected/scripts/run-fake-extension.js index 0d18ae8103..8cb8c86be0 100644 --- a/injected/scripts/run-fake-extension.js +++ b/injected/scripts/run-fake-extension.js @@ -40,7 +40,7 @@ async function waitForServer(url, timeout = 30000, interval = 500) { } catch { // Server not ready yet } - await new Promise(resolve => setTimeout(resolve, interval)); + await new Promise((resolve) => setTimeout(resolve, interval)); } throw new Error(`Timeout waiting for ${url}`); } diff --git a/special-pages/pages/new-tab/app/mock-transport.js b/special-pages/pages/new-tab/app/mock-transport.js index 3c4f88a8d5..bf2b351f5f 100644 --- a/special-pages/pages/new-tab/app/mock-transport.js +++ b/special-pages/pages/new-tab/app/mock-transport.js @@ -465,7 +465,6 @@ export function mockTransport() { return true; }) .map((id) => { - // eslint-disable-next-line object-shorthand return { id: /** @type {any} */ (id) }; }), };