From 93a0a2df32926aa86f7e11bc71a43afaea581a09 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 26 Jul 2024 15:19:05 +0200
Subject: [PATCH] Fixes CI

---
 test/smoke/amd/index.html |  1 +
 test/smoke/smoke.test.js  | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/smoke/amd/index.html b/test/smoke/amd/index.html
index a50ce51db2..5d22f3211e 100644
--- a/test/smoke/amd/index.html
+++ b/test/smoke/amd/index.html
@@ -8,6 +8,7 @@
 		<script src="../../../out/monaco-editor/dev/vs/loader.js"></script>
 		<script>
 			require.config({
+				baseUrl: new URL('..', document.baseURI).toString(),
 				paths: {
 					vs: '../../../out/monaco-editor/dev/vs'
 				}
diff --git a/test/smoke/smoke.test.js b/test/smoke/smoke.test.js
index 8ada8e9be6..81a3ba6578 100644
--- a/test/smoke/smoke.test.js
+++ b/test/smoke/smoke.test.js
@@ -186,16 +186,22 @@ suite(`Smoke Test '${testInfo.packager}' on '${testInfo.browser}'`, () => {
 		await page.waitForSelector(`text=addEventListener`);
 
 		// find the TypeScript worker
-		const tsWorker = page.workers().find((worker) => {
-			const url = worker.url();
-			return /ts\.worker(\.[a-f0-9]+)?\.js$/.test(url) || /workerMain.js#typescript$/.test(url);
-		});
-		if (!tsWorker) {
-			assert.fail('Could not find TypeScript worker');
+
+		function findAsync(arr, fn) {
+			return Promise.all(arr.map(fn)).then((results) => {
+				return arr.find((_, i) => results[i]);
+			});
 		}
 
 		// check that the TypeScript worker exposes `ts` as a global
-		assert.strictEqual(await tsWorker.evaluate(`typeof ts`), 'object');
+		const tsWorker = await findAsync(
+			page.workers(),
+			async (page) => await page.evaluate(`typeof ts !== 'undefined'`)
+		);
+
+		if (!tsWorker) {
+			assert.fail('Could not find TypeScript worker');
+		}
 
 		// check that the TypeScript worker exposes the full `ts` as a global
 		assert.strictEqual(await tsWorker.evaluate(`typeof ts.optionDeclarations`), 'object');