From d95b6f40a44d6fa73e9be542043c8d23928524c4 Mon Sep 17 00:00:00 2001
From: Playwright Service <89237858+playwrightmachine@users.noreply.github.com>
Date: Mon, 5 Jun 2023 09:51:39 -0700
Subject: [PATCH] feat(webkit): roll to r1860 (#23494)

Fixes https://github.com/microsoft/playwright/issues/20489
---
 packages/playwright-core/browsers.json             |  2 +-
 .../playwright-core/src/server/registry/index.ts   | 14 ++++++++++++++
 packages/playwright-core/src/utils/hostPlatform.ts |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json
index 10bf3dda95..2be9df36c4 100644
--- a/packages/playwright-core/browsers.json
+++ b/packages/playwright-core/browsers.json
@@ -33,7 +33,7 @@
     },
     {
       "name": "webkit",
-      "revision": "1859",
+      "revision": "1860",
       "installByDefault": true,
       "revisionOverrides": {
         "mac10.14": "1446",
diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts
index 0d0ea0f064..18f2992bd9 100644
--- a/packages/playwright-core/src/server/registry/index.ts
+++ b/packages/playwright-core/src/server/registry/index.ts
@@ -93,6 +93,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
     'mac12': 'builds/chromium/%s/chromium-mac.zip',
     'mac12-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
+    'mac13': 'builds/chromium/%s/chromium-mac.zip',
+    'mac13-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
     'win64': 'builds/chromium/%s/chromium-win64.zip',
   },
   'chromium-tip-of-tree': {
@@ -114,6 +116,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
     'mac12': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
     'mac12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
+    'mac13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
+    'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
     'win64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-win64.zip',
   },
   'chromium-with-symbols': {
@@ -135,6 +139,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip',
     'mac12': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
     'mac12-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip',
+    'mac13': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
+    'mac13-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip',
     'win64': 'builds/chromium/%s/chromium-with-symbols-win64.zip',
   },
   'firefox': {
@@ -156,6 +162,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/firefox/%s/firefox-mac-11-arm64.zip',
     'mac12': 'builds/firefox/%s/firefox-mac-11.zip',
     'mac12-arm64': 'builds/firefox/%s/firefox-mac-11-arm64.zip',
+    'mac13': 'builds/firefox/%s/firefox-mac-11.zip',
+    'mac13-arm64': 'builds/firefox/%s/firefox-mac-11-arm64.zip',
     'win64': 'builds/firefox/%s/firefox-win64.zip',
   },
   'firefox-beta': {
@@ -177,6 +185,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
     'mac12': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
     'mac12-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
+    'mac13': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
+    'mac13-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
     'win64': 'builds/firefox-beta/%s/firefox-beta-win64.zip',
   },
   'webkit': {
@@ -198,6 +208,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/webkit/%s/webkit-mac-11-arm64.zip',
     'mac12': 'builds/webkit/%s/webkit-mac-12.zip',
     'mac12-arm64': 'builds/webkit/%s/webkit-mac-12-arm64.zip',
+    'mac13': 'builds/webkit/%s/webkit-mac-13.zip',
+    'mac13-arm64': 'builds/webkit/%s/webkit-mac-13-arm64.zip',
     'win64': 'builds/webkit/%s/webkit-win64.zip',
   },
   'ffmpeg': {
@@ -219,6 +231,8 @@ const DOWNLOAD_PATHS = {
     'mac11-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
     'mac12': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
     'mac12-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
+    'mac13': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
+    'mac13-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
     'win64': 'builds/ffmpeg/%s/ffmpeg-win64.zip',
   },
   'android': {
diff --git a/packages/playwright-core/src/utils/hostPlatform.ts b/packages/playwright-core/src/utils/hostPlatform.ts
index 2bdb606c08..ac799f5cfa 100644
--- a/packages/playwright-core/src/utils/hostPlatform.ts
+++ b/packages/playwright-core/src/utils/hostPlatform.ts
@@ -44,7 +44,7 @@ export const hostPlatform = ((): HostPlatform => {
       macVersion = 'mac10.15';
     } else {
       // ver[0] >= 20
-      const LAST_STABLE_MAC_MAJOR_VERSION = 12;
+      const LAST_STABLE_MAC_MAJOR_VERSION = 13;
       // Best-effort support for MacOS beta versions.
       macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MAC_MAJOR_VERSION);
       // BigSur is the first version that might run on Apple Silicon.