Skip to content

Conversation

@arredr2
Copy link

@arredr2 arredr2 commented Mar 12, 2025

Screenshot 2025-03-11 at 19 06 24

@vercel
Copy link

vercel bot commented Mar 12, 2025

@arredr2 is attempting to deploy a commit to the delv Team on Vercel.

A member of the Team first needs to authorize it.

Copy link
Member

@ryangoree ryangoree left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the contribution! Just need to update the lock files.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you ran npm install which added a second lock file. Please delete the package-lock.json and run yarn install to fix the yarn.lock.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ryangoree! Updated!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! But, it looks like it used a newer version of yarn which this repo hasn't been migrated to yet. I just locked the yarn version in a new commit to main.

Please rebase onto main then run yarn again to reconcile the yarn.lock changes. If there are any lingering config files from the newer yarn (e.g., .yarn/*), they should be deleted. The only change outside of your new asset and code should be the version updates for the vite patch upgrade.

Thanks again!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I think that did it now!

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I added .yarn/ to .gitignore to prevent these files from being tracked in the future. Let me know if you'd prefer I revert this change though.

# Manual changes might be lost - proceed with caution!

__metadata:
version: 8
Copy link
Member

@ryangoree ryangoree Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still the lock file version for the newer version of yarn. The changes to this file should be very minimal, only including the vite version bump + any upgrades to its dependencies.

  1. Reset this file to it's original state (undo all changes)
  2. Ensure yarn v1 is installed (you may need to run npm install --global yarn)
  3. Run yarn and ensure the comment at the top of this file still says yarn lockfile v1

*.sw?

.env
.env.yarn/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These need to be on separate lines to work.

Suggested change
.env.yarn/
.env
.yarn/

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