From 3da976258c3c791d3e3b2db32f3b10a41f80e1bd Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Fri, 9 Jun 2023 09:26:48 +0200
Subject: [PATCH] Merge pull request #22992 from
 storybookjs/shilman/upgrade-playwright

Build: Upgrade playwright to 1.35.0
(cherry picked from commit 10e6a6791a2e2262c5063bcbee894babcb00ba56)
---
 .circleci/config.yml  |  2 +-
 code/package.json     |  4 ++--
 code/yarn.lock        | 21 +++++++++++++++------
 scripts/utils/yarn.ts |  3 +--
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d3354c453ca..42f40b70bfc2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,7 +43,7 @@ executors:
         default: 'small'
     working_directory: /tmp/storybook
     docker:
-      - image: mcr.microsoft.com/playwright:v1.32.3-focal
+      - image: mcr.microsoft.com/playwright:v1.35.0-focal
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
diff --git a/code/package.json b/code/package.json
index 8a75fcfe5b67..19168bfb83d1 100644
--- a/code/package.json
+++ b/code/package.json
@@ -78,7 +78,7 @@
     "defaults"
   ],
   "resolutions": {
-    "@playwright/test": "1.32.3",
+    "@playwright/test": "1.35.0",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/experimental-utils": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
@@ -99,7 +99,7 @@
     "@nrwl/cli": "^15.4.5",
     "@nrwl/nx-cloud": "^15.0.2",
     "@nrwl/workspace": "^15.4.5",
-    "@playwright/test": "1.32.3",
+    "@playwright/test": "^1.35.0",
     "@storybook/addon-a11y": "workspace:*",
     "@storybook/addon-actions": "workspace:*",
     "@storybook/addon-backgrounds": "workspace:*",
diff --git a/code/yarn.lock b/code/yarn.lock
index 25988accfbf2..4e48e332b44b 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -4593,19 +4593,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@playwright/test@npm:1.32.3":
-  version: 1.32.3
-  resolution: "@playwright/test@npm:1.32.3"
+"@playwright/test@npm:1.35.0":
+  version: 1.35.0
+  resolution: "@playwright/test@npm:1.35.0"
   dependencies:
     "@types/node": "*"
     fsevents: 2.3.2
-    playwright-core: 1.32.3
+    playwright-core: 1.35.0
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: d09e4135c868b4067f45b8c297d02b0d8ddb8298657c942a06c72f3d9a3236af94586718dc7590693dbb31ea4b8fcceeb8a1e8811072f2add7d952c5c9129df3
+  checksum: 77594d876632e9ce8a33851fed0a9ffe1034ca216811a3b5c3925c371eddb20ceb6848f3e9b10234a025dcf7be979cddcd0285ad627ad30afbc0cf246ab74c4d
   languageName: node
   linkType: hard
 
@@ -6777,7 +6777,7 @@ __metadata:
     "@nrwl/cli": ^15.4.5
     "@nrwl/nx-cloud": ^15.0.2
     "@nrwl/workspace": ^15.4.5
-    "@playwright/test": 1.32.3
+    "@playwright/test": ^1.35.0
     "@storybook/addon-a11y": "workspace:*"
     "@storybook/addon-actions": "workspace:*"
     "@storybook/addon-backgrounds": "workspace:*"
@@ -24536,6 +24536,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"playwright-core@npm:1.35.0":
+  version: 1.35.0
+  resolution: "playwright-core@npm:1.35.0"
+  bin:
+    playwright-core: cli.js
+  checksum: 157257f0950190903d75ff6af70258fe1b1c6bf44f144a063428a594c09b4631d4c151ff65e28e1d9fc13edd8bd51c4720a7d87fc755c2afba47f41919bf5875
+  languageName: node
+  linkType: hard
+
 "playwright@npm:1.32.3":
   version: 1.32.3
   resolution: "playwright@npm:1.32.3"
diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts
index 03b8f4198c31..b572813ca086 100644
--- a/scripts/utils/yarn.ts
+++ b/scripts/utils/yarn.ts
@@ -24,8 +24,7 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => {
     ...storybookVersions,
     'enhanced-resolve': '~5.10.0', // TODO, remove this
     // this is for our CI test, ensure we use the same version as docker image, it should match version specified in `./code/package.json` and `.circleci/config.yml`
-    '@playwright/test': '1.32.3',
-    playwright: '1.32.3',
+    '@playwright/test': '^1.35.0',
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 };