Use Workbox convention for skip waiting message

GoogleChromeLabs · Aug 23, 2021 · 3b044de · 3b044de
1 parent 64d5d2f
commit 3b044de
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/wp-includes/js/service-worker.js b/wp-includes/js/service-worker.js
@@ -16,7 +16,15 @@ wp.serviceWorker = workbox;
  * mechanism for clients to skip waiting if they want to.
  */
 self.addEventListener('message', function (event) {
-	if ('skipWaiting' === event.data.action) {
+	if (!event.data) {
+		return;
+	}
+	if (
+		// De facto standard used by Workbox.
+		event.data.type === 'SKIP_WAITING' ||
+		// Obsolete message sent in older versions of the plugin.
+		'skipWaiting' === event.data.action
+	) {
 		self.skipWaiting();
 	}
 });