Skip to content

Commit 2c7cd98

Browse files
committed
migrate to main branch
1 parent ff71c32 commit 2c7cd98

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

Diff for: .editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ indent_size = 2
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11+
[*.ts]
12+
quote_type = single
13+
1114
[*.md]
1215
max_line_length = off
1316
trim_trailing_whitespace = false

Diff for: .github/workflows/macos.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: 'MacOS Build'
33

44
# Controls when the action will run.
55
on:
6-
# Triggers the workflow on push or pull request events but only for the master branch
6+
# Triggers the workflow on push or pull request events but only for the main branch
77
push:
88
branches:
9-
- master
9+
- main
1010
pull_request:
1111
branches:
12-
- master
12+
- main
1313

1414
# Allows you to run this workflow manually from the Actions tab
1515
workflow_dispatch:

Diff for: .github/workflows/ubuntu.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: 'Linux Build'
33

44
# Controls when the action will run.
55
on:
6-
# Triggers the workflow on push or pull request events but only for the master branch
6+
# Triggers the workflow on push or pull request events but only for the main branch
77
push:
88
branches:
9-
- master
9+
- main
1010
pull_request:
1111
branches:
12-
- master
12+
- main
1313

1414
# Allows you to run this workflow manually from the Actions tab
1515
workflow_dispatch:

Diff for: .github/workflows/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: 'Windows Build'
33

44
# Controls when the action will run.
55
on:
6-
# Triggers the workflow on push or pull request events but only for the master branch
6+
# Triggers the workflow on push or pull request events but only for the main branch
77
push:
88
branches:
9-
- master
9+
- main
1010
pull_request:
1111
branches:
12-
- master
12+
- main
1313

1414
# Allows you to run this workflow manually from the Actions tab
1515
workflow_dispatch:

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ Please note that Hot reload is only available in Renderer process.
151151
- Angular 10 & Electron 9 : Branch [angular10](https://github.com/maximegris/angular-electron/tree/angular10)
152152
- Angular 11 & Electron 12 : Branch [angular11](https://github.com/maximegris/angular-electron/tree/angular11)
153153
- Angular 12 & Electron 16 : Branch [angular12](https://github.com/maximegris/angular-electron/tree/angular12)
154-
- Angular 13 & Electron 17 : (master)
154+
- Angular 13 & Electron 17 : (main)
155155

156156
[maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen
157157
[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
158-
[license]: https://github.com/maximegris/angular-electron/blob/master/LICENSE.md
158+
[license]: https://github.com/maximegris/angular-electron/blob/main/LICENSE.md
159159
[prs-badge]: https://img.shields.io/badge/PRs-welcome-red.svg
160160
[prs]: http://makeapullrequest.com
161161

Diff for: angular.json

+7-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
"schematics": {
1414
"@schematics/angular:application": {
1515
"strict": true
16+
},
17+
"@schematics/angular:component": {
18+
"style": "scss"
1619
}
1720
},
21+
"prefix": "app",
1822
"architect": {
1923
"build": {
2024
"builder": "@angular-builders/custom-webpack:browser",
@@ -139,7 +143,8 @@
139143
"karmaConfig": "src/karma.conf.js",
140144
"scripts": [],
141145
"styles": [
142-
"src/styles.scss"
146+
"src/favicon.ico",
147+
"src/assets"
143148
],
144149
"assets": [
145150
"src/assets"
@@ -176,14 +181,5 @@
176181
}
177182
}
178183
},
179-
"defaultProject": "angular-electron",
180-
"schematics": {
181-
"@schematics/angular:component": {
182-
"prefix": "app",
183-
"style": "scss"
184-
},
185-
"@schematics/angular:directive": {
186-
"prefix": "app"
187-
}
188-
}
184+
"defaultProject": "angular-electron"
189185
}

0 commit comments

Comments
 (0)