chore(git-init): update default master branch to main

nrwl · Sep 25, 2021 · 7c33e14 · 7c33e14
1 parent 8460c2e
commit 7c33e14
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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',