From 7c33e14813bbb31a9df6f9f1fffcb95f48ac742a Mon Sep 17 00:00:00 2001
From: Michel Ruffieux <michel.ruffieux@jobcloud.ch>
Date: Sat, 25 Sep 2021 12:00:03 +0200
Subject: [PATCH] chore(git-init): update default master branch to main

---
 libs/vscode/tasks/src/lib/nx-task-commands.ts |  2 +-
 nx.json                                       |  2 +-
 package-scripts.js                            | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/vscode/tasks/src/lib/nx-task-commands.ts b/libs/vscode/tasks/src/lib/nx-task-commands.ts
index 282ca59828..93eabd59ce 100644
--- a/libs/vscode/tasks/src/lib/nx-task-commands.ts
+++ b/libs/vscode/tasks/src/lib/nx-task-commands.ts
@@ -76,7 +76,7 @@ const AFFECTED_OPTIONS: Option[] = [
   {
     name: 'base',
     type: OptionType.String,
-    description: 'Base of the current branch (usually master)',
+    description: 'Base of the current branch (usually main)',
   },
   {
     name: 'head',
diff --git a/nx.json b/nx.json
index 256382192a..276a0e64cf 100644
--- a/nx.json
+++ b/nx.json
@@ -6,7 +6,7 @@
     ".eslintrc.json": "*"
   },
   "affected": {
-    "defaultBase": "master"
+    "defaultBase": "main"
   },
   "npmScope": "nx-console",
   "tasksRunnerOptions": {
diff --git a/package-scripts.js b/package-scripts.js
index 9b93712e72..cefcf87950 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -3,8 +3,8 @@ const { join } = require('path');
 
 function affected(affectedCommand) {
   return {
-    'origin-master': `nx affected:${affectedCommand} --base=origin/master --parallel --silent --ci`,
-    'upstream-master': `nx affected:${affectedCommand} --base=upstream/master --parallel --silent --ci`,
+    'origin-main': `nx affected:${affectedCommand} --base=origin/main --parallel --silent --ci`,
+    'upstream-main': `nx affected:${affectedCommand} --base=upstream/main --parallel --silent --ci`,
   };
 }
 
@@ -52,14 +52,14 @@ module.exports = {
       ),
     },
     format: {
-      default: 'nx format:write --base=upstream/master',
+      default: 'nx format:write --base=upstream/main',
       and: {
         lint: {
           check: nps.concurrent.nps('format.check', 'lint'),
         },
       },
-      write: 'nx format:write --base=upstream/master',
-      check: 'nx format:check --base=upstream/master',
+      write: 'nx format:write --base=upstream/main',
+      check: 'nx format:check --base=upstream/main',
     },
     storybook: {
       default: 'nx run vscode-ui-feature-task-execution-form:storybook',