Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Nov 23, 2025

Merged latest changes from main branch (commit b9a127a) into the vitest migration branch to incorporate recent updates including CI workflow improvements, Cloudflare SSR changes, and Angular 21 upgrade.

Conflict Resolution

Resolved 18 merge conflicts across configuration and test files by preserving vitest migration changes:

  • Configuration files: Kept vitest dependencies in package.json, vitest browser config in angular.json, and vitest types in tsconfig.spec.json
  • Test files: Maintained vitest imports and assertions in all .spec.ts files
  • CI workflow: Preserved Playwright browser setup and vitest test command

The merge brings in 52 commits from main while maintaining the complete vitest migration completed in this branch.


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Copilot AI and others added 2 commits November 22, 2025 16:42
…orkflow (#26)

* Initial plan

* chore(ci): allow pnpm install without frozen-lockfile in unit-tests workflow

Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: benhalverson <7907232+benhalverson@users.noreply.github.com>
# Conflicts:
#	.github/workflows/unit-tests.yml
#	.gitignore
#	angular.json
#	biome.json
#	package.json
#	pnpm-lock.yaml
#	src/app/add-product/add-product.component.spec.ts
#	src/app/auth.service.spec.ts
#	src/app/color-picker/color-picker.component.spec.ts
#	src/app/login/login.component.spec.ts
#	src/app/navbar/navbar.component.spec.ts
#	src/app/product-card/product-card.component.spec.ts
#	src/app/product-details/product-details.component.spec.ts
#	src/app/product.service.spec.ts
#	src/app/product/product.component.spec.ts
#	src/app/upload/upload.component.spec.ts
#	src/app/upload/upload.spec.ts
#	tsconfig.spec.json
Copilot AI changed the title [WIP] Switch to Vitest testing framework Merge main branch into vitest migration PR Nov 23, 2025
Copilot AI requested a review from benhalverson November 23, 2025 00:51
@benhalverson benhalverson marked this pull request as ready for review November 23, 2025 00:54
@benhalverson
Copy link
Owner

@copilot 👎🏻 I fixed it my self close this PR

Copy link
Contributor Author

Copilot AI commented Nov 23, 2025

@copilot 👎🏻 I fixed it my self close this PR

Understood. I don't have the ability to close PRs directly - you'll need to close this PR manually. Apologies that my merge approach wasn't what you needed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants