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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match package.json dependencies with RN Core + prettier #1333

Merged
merged 4 commits into from
Aug 5, 2022

Conversation

Saadnajmi
Copy link
Collaborator

@Saadnajmi Saadnajmi commented Aug 5, 2022

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 馃憤
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 馃憤
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

Addresses #1326

It seems some of our dependencies got messed up during a merge. I went to RN Core's package.json files at root and repo-config and just straight copied the dependencies and rer-ran yarn install. This should fix / replace #1327 .

If we compare this branch against RN Core's 0.68-stable, we are now down from 2,500 files changed to ~840 :)

image

Changelog

[Internal] [Fixed] - Match package.json dependencies with RN Core at 0.68-stable

Test Plan

CI should pass.

@pull-bot
Copy link

pull-bot commented Aug 5, 2022

Warnings
鈿狅笍 馃敀 package.json - Changes were made to package.json. This will require a manual import by a Facebook employee.

Generated by 馃毇 dangerJS against 3972e22

@analysis-bot
Copy link

Platform Engine Arch Size (bytes) Diff
ios - universal n/a --

Base commit: 4899f8c
Branch: main

@Saadnajmi Saadnajmi marked this pull request as ready for review August 5, 2022 19:52
@Saadnajmi Saadnajmi requested review from a team as code owners August 5, 2022 19:52
@Saadnajmi Saadnajmi changed the title [Draft] Match package.json dependencies with RN Core at 0.68-stable Match package.json dependencies with RN Core + prettier Aug 5, 2022
@Saadnajmi Saadnajmi merged commit fdcec4d into microsoft:main Aug 5, 2022
@Saadnajmi Saadnajmi deleted the match-dependencies branch August 5, 2022 23:47
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Aug 7, 2022
Like ```yarn prettier --fix``` for JS code, we should also run ```yarn format``` for native code.
Ideally this would also run as CI job.

I did some quick tests, and the result seems identical to the one used in facebook/react-native

Note: We need to make sure to have the same repo-config which has been (partially) addressed in microsoft#1333
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Aug 7, 2022
Like ```yarn prettier --fix``` for JS code, we should also run ```yarn format``` for native code.
Ideally this would also run as CI job.
See also: https://reactnative.dev/contributing/how-to-contribute-code#development-workflow

I did some quick tests, and the result seems identical to the one used in facebook/react-native

Note: We need to make sure to have the same repo-config which has been (partially) addressed in microsoft#1333
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Aug 7, 2022
Like ```yarn prettier --fix``` for JS code, we should also run ```yarn format``` for native code.
Ideally this would also run as CI job.
See also: https://reactnative.dev/contributing/how-to-contribute-code#development-workflow

I did some quick tests, and the result seems identical to the one used in facebook/react-native

Note: We need to make sure to have the same repo-config which has been (partially) addressed in microsoft#1333
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Aug 7, 2022
Like ```yarn prettier --fix``` for JS code, we should also run ```yarn format``` for native code.
Ideally this would also run as CI job.
See also: https://reactnative.dev/contributing/how-to-contribute-code#development-workflow

I did some quick tests, and the result seems identical to the one used in facebook/react-native

Note: We need to make sure to have the same repo-config which has been (partially) addressed in microsoft#1333
christophpurrer added a commit to christophpurrer/react-native-macos that referenced this pull request Aug 7, 2022
Like ```yarn prettier --fix``` for JS code, we should also run ```yarn format``` for native code.
Ideally this would also run as CI job.
See also: https://reactnative.dev/contributing/how-to-contribute-code#development-workflow

I did some quick tests, and the result seems identical to the one used in facebook/react-native

Note: We need to make sure to have the same repo-config which has been (partially) addressed in microsoft#1333
shwanton pushed a commit to shwanton/react-native-macos that referenced this pull request Feb 13, 2023
* update package.json files and yarn lock

* yarn prettier --fix

* Fix remaining yarn lint issues

* Fix integration CI
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.

None yet

5 participants