fix browser scripts

csstools · Jan 14, 2025 · 844af21 · 844af21
1 parent 4b2157e
commit 844af21
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 81 deletions.
diff --git a/plugins/css-blank-pseudo/test/_browser.mjs b/plugins/css-blank-pseudo/test/_browser.mjs
@@ -58,11 +58,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -238,7 +240,7 @@ if (!process.env.DEBUG) {
 				}
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/css-has-pseudo/test/_browser.mjs b/plugins/css-has-pseudo/test/_browser.mjs
@@ -83,11 +83,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -127,7 +129,7 @@ if (!process.env.DEBUG) {
 				}
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/css-prefers-color-scheme/test/_browser.mjs b/plugins/css-prefers-color-scheme/test/_browser.mjs
@@ -72,11 +72,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -160,7 +162,7 @@ if (!process.env.DEBUG) {
 				}
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/postcss-cascade-layers/test/_browser.mjs b/plugins/postcss-cascade-layers/test/_browser.mjs
@@ -97,11 +97,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -127,7 +129,7 @@ if (!process.env.DEBUG) {
 				}
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/postcss-focus-visible/test/_browser.mjs b/plugins/postcss-focus-visible/test/_browser.mjs
@@ -43,11 +43,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -98,7 +100,7 @@ if (!process.env.DEBUG) {
 				await page.evaluate(async () => window.checkElement('click', 'c', false));
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/postcss-focus-within/test/_browser.mjs b/plugins/postcss-focus-within/test/_browser.mjs
@@ -58,11 +58,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -162,7 +164,8 @@ if (!process.env.DEBUG) {
 				await page.evaluate(async () => window.checkElement('default', 'a-child-input', false));
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
+
 			await cleanup();
 		}
 	});

diff --git a/plugins/postcss-is-pseudo-class/test/_browser.mjs b/plugins/postcss-is-pseudo-class/test/_browser.mjs
@@ -41,11 +41,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -59,7 +61,7 @@ if (!process.env.DEBUG) {
 				throw new Error('Test failed, expected "window.runTest()" to return true');
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/postcss-light-dark-function/test/_browser.mjs b/plugins/postcss-light-dark-function/test/_browser.mjs
@@ -96,55 +96,60 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
-
-		const page = await browser.newPage();
-		page.on('pageerror', (msg) => {
-			throw msg;
-		});
-
-		for (const url of [
-			'wpt/light-dark-basic.html',
-			'wpt/light-dark-currentcolor-in-color.html',
-			'wpt/light-dark-inherited.html',
-		]) {
-			await page.goto('http://localhost:8080/' + url);
-
-			try {
-				await page.evaluate(async () => {
-					// eslint-disable-next-line no-undef
-					return await window.runTest();
-				});
-			} catch (err) {
-				errors.push(err);
+		let browser;
+
+		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
+			const page = await browser.newPage();
+			page.on('pageerror', (msg) => {
+				throw msg;
+			});
+
+			for (const url of [
+				'wpt/light-dark-basic.html',
+				'wpt/light-dark-currentcolor-in-color.html',
+				'wpt/light-dark-inherited.html',
+			]) {
+				await page.goto('http://localhost:8080/' + url);
+
+				try {
+					await page.evaluate(async () => {
+						// eslint-disable-next-line no-undef
+						return await window.runTest();
+					});
+				} catch (err) {
+					errors.push(err);
+				}
 			}
-		}
 
-		await page.emulateMediaFeatures([
-			{ name: 'prefers-color-scheme', value: 'dark' },
-		]);
-
-		for (const url of [
-			'wpt/light-dark-basic.html',
-			'wpt/light-dark-currentcolor-in-color.html',
-			'wpt/light-dark-inherited.html',
-		]) {
-			await page.goto('http://localhost:8080/' + url);
-
-			try {
-				await page.evaluate(async () => {
-					// eslint-disable-next-line no-undef
-					return await window.runTest();
-				});
-			} catch (err) {
-				errors.push(err);
+			await page.emulateMediaFeatures([
+				{ name: 'prefers-color-scheme', value: 'dark' },
+			]);
+
+			for (const url of [
+				'wpt/light-dark-basic.html',
+				'wpt/light-dark-currentcolor-in-color.html',
+				'wpt/light-dark-inherited.html',
+			]) {
+				await page.goto('http://localhost:8080/' + url);
+
+				try {
+					await page.evaluate(async () => {
+						// eslint-disable-next-line no-undef
+						return await window.runTest();
+					});
+				} catch (err) {
+					errors.push(err);
+				}
 			}
-		}
+		} finally {
+			await browser?.close();
 
-		await browser.close();
-		await cleanup();
+			await cleanup();
+		}
 
 		if (errors.length > 0) {
 			errors.forEach((err) => {

diff --git a/plugins/postcss-media-minmax/test/_browser.mjs b/plugins/postcss-media-minmax/test/_browser.mjs
@@ -83,11 +83,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 
 			await page.setViewport({
@@ -113,7 +115,7 @@ if (!process.env.DEBUG) {
 				}
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}

diff --git a/plugins/postcss-nesting/test/_browser.mjs b/plugins/postcss-nesting/test/_browser.mjs
@@ -89,11 +89,13 @@ if (!process.env.DEBUG) {
 	test('browser', { skip: process.env.GITHUB_ACTIONS && !process.env.BROWSER_TESTS }, async () => {
 		const cleanup = startServers();
 
-		const browser = await puppeteer.launch({
-			headless: 'new',
-		});
+		let browser;
 
 		try {
+			browser = await puppeteer.launch({
+				headless: 'new',
+			});
+
 			const page = await browser.newPage();
 			page.on('pageerror', (msg) => {
 				throw msg;
@@ -115,7 +117,7 @@ if (!process.env.DEBUG) {
 				}
 			}
 		} finally {
-			await browser.close();
+			await browser?.close();
 
 			await cleanup();
 		}