fix: resolve merge conflict

This commit is contained in:
taroj1205
2025-05-16 18:15:12 +12:00
23 changed files with 2365 additions and 2387 deletions

View File

@@ -11,7 +11,10 @@
"astro": "astro",
"lint": "biome lint ./src",
"format": "biome format ./src",
"prepare": "husky"
"prepare": "husky",
"test": "npx vitest run",
"test:coverage": "npx vitest --coverage",
"test:playwright": "npx playwright test"
},
"dependencies": {
"@astrojs/check": "^0.9.4",
@@ -42,8 +45,17 @@
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@playwright/test": "^1.52.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/user-event": "^14.6.1",
"@types/jsdom": "^21.1.7",
"@types/node": "^22.15.18",
"@vitest/coverage-istanbul": "^3.1.3",
"husky": "^9.1.7",
"jsdom": "^26.1.0",
"lint-staged": "^15.2.7",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.1.3",
"wrangler": "^3.94.0"
},
"lint-staged": {