From 51369f93ba51931466eed24bcc843d7dfbd8b412 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 1/3] 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 c2970a005f..01b6841a98 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,
     isRequired: false,
-    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 e4f8931e79..591e217e5c 100644
--- a/nx.json
+++ b/nx.json
@@ -7,7 +7,7 @@
     ".eslintrc.json": "*"
   },
   "affected": {
-    "defaultBase": "master"
+    "defaultBase": "main"
   },
   "npmScope": "nx-console",
   "useDaemonProcess": true,
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',

From 38d6f830e6b140c9192aa359ffed9970ee813084 Mon Sep 17 00:00:00 2001
From: Jonathan Cammisuli <jon@cammisuli.ca>
Date: Fri, 14 Jan 2022 10:24:11 -0500
Subject: [PATCH 2/3] revert repo specific changes

---
 nx.json            | 13 +++++--------
 package-scripts.js | 10 +++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/nx.json b/nx.json
index 591e217e5c..22ff48bac1 100644
--- a/nx.json
+++ b/nx.json
@@ -1,16 +1,14 @@
 {
   "implicitDependencies": {
-    "package.json": {
-      "devDependencies": "*",
-      "dependencies": "*"
-    },
+    "angular.json": "*",
+    "package.json": "*",
+    "tsconfig.base.json": "*",
     ".eslintrc.json": "*"
   },
   "affected": {
-    "defaultBase": "main"
+    "defaultBase": "master"
   },
   "npmScope": "nx-console",
-  "useDaemonProcess": true,
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/nx-cloud",
@@ -24,8 +22,7 @@
         ],
         "accessToken": "YTg3Yzk1YWMtZTQ3MC00MTIwLTkyM2ItMjAyMGI0ZTJlZDc3fHJlYWQtd3JpdGU=",
         "canTrackAnalytics": false,
-        "showUsageWarnings": true,
-        "parallel": 1
+        "showUsageWarnings": true
       }
     }
   },
diff --git a/package-scripts.js b/package-scripts.js
index cefcf87950..9b93712e72 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -3,8 +3,8 @@ const { join } = require('path');
 
 function affected(affectedCommand) {
   return {
-    'origin-main': `nx affected:${affectedCommand} --base=origin/main --parallel --silent --ci`,
-    'upstream-main': `nx affected:${affectedCommand} --base=upstream/main --parallel --silent --ci`,
+    'origin-master': `nx affected:${affectedCommand} --base=origin/master --parallel --silent --ci`,
+    'upstream-master': `nx affected:${affectedCommand} --base=upstream/master --parallel --silent --ci`,
   };
 }
 
@@ -52,14 +52,14 @@ module.exports = {
       ),
     },
     format: {
-      default: 'nx format:write --base=upstream/main',
+      default: 'nx format:write --base=upstream/master',
       and: {
         lint: {
           check: nps.concurrent.nps('format.check', 'lint'),
         },
       },
-      write: 'nx format:write --base=upstream/main',
-      check: 'nx format:check --base=upstream/main',
+      write: 'nx format:write --base=upstream/master',
+      check: 'nx format:check --base=upstream/master',
     },
     storybook: {
       default: 'nx run vscode-ui-feature-task-execution-form:storybook',

From b2d3681fd965f98d8acbe75d67da12bf326157c0 Mon Sep 17 00:00:00 2001
From: Jonathan Cammisuli <jon@cammisuli.ca>
Date: Fri, 14 Jan 2022 10:25:35 -0500
Subject: [PATCH 3/3] reset to proper branch :sweat_smile:

---
 nx.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nx.json b/nx.json
index 22ff48bac1..e4f8931e79 100644
--- a/nx.json
+++ b/nx.json
@@ -1,14 +1,16 @@
 {
   "implicitDependencies": {
-    "angular.json": "*",
-    "package.json": "*",
-    "tsconfig.base.json": "*",
+    "package.json": {
+      "devDependencies": "*",
+      "dependencies": "*"
+    },
     ".eslintrc.json": "*"
   },
   "affected": {
     "defaultBase": "master"
   },
   "npmScope": "nx-console",
+  "useDaemonProcess": true,
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/nx-cloud",
@@ -22,7 +24,8 @@
         ],
         "accessToken": "YTg3Yzk1YWMtZTQ3MC00MTIwLTkyM2ItMjAyMGI0ZTJlZDc3fHJlYWQtd3JpdGU=",
         "canTrackAnalytics": false,
-        "showUsageWarnings": true
+        "showUsageWarnings": true,
+        "parallel": 1
       }
     }
   },