Merge branch 'trunk' into add/logger-crash-event

packages/php-wasm/util/src/lib/index.ts

@@ -1,5 +1,6 @@
 import Semaphore from './semaphore';
 export { Semaphore };
+export { PhpWasmError } from './php-wasm-error';
 export type { SemaphoreOptions } from './semaphore';
 export { dirname, joinPaths, basename, normalizePath } from './paths';
 export { createSpawnHandler } from './create-spawn-handler';

packages/php-wasm/util/src/lib/php-wasm-error.ts

@@ -0,0 +1,8 @@
+export class PhpWasmError extends Error {
+	constructor(message: string, public userFriendlyMessage?: string) {
+		super(message);
+		if (!this.userFriendlyMessage) {
+			this.userFriendlyMessage = message;
+		}
+	}
+}

packages/php-wasm/web/src/lib/register-service-worker.ts

@@ -1,3 +1,4 @@
+import { PhpWasmError } from '@php-wasm/util';
 import type { WebPHPEndpoint } from './web-php-endpoint';
 import { responseTo } from '@php-wasm/web-service-worker';
 import { Remote } from 'comlink';
@@ -17,14 +18,17 @@ export async function registerServiceWorker<
 >(phpApi: Client, scope: string, scriptUrl: string) {
 	const sw = navigator.serviceWorker;
 	if (!sw) {
-		if (location.protocol === 'https:') {
-			throw new Error(
-				'Service workers are not supported in this browser.'
+		/**
+		 * Service workers may only run in secure contexts.
+		 * See https://w3c.github.io/webappsec-secure-contexts/
+		 */
+		if (window.isSecureContext) {
+			throw new PhpWasmError(
+				'Service workers are not supported in your browser.'
 			);
 		} else {
-			throw new Error(
-				'WordPress Playground requires service workers which are only supported ' +
-					'on HTTPS sites. This site does not use HTTPS, please retry on one that does. '
+			throw new PhpWasmError(
+				'WordPress Playground uses service workers and may only work on HTTPS and http://localhost/ sites, but the current site is neither.'
 			);
 		}
 	}

packages/playground/remote/remote.html

@@ -72,7 +72,12 @@
 
 				const div = document.createElement('div');
 				div.className = 'error-message';
-				div.innerText = 'Ooops! WordPress Playground had a hiccup!';
+				const userFriendlyMessage =
+					e?.userFriendlyMessage ||
+					'See the developer tools for error details.';
+				div.innerHTML =
+					'Ooops! WordPress Playground had a hiccup! <br/><br/> ' +
+					userFriendlyMessage;
 				document.body.append(div);
 
 				const button = document.createElement('button');

packages/playground/wordpress/public/wp-nightly/wp-includes/css/admin-bar-rtl.css

@@ -188,7 +188,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,
 #wpadminbar .shortlink-input {
 	line-height: 2;
-	height: 1.625rem;
+	height: 26px;
 	white-space: nowrap;
 	min-width: 140px;
 }
@@ -464,7 +464,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar #wp-admin-bar-user-info span {
 	background: none;
 	padding: 0;
-	height: 1.125rem;
+	height: 18px;
 }
 
 #wpadminbar #wp-admin-bar-user-info .display-name,

packages/playground/wordpress/public/wp-nightly/wp-includes/css/admin-bar.css

@@ -187,7 +187,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,
 #wpadminbar .shortlink-input {
 	line-height: 2;
-	height: 1.625rem;
+	height: 26px;
 	white-space: nowrap;
 	min-width: 140px;
 }
@@ -463,7 +463,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar #wp-admin-bar-user-info span {
 	background: none;
 	padding: 0;
-	height: 1.125rem;
+	height: 18px;
 }
 
 #wpadminbar #wp-admin-bar-user-info .display-name,

packages/playground/wordpress/src/wordpress/get-wordpress-module-details.ts

@@ -24,7 +24,7 @@ export function getWordPressModuleDetails(wpVersion: string = "6.4"): { size: nu
 		case 'nightly':
 			/** @ts-ignore */
 			return {
-				size: 5126888,
+				size: 5127434,
 				url: url_nightly,
 			};