Skip to content

Commit 20e8bf2

Browse files
authored
Merge pull request #6 from secure-web-apps/feature/update-angular
Update Angular, Angular CLI
2 parents 7b462e5 + eefcb93 commit 20e8bf2

48 files changed

Lines changed: 6821 additions & 35831 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This repository hosts the source code for our .NET User Group Switzerland tour.
3030

3131
[ASP.NET Core/Angular](https://github.com/damienbod/bff-aspnetcore-angular)
3232

33-
![BFF production](https://github.com/secure-web-apps/EndToEndSecurityWeb/blob/main/images/bff-arch-production_01.png)
33+
![BFF production](https://github.com/secure-web-apps/EndToEndSecurityWeb/blob/main/images/bff-arch-production_01.drawio.png)
3434

3535
## Agenda
3636

@@ -58,16 +58,19 @@ This repository hosts the source code for our .NET User Group Switzerland tour.
5858
- authorization
5959
- data requirements
6060

61-
## Angular nx Updates
61+
## Angular CLI Updates
6262

6363
```cmd
64-
nx migrate latest
64+
npm install -g @angular/cli latest
6565
66-
nx migrate --run-migrations=migrations.json
66+
ng update
67+
68+
ng update @angular/cli @angular/core
6769
```
6870

6971
## History
7072

73+
- 2025-10-31 Updated to Angular CLI and Angular 20.3.0, using vite in dev
7174
- 2025-10-31 Updated packages, added terraform, sonar SCA, SAST, improve pipelines
7275
- 2025-08-30 Updated packages, Angular 20
7376
- 2025-01-01 .NET 9, Angular 19
43.4 KB
Loading

images/bff-arch-cache_02.png

-48 KB
Binary file not shown.
38.2 KB
Loading

images/bff-arch-development_01.png

-37.4 KB
Binary file not shown.
31.7 KB
Loading

images/bff-arch-production_01.png

-34.8 KB
Binary file not shown.

server/Pages/_Host.cshtml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,8 @@
2929
if (hostEnvironment.IsDevelopment())
3030
{
3131
// do nothing in development, Angular > 18.1.0 adds the nonce automatically
32-
}
33-
else
34-
{
35-
// Angular release build does not add any nonce to the scripts, so we need to add it manually
36-
var nonceScript = $"<script nonce=\"{nonce}\" ";
37-
source = source.Replace("<script ", nonceScript);
32+
var viteScriptToUpdate = """<script type="module" src="/@vite/client"></script>""";
33+
source = source.Replace(viteScriptToUpdate, $"""<script type="module" src="/@vite/client" nonce="{nonce}"></script>""");
3834
}
3935

4036
// link rel="stylesheet"

server/appsettings.Development.json

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"DetailedErrors": true,
32
"Logging": {
43
"LogLevel": {
54
"Default": "Information",
@@ -16,6 +15,36 @@
1615
"Path": "assets/{**catch-all}"
1716
}
1817
},
18+
"angularfsdev": {
19+
"ClusterId": "cluster1",
20+
"Match": {
21+
"Path": "@fs/{**catch-all}"
22+
}
23+
},
24+
"angularngdev": {
25+
"ClusterId": "cluster1",
26+
"Match": {
27+
"Path": "@ng/{**catch-all}"
28+
}
29+
},
30+
"vitedev": {
31+
"ClusterId": "cluster1",
32+
"Match": {
33+
"Path": "@vite/{**catch-all}"
34+
}
35+
},
36+
"wssvite": {
37+
"ClusterId": "cluster1",
38+
"Match": {
39+
"Path": "/",
40+
"QueryParameters": [
41+
{
42+
"Name": "token",
43+
"Mode": "Exists"
44+
}
45+
]
46+
}
47+
},
1948
"routealljs": {
2049
"ClusterId": "cluster1",
2150
"Match": {
@@ -34,12 +63,6 @@
3463
"Path": "/src_{nomatterwhat}_ts.js"
3564
}
3665
},
37-
"signalr": {
38-
"ClusterId": "cluster1",
39-
"Match": {
40-
"Path": "/ng-cli-ws"
41-
}
42-
},
4366
"webpacknodesrcmap": {
4467
"ClusterId": "cluster1",
4568
"Match": {

ui/.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Editor configuration, see https://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.ts]
12+
quote_type = single
13+
ij_typescript_use_double_quotes = false
14+
15+
[*.md]
16+
max_line_length = off
17+
trim_trailing_whitespace = false

0 commit comments

Comments
 (0)