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

Some remaining instances of master to main #21982

Merged
merged 4 commits into from Jul 30, 2021

Conversation

@shubham9411
Copy link
Contributor

@shubham9411 shubham9411 commented Jul 28, 2021

Summary

  1. Some instances of master branch are still available in code and needed to be changed to main
  2. DefinitelyTyped/DefinitelyTyped does not have a main branch yet so changing it back to master
  3. ReactTraining/react-router does not have a main branch yet so changing it back to master
  4. facebook/fbjs does not have a main branch yet so changing it back to master

reference issue #21767 and PR #21768

Test Plan

No test is needed.

@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jul 28, 2021

Hi @shubham9411!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@fb.com. Thanks!

@sizebot
Copy link

@sizebot sizebot commented Jul 28, 2021

Comparing: 34308b5...f103c6d

Critical size changes

Includes critical production bundles, as well as any change greater than 2%:

Name +/- Base Current +/- gzip Base gzip Current gzip
oss-stable/react-dom/cjs/react-dom.production.min.js = 127.58 kB 127.58 kB = 40.72 kB 40.71 kB
oss-experimental/react-dom/cjs/react-dom.production.min.js = 130.40 kB 130.40 kB = 41.64 kB 41.64 kB
facebook-www/ReactDOM-prod.classic.js = 406.43 kB 406.43 kB = 75.24 kB 75.24 kB
facebook-www/ReactDOM-prod.modern.js = 394.79 kB 394.79 kB = 73.52 kB 73.52 kB
facebook-www/ReactDOMForked-prod.classic.js = 406.43 kB 406.43 kB = 75.25 kB 75.25 kB

Significant size changes

Includes any change greater than 0.2%:

(No significant changes)

Generated by 🚫 dangerJS against f103c6d

@facebook-github-bot
Copy link

@facebook-github-bot facebook-github-bot commented Jul 28, 2021

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@bvaughn
Copy link
Contributor

@bvaughn bvaughn commented Jul 29, 2021

Nice. Thanks!

@bvaughn
Copy link
Contributor

@bvaughn bvaughn commented Jul 29, 2021

Oops. CI is failing and saying that you need to run this script locally:

replace-fork

I'm not sure why this is, since you didn't touch reconciler code. Can you rebase on main to rule that out?

@shubham9411
Copy link
Contributor Author

@shubham9411 shubham9411 commented Jul 30, 2021

Hi @bvaughn, I rebased this PR with main and ran yarn replace-fork and it still changed the reconciler files.
I checked and found that CI is failing because of changes in fixtures/flight/config/webpack.config.js file. If i change this file it fails yarn linc --fix inside yarn replace-fork with this error:

Error: Failed to load config "react-app" to extend from.
Referenced from: /Users/x/y/z/react/fixtures/flight/package.json
...
...
messageTemplate: 'extend-config-missing',
  messageData: {
    configName: 'react-app',
    importerName: '/Users/x/y/z/react/fixtures/flight/package.json'
  }
}

I am confused should I change that file back or fix this first 😬

Edit: For now I have removed that file change.

@shubham9411 shubham9411 force-pushed the shubham9411:master-to-main-renaming branch from d019adc to f103c6d Jul 30, 2021
Copy link
Contributor

@bvaughn bvaughn left a comment

Oh, that's interesting. Good find though.

@bvaughn bvaughn merged commit 6f3fcbd into facebook:main Jul 30, 2021
34 checks passed
34 checks passed
@facebook-github-tools
Facebook CLA Check Contributor License Agreement is valid!
Details
ci/circleci: RELEASE_CHANNEL_stable_yarn_build Your tests passed on CircleCI!
Details
ci/circleci: RELEASE_CHANNEL_stable_yarn_test_dom_fixtures Your tests passed on CircleCI!
Details
ci/circleci: build_devtools_and_process_artifacts Your tests passed on CircleCI!
Details
ci/circleci: get_base_build Your tests passed on CircleCI!
Details
ci/circleci: process_artifacts_combined Your tests passed on CircleCI!
Details
ci/circleci: setup Your tests passed on CircleCI!
Details
ci/circleci: sizebot Your tests passed on CircleCI!
Details
ci/circleci: sync_reconciler_forks Your tests passed on CircleCI!
Details
ci/circleci: yarn_build Your tests passed on CircleCI!
Details
ci/circleci: yarn_build_combined Your tests passed on CircleCI!
Details
ci/circleci: yarn_flow Your tests passed on CircleCI!
Details
ci/circleci: yarn_lint Your tests passed on CircleCI!
Details
ci/circleci: yarn_lint_build Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=experimental --env=development Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=experimental --env=development --persistent Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=experimental --env=production Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=stable --env=development Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=stable --env=development --persistent Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=stable --env=production Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-classic --env=development --variant=false Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-classic --env=development --variant=true Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-classic --env=production --variant=false Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-classic --env=production --variant=true Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-modern --env=development --variant=false Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-modern --env=development --variant=true Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-modern --env=production --variant=false Your tests passed on CircleCI!
Details
ci/circleci: yarn_test--r=www-modern --env=production --variant=true Your tests passed on CircleCI!
Details
ci/circleci: yarn_test_build---project=devtools -r=experimental Your tests passed on CircleCI!
Details
ci/circleci: yarn_test_build--r=experimental --env=development Your tests passed on CircleCI!
Details
ci/circleci: yarn_test_build--r=experimental --env=production Your tests passed on CircleCI!
Details
ci/circleci: yarn_test_build--r=stable --env=development Your tests passed on CircleCI!
Details
ci/circleci: yarn_test_build--r=stable --env=production Your tests passed on CircleCI!
Details
@codesandbox
ci/codesandbox Building packages succeeded.
Details
@shubham9411 shubham9411 deleted the shubham9411:master-to-main-renaming branch Jul 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants