From 2c7cd9857e746175375d76c5819d4756d17f69ee Mon Sep 17 00:00:00 2001
From: Maxime GRIS <maxime.gris@gmail.com>
Date: Sun, 13 Mar 2022 14:09:05 +0100
Subject: [PATCH] migrate to main branch

---
 .editorconfig                 |  3 +++
 .github/workflows/macos.yml   |  6 +++---
 .github/workflows/ubuntu.yml  |  6 +++---
 .github/workflows/windows.yml |  6 +++---
 README.md                     |  4 ++--
 angular.json                  | 18 +++++++-----------
 6 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 6e87a003d..8cf633eb5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,9 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.ts]
+quote_type = single
+
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5c833c159..35c2a480a 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -3,13 +3,13 @@ name: 'MacOS Build'
 
 # Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
+  # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 68b28f95e..d0568eba5 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -3,13 +3,13 @@ name: 'Linux Build'
 
 # Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
+  # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 96101e65d..772f5a66c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,13 +3,13 @@ name: 'Windows Build'
 
 # Controls when the action will run.
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
+  # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/README.md b/README.md
index edfccc131..fb9c08f92 100644
--- a/README.md
+++ b/README.md
@@ -151,11 +151,11 @@ Please note that Hot reload is only available in Renderer process.
 - Angular 10 & Electron 9 : Branch [angular10](https://github.com/maximegris/angular-electron/tree/angular10)
 - Angular 11 & Electron 12 : Branch [angular11](https://github.com/maximegris/angular-electron/tree/angular11)
 - Angular 12 & Electron 16 : Branch [angular12](https://github.com/maximegris/angular-electron/tree/angular12)
-- Angular 13 & Electron 17 : (master)
+- Angular 13 & Electron 17 : (main)
 
 [maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen
 [license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
-[license]: https://github.com/maximegris/angular-electron/blob/master/LICENSE.md
+[license]: https://github.com/maximegris/angular-electron/blob/main/LICENSE.md
 [prs-badge]: https://img.shields.io/badge/PRs-welcome-red.svg
 [prs]: http://makeapullrequest.com
 
diff --git a/angular.json b/angular.json
index dcc4c1506..14f0c7007 100644
--- a/angular.json
+++ b/angular.json
@@ -13,8 +13,12 @@
       "schematics": {
         "@schematics/angular:application": {
           "strict": true
+        },
+        "@schematics/angular:component": {
+          "style": "scss"
         }
       },
+      "prefix": "app",
       "architect": {
         "build": {
           "builder": "@angular-builders/custom-webpack:browser",
@@ -139,7 +143,8 @@
             "karmaConfig": "src/karma.conf.js",
             "scripts": [],
             "styles": [
-              "src/styles.scss"
+              "src/favicon.ico",
+              "src/assets"
             ],
             "assets": [
               "src/assets"
@@ -176,14 +181,5 @@
       }
     }
   },
-  "defaultProject": "angular-electron",
-  "schematics": {
-    "@schematics/angular:component": {
-      "prefix": "app",
-      "style": "scss"
-    },
-    "@schematics/angular:directive": {
-      "prefix": "app"
-    }
-  }
+  "defaultProject": "angular-electron"
 }