Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Fix playwright issues on main #22999

Merged
merged 3 commits into from
Jun 9, 2023
Merged

Build: Fix playwright issues on main #22999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40e1e88
Merge pull request #22992 from storybookjs/shilman/upgrade-playwright
ndelangen Jun 9, 2023
d09dda9
Merge pull request #22998 from storybookjs/norbert/playwright-fix
ndelangen Jun 9, 2023
b9bc611
Merge pull request #22996 from storybookjs/norbert/upgrade-addon-bench
ndelangen Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
Expand Down
8 changes: 4 additions & 4 deletions code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,14 @@
"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",
"esbuild": "^0.17.0",
"eslint": "^8.28.0",
"playwright": "1.32.3",
"playwright": "1.35.0",
"playwright-core": "1.35.0",
"serialize-javascript": "^3.1.0"
},
"dependencies": {
Expand All @@ -99,7 +100,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:*",
Expand Down Expand Up @@ -245,7 +246,6 @@
"lodash": "^4.17.21",
"node-gyp": "^8.4.0",
"nx": "^15.4.5",
"playwright": "1.32.3",
"prettier": "2.8.0",
"process": "^0.11.10",
"raf": "^3.4.1",
Expand Down
33 changes: 16 additions & 17 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:*"
Expand Down Expand Up @@ -6923,7 +6923,6 @@ __metadata:
lodash: ^4.17.21
node-gyp: ^8.4.0
nx: ^15.4.5
playwright: 1.32.3
prettier: 2.8.0
process: ^0.11.10
raf: ^3.4.1
Expand Down Expand Up @@ -24527,23 +24526,23 @@ __metadata:
languageName: node
linkType: hard

"playwright-core@npm:1.32.3":
version: 1.32.3
resolution: "playwright-core@npm:1.32.3"
"playwright-core@npm:1.35.0":
version: 1.35.0
resolution: "playwright-core@npm:1.35.0"
bin:
playwright: cli.js
checksum: 8b94feb15084813607abac69ef3d4f78b345bcc89e322706e62c203b79e74096caf499ce4cd4103b1bfc853f17a9ff0573f636dc0ee88f56a5cb6ed18ce55f06
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"
"playwright@npm:1.35.0":
version: 1.35.0
resolution: "playwright@npm:1.35.0"
dependencies:
playwright-core: 1.32.3
playwright-core: 1.35.0
bin:
playwright: cli.js
checksum: 26a3a8897d1a41cd5d001859521ee44b3ac21618e638d3b2a58615672b2f325a6cdeb614dabc6b120999d8874f260c9786683644b13fe07476d4a3a47fcfff1f
checksum: efe6a7c74fff1fe30b952e3d80a6da42779579174ae4ced83e24ebd07d9388f0a43d5188106f08874e645128e27b020c0c8e118948d607328d37a38b20c57c19
languageName: node
linkType: hard

Expand Down
5 changes: 3 additions & 2 deletions scripts/utils/yarn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ 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: '^1.35.0',
'playwright-core': '^1.35.0',
'@playwright/test': '^1.35.0',
};
await writeJSON(packageJsonPath, packageJson, { spaces: 2 });
};
Expand Down