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.

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

[No QA] Update package.json name to fix conflict issues #4578

Merged
merged 2 commits into from
Aug 11, 2021

Conversation

Jag96
Copy link
Contributor

@Jag96 Jag96 commented Aug 11, 2021

cc @parasharrajat @Julesssss

Details

This PR updates the package.json/package-lock.json to include a change from #4408 in an attempt to fix the conflicts that come up when any other PR is merged. Since that PR base branch is not internal, it isn't easy for any internal engineer to update it to resolve the conflicts, resulting in a lot of back and forth.

When resolving the conflicts locally, it looks like the only two affected files are package.json/package-lock.json, which is why these are the only files updated here.

Fixed Issues

Related to #4408

Tests

Confirm you can run the app on all platforms

QA Steps

None

Tested On

  • Web
  • Mobile Web
  • Desktop
  • iOS
  • Android

@Jag96 Jag96 requested a review from roryabraham August 11, 2021 18:16
@Jag96 Jag96 requested a review from a team as a code owner August 11, 2021 18:16
@Jag96 Jag96 self-assigned this Aug 11, 2021
@MelvinBot MelvinBot requested review from luacmartins and removed request for a team August 11, 2021 18:16
@Jag96 Jag96 changed the title Update package.json name to fix conflict issues [No QA] Update package.json name to fix conflict issues Aug 11, 2021
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM

@luacmartins
Copy link
Contributor

Feel free to self-merge once tests pass.

@Jag96
Copy link
Contributor Author

Jag96 commented Aug 11, 2021

Tests passed! Merging

@Jag96 Jag96 merged commit 1adc252 into main Aug 11, 2021
@Jag96 Jag96 deleted the joe-update-package-json-name branch August 11, 2021 20:39
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by @Jag96 in version: 1.0.85-10 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @roryabraham in version: 1.0.86-11 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅

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.

4 participants