Merge pull request #21241 from storybookjs/norbert/upgrade-playwright

Build: upgrade playwright & re-enable bench
storybookjs · Feb 24, 2023 · 615d673 · 615d673
2 parents 1a912b3 + 319a9ef
commit 615d673
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 32 deletions.
diff --git 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.30.0-focal
+      - image: mcr.microsoft.com/playwright:v1.31.1-focal
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -150,7 +150,7 @@ jobs:
             - .verdaccio-cache
   cra-bench:
     executor:
-      class: medium
+      class: large
       name: sb_playwright
     working_directory: /tmp/storybook
     steps:
@@ -542,9 +542,9 @@ workflows:
       - coverage:
           requires:
             - unit-tests
-      # - cra-bench:
-      #     requires:
-      #       - build
+      - cra-bench:
+          requires:
+            - build
       - react-vite-bench:
           requires:
             - build
@@ -592,9 +592,9 @@ workflows:
       - coverage:
           requires:
             - unit-tests
-      # - cra-bench:
-      #     requires:
-      #       - build
+      - cra-bench:
+          requires:
+            - build
       - react-vite-bench:
           requires:
             - build

diff --git a/code/package.json b/code/package.json
@@ -78,13 +78,13 @@
     "defaults"
   ],
   "resolutions": {
-    "@playwright/test": "1.30.0",
+    "@playwright/test": "1.31.1",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/experimental-utils": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
     "esbuild": "^0.16.4",
     "eslint": "^8.28.0",
-    "playwright": "1.30.0",
+    "playwright": "1.31.1",
     "serialize-javascript": "^3.1.0"
   },
   "dependencies": {
@@ -99,7 +99,7 @@
     "@nrwl/cli": "^15.4.5",
     "@nrwl/nx-cloud": "^15.0.2",
     "@nrwl/workspace": "^15.4.5",
-    "@playwright/test": "1.30.0",
+    "@playwright/test": "1.31.1",
     "@storybook/addon-a11y": "workspace:*",
     "@storybook/addon-actions": "workspace:*",
     "@storybook/addon-backgrounds": "workspace:*",
@@ -247,7 +247,7 @@
     "lodash": "^4.17.21",
     "node-gyp": "^8.4.0",
     "nx": "^15.4.5",
-    "playwright": "1.30.0",
+    "playwright": "1.31.1",
     "prettier": "2.8.0",
     "process": "^0.11.10",
     "raf": "^3.4.1",

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -4734,15 +4734,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@playwright/test@npm:1.30.0":
-  version: 1.30.0
-  resolution: "@playwright/test@npm:1.30.0"
+"@playwright/test@npm:1.31.1":
+  version: 1.31.1
+  resolution: "@playwright/test@npm:1.31.1"
   dependencies:
     "@types/node": "*"
-    playwright-core: 1.30.0
+    fsevents: 2.3.2
+    playwright-core: 1.31.1
+  dependenciesMeta:
+    fsevents:
+      optional: true
   bin:
     playwright: cli.js
-  checksum: 4022492dacfd57d2d9a6a7ade7753660f9f47199d0a47b110b0ecf21f167fb9c5a017a9a1fdf89b97810545ac86620218cabd6f4717cd468af030c5bd9128059
+  checksum: db0a4666d0399d26ff563346749e6a8c1f5b16a16a361ec0daa3b4956ea4cd9f44e8e18a48d48492d37409fba411980b383cb2d19c2dfffa7b14b7a8b3fee983
   languageName: node
   linkType: hard
 
@@ -7013,7 +7017,7 @@ __metadata:
     "@nrwl/cli": ^15.4.5
     "@nrwl/nx-cloud": ^15.0.2
     "@nrwl/workspace": ^15.4.5
-    "@playwright/test": 1.30.0
+    "@playwright/test": 1.31.1
     "@storybook/addon-a11y": "workspace:*"
     "@storybook/addon-actions": "workspace:*"
     "@storybook/addon-backgrounds": "workspace:*"
@@ -7161,7 +7165,7 @@ __metadata:
     lodash: ^4.17.21
     node-gyp: ^8.4.0
     nx: ^15.4.5
-    playwright: 1.30.0
+    playwright: 1.31.1
     prettier: 2.8.0
     process: ^0.11.10
     raf: ^3.4.1
@@ -16234,7 +16238,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
+"fsevents@npm:2.3.2, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
   version: 2.3.2
   resolution: "fsevents@npm:2.3.2"
   dependencies:
@@ -16244,7 +16248,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
+"fsevents@patch:fsevents@2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
   resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
   dependencies:
@@ -24503,23 +24507,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.30.0":
-  version: 1.30.0
-  resolution: "playwright-core@npm:1.30.0"
+"playwright-core@npm:1.31.1":
+  version: 1.31.1
+  resolution: "playwright-core@npm:1.31.1"
   bin:
     playwright: cli.js
-  checksum: cad74ca8ff028f4e65336323f7eec54497e344810c2f2e9c1ffaf836dcc20eb15c073aae6c5e994eaf800b75ea0f0817ffb60ff7ecaadc59229df54779d5f429
+  checksum: 9df7cb50df49a61fc7146dfd5a8d08488a295fabdedb2e522678ba2f393149f8baaaeff189fb4efbc3c1849ee375c6be3cbe5adf379e816b5efd365954e26f6c
   languageName: node
   linkType: hard
 
-"playwright@npm:1.30.0":
-  version: 1.30.0
-  resolution: "playwright@npm:1.30.0"
+"playwright@npm:1.31.1":
+  version: 1.31.1
+  resolution: "playwright@npm:1.31.1"
   dependencies:
-    playwright-core: 1.30.0
+    playwright-core: 1.31.1
   bin:
     playwright: cli.js
-  checksum: 49bbae502f45cdc7d5977d073080b6eb1aa871a14fa1aab23a23f331bdbc95bcc5a0dac00c01c4589231a8bb3fd4b7c154bfc1a47d80ea82c6aeb155275760be
+  checksum: 786f581b768a7c76248f59ecb2fc5a9b9f85eca371a62afdcbc0298e5714434648dd86fc3860215ffb2719351558e9c194b0a437e162a8c8bf384c54477a250e
   languageName: node
   linkType: hard
 

diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts
@@ -24,8 +24,8 @@ 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.30.0',
-    playwright: '1.30.0',
+    '@playwright/test': '1.31.1',
+    playwright: '1.31.1',
   };
   await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
 };