Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into test-stencil
Browse files Browse the repository at this point in the history
# Conflicts:
#	showcases/e2e/default.ts
#	showcases/e2e/header/header-a11y.spec.ts
#	showcases/e2e/home/showcase-home.spec.ts
  • Loading branch information
nmerget committed Sep 19, 2024
2 parents 331a799 + 78d2d0d commit eada3eb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion output/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@playwright/experimental-ct-vue": "1.47.1",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue": "^5.1.4",
"replace-in-file": "^8.1.0",
"tsx": "^4.19.1",
"typescript": "^5.4.5",
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion showcases/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const config: PlaywrightTestConfig = {
'{snapshotDir}/{testFileDir}/showcase/{projectName}/{arg}/{testName}{ext}',
snapshotDir: './../__snapshots__',
expect: {
timeout: 10_000
timeout: 30_000
},
/* Run tests in files in parallel */
fullyParallel: true,
Expand Down
2 changes: 1 addition & 1 deletion showcases/vue-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"vue-router": "4.4.5"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue": "^5.1.4",
"cross-env": "^7.0.3",
"typescript": "^5.4.5",
"vite": "^5.4.6",
Expand Down

0 comments on commit eada3eb

Please sign in to comment.