chore: flip to instead of for our root branch

Author: alharris-at

.circleci/config.base.yml

@@ -201,7 +201,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - e2e-testing
     jobs:
       - build:
@@ -231,7 +231,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - e2e-testing
                 - /tagged-release\/.*/
       - e2e-test:
@@ -245,7 +245,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - e2e-testing
                 - /tagged-release\/.*/
       - deploy:
@@ -258,7 +258,7 @@ workflows:
             branches:
               only:
                 - release
-                - master
+                - main
                 - /tagged-release\/.*/
                 - /tagged-release-without-e2e-tests\/.*/
       - done_with_node_e2e_tests:

.circleci/config.yml

@@ -378,7 +378,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - e2e-testing
     jobs:
       - build:
@@ -409,7 +409,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
                 - e2e-testing
                 - /tagged-release\/.*/
       - deploy:
@@ -422,7 +422,7 @@ workflows:
             branches:
               only:
                 - release
-                - master
+                - main
                 - /tagged-release\/.*/
                 - /tagged-release-without-e2e-tests\/.*/
       - done_with_node_e2e_tests:
@@ -461,7 +461,7 @@ workflows:
           filters: &ref_8
             branches:
               only:
-                - master
+                - main
                 - e2e-testing
                 - /tagged-release\/.*/
       - add-codegen-android-e2e-test:

.github/ISSUE_TEMPLATE/1.bug_report.yaml

@@ -20,7 +20,7 @@ body:
         required: true
       - label: I have [searched for duplicate or closed issues](https://github.com/aws-amplify/amplify-codegen/issues?q=is%3Aissue+).
         required: true
-      - label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md#bugs).
+      - label: I have read the guide for [submitting bug reports](https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md#bugs).
         required: true
       - label: I have done my best to include a minimal, self-contained set of instructions for consistently reproducing the issue.
         required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Please make sure to read the Pull Request Guidelines:
-https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md#pull-requests
+https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md#pull-requests
 -->
 
 
@@ -25,7 +25,7 @@ the requirements below.
 
 - [ ] PR description included
 - [ ] `yarn test` passes
-- [ ] Tests are [changed or added](https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md#tests)
+- [ ] Tests are [changed or added](https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md#tests)
 - [ ] Relevant documentation is changed or added (and PR referenced)
 - [ ] Breaking changes to existing customers are released behind a feature flag or major version update
 - [ ] Changes are tested using sample applications for all relevant platforms (iOS/android/flutter/Javascript) that use the feature added/modified

CONTRIBUTING.md

@@ -74,7 +74,7 @@ Pull requests are welcome!
 
 You should open an issue to discuss your pull request, unless it's a trivial change. It's best to ensure that your proposed change would be accepted so that you don't waste your own time. If you would like to implement support for a significant feature that is not yet available, please talk to us beforehand to avoid any duplication of effort.
 
-Pull requests should generally be opened against **master**.
+Pull requests should generally be opened against **main**.
 
 Don't include any build files i.e. `dist/`, `lib/`. These will be built upon publish to npm and when a release is created on GitHub.
 

Readme.md

@@ -7,7 +7,7 @@
     <img src="https://img.shields.io/discord/308323056592486420?logo=discord"" alt="Discord Chat" />  
   </a>
   <a href="https://circleci.com/gh/aws-amplify/amplify-codegen">
-    <img src="https://img.shields.io/circleci/project/github/aws-amplify/amplify-codegen/master.svg" alt="build:started">
+    <img src="https://img.shields.io/circleci/project/github/aws-amplify/amplify-codegen/main.svg" alt="build:started">
   </a>
 </p>
 
@@ -53,4 +53,4 @@ Errors sometimes occur when a different version of `amplify-cli-core` is install
 
 ## Contributing
 
-See the contribution guideline. https://github.com/aws-amplify/amplify-codegen/blob/master/CONTRIBUTING.md
+See the contribution guideline. https://github.com/aws-amplify/amplify-codegen/blob/main/CONTRIBUTING.md

package.json

@@ -3,18 +3,18 @@
   "version": "0.1.0",
   "description": "amplify-codegen",
   "scripts": {
-    "test-changed": "lerna run test --since master",
+    "test-changed": "lerna run test --since main",
     "test": "lerna run test",
     "test-ci": "lerna run test --concurrency 1 -- --ci -i",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --quiet",
     "lint-fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "clean": "lerna run clean && lerna exec yarn rimraf tsconfig.tsbuildinfo && lerna clean --yes && yarn rimraf node_modules",
     "build": "lerna run build",
     "production-build": "yarn --ignore-engines && lerna run build --concurrency 3 --stream",
-    "publish:master": "lerna publish --canary --exact --force-publish --preid=dev --dist-tag=dev --include-merged-tags --conventional-prerelease --no-verify-access --yes",
+    "publish:main": "lerna publish --canary --exact --force-publish --preid=dev --dist-tag=dev --include-merged-tags --conventional-prerelease --no-verify-access --yes",
     "publish:release": "lerna publish --exact --conventional-commits --message 'chore(release): Publish [ci skip]' --no-verify-access --yes",
     "publish:tag": "lerna publish --exact --dist-tag=$NPM_TAG --preid=$NPM_TAG --conventional-commits --conventional-prerelease --message 'chore(release): Publish tagged release $NPM_TAG [ci skip]' --no-verify-access --yes",
-    "postpublish:release": "git fetch . release:master && git push origin master",
+    "postpublish:release": "git fetch . release:main && git push origin main",
     "yarn-use-bash": "yarn config set script-shell /bin/bash",
     "verdaccio-start": "yarn yarn-use-bash && source .circleci/local_publish_helpers.sh && startLocalRegistry \"$(pwd)/.circleci/verdaccio.yaml\"",
     "verdaccio-clean": "rimraf ../verdaccio-cache",