From 4b90f63cd620078ae09933e28a9f9279d9f154fc Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Mon, 11 Dec 2023 16:11:46 -0500 Subject: [PATCH 1/5] fix(server_manager): replace turned down omahaproxy.appspot.com --- src/server_manager/electron_and_karma_chromium.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server_manager/electron_and_karma_chromium.spec.ts b/src/server_manager/electron_and_karma_chromium.spec.ts index adc05d2df..dcb2594dd 100644 --- a/src/server_manager/electron_and_karma_chromium.spec.ts +++ b/src/server_manager/electron_and_karma_chromium.spec.ts @@ -22,16 +22,16 @@ import {config} from './package.json'; describe('Karma', () => { it('uses the correct Chromium version', async (done) => { - // Omaha Proxy is a service maintained by the Chrome team which serves metadata about current - // and legacy Chrome versions. const electronChromiumVersionInfo = <{chromium_base_position?: string}>( await ( await fetch( - `http://omahaproxy.appspot.com/deps.json?version=${electronToChromium(electronVersion)}` + `https://chromiumdash.appspot.com/fetch_version?version=${electronToChromium( + electronVersion + )}` ) ).json() ); - const electronChromeRevision = electronChromiumVersionInfo.chromium_base_position; + const electronChromeRevision = electronChromiumVersionInfo.chromium_main_branch_position; expect(electronChromeRevision).toEqual(config.PUPPETEER_CHROMIUM_REVISION); done(); }); From dd75c1a1f218958872873a490d4cdd4ee7f2afbf Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Mon, 11 Dec 2023 15:56:20 -0500 Subject: [PATCH 2/5] Update engine. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 50e6cb261..46071f71b 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,7 @@ "typescript": "^4" }, "engines": { - "node": "^18.16.0", - "npm": "^9.5.1" + "node": "18.x.x" }, "scripts": { "action": "bash ./scripts/run_action.sh", From 7d6a14fa2c427ccc3573c5203d9a77d88f252bf3 Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Mon, 11 Dec 2023 16:20:38 -0500 Subject: [PATCH 3/5] Fix type. --- src/server_manager/electron_and_karma_chromium.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server_manager/electron_and_karma_chromium.spec.ts b/src/server_manager/electron_and_karma_chromium.spec.ts index dcb2594dd..1dd65399d 100644 --- a/src/server_manager/electron_and_karma_chromium.spec.ts +++ b/src/server_manager/electron_and_karma_chromium.spec.ts @@ -22,7 +22,7 @@ import {config} from './package.json'; describe('Karma', () => { it('uses the correct Chromium version', async (done) => { - const electronChromiumVersionInfo = <{chromium_base_position?: string}>( + const electronChromiumVersionInfo = <{chromium_main_branch_position?: string}>( await ( await fetch( `https://chromiumdash.appspot.com/fetch_version?version=${electronToChromium( From 768e144af8b450ab72650eca3c0e887682d90692 Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Mon, 11 Dec 2023 16:27:01 -0500 Subject: [PATCH 4/5] Yes we get it. A string is not an int. --- src/server_manager/electron_and_karma_chromium.spec.ts | 2 +- src/server_manager/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server_manager/electron_and_karma_chromium.spec.ts b/src/server_manager/electron_and_karma_chromium.spec.ts index 1dd65399d..441c50426 100644 --- a/src/server_manager/electron_and_karma_chromium.spec.ts +++ b/src/server_manager/electron_and_karma_chromium.spec.ts @@ -22,7 +22,7 @@ import {config} from './package.json'; describe('Karma', () => { it('uses the correct Chromium version', async (done) => { - const electronChromiumVersionInfo = <{chromium_main_branch_position?: string}>( + const electronChromiumVersionInfo = <{chromium_main_branch_position?: number}>( await ( await fetch( `https://chromiumdash.appspot.com/fetch_version?version=${electronToChromium( diff --git a/src/server_manager/package.json b/src/server_manager/package.json index 681246257..3f981b2ed 100644 --- a/src/server_manager/package.json +++ b/src/server_manager/package.json @@ -59,7 +59,7 @@ "PUPPETEER_CHROMIUM_REVISION": [ "The Chromium revision number used by Karma. This should always be the revision number of", "the bundled Chromium in our version of Electron. Whenever upgrading Electron, run the", - "server_manager tests. You'll get a failure that looks like .", + "server_manager tests. You'll get a failure that looks like .", "Set PUPPETEER_CHROMIUM_REVISION to the first of those numbers to get the correct revision", "and `npm ci` to re-install puppeteer, causing it to download the new", "Chromium version." @@ -67,7 +67,7 @@ } }, "config": { - "PUPPETEER_CHROMIUM_REVISION": "992738" + "PUPPETEER_CHROMIUM_REVISION": 992738 }, "devDependencies": { "@types/node": "^16.11.29", From c47e0faf4e235c4e490c8f8d31bacaebd19c569b Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Mon, 11 Dec 2023 16:29:15 -0500 Subject: [PATCH 5/5] Put the comment back. It's quite useful. --- src/server_manager/electron_and_karma_chromium.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server_manager/electron_and_karma_chromium.spec.ts b/src/server_manager/electron_and_karma_chromium.spec.ts index 441c50426..48823ecfe 100644 --- a/src/server_manager/electron_and_karma_chromium.spec.ts +++ b/src/server_manager/electron_and_karma_chromium.spec.ts @@ -22,6 +22,8 @@ import {config} from './package.json'; describe('Karma', () => { it('uses the correct Chromium version', async (done) => { + // ChromiumDash is a service maintained by the Chrome team which serves metadata about current + // and legacy Chrome versions. const electronChromiumVersionInfo = <{chromium_main_branch_position?: number}>( await ( await fetch(