Skip to content

Commit 4321f40

Browse files
Port #12879 to 3.1
1 parent 6317b34 commit 4321f40

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
"main": "src/main.ts",
2121
"polyfills": "src/polyfills.ts",
2222
"tsConfig": "src/tsconfig.app.json",
23-
"assets": ["src/assets"],
23+
"assets": [
24+
"src/assets"
25+
],
2426
"styles": [
2527
"node_modules/bootstrap/dist/css/bootstrap.min.css",
2628
"src/styles.css"
@@ -71,16 +73,25 @@
7173
"polyfills": "src/polyfills.ts",
7274
"tsConfig": "src/tsconfig.spec.json",
7375
"karmaConfig": "src/karma.conf.js",
74-
"styles": ["styles.css"],
76+
"styles": [
77+
"src/styles.css"
78+
],
7579
"scripts": [],
76-
"assets": ["src/assets"]
80+
"assets": [
81+
"src/assets"
82+
]
7783
}
7884
},
7985
"lint": {
8086
"builder": "@angular-devkit/build-angular:tslint",
8187
"options": {
82-
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
83-
"exclude": ["**/node_modules/**"]
88+
"tsConfig": [
89+
"src/tsconfig.app.json",
90+
"src/tsconfig.spec.json"
91+
],
92+
"exclude": [
93+
"**/node_modules/**"
94+
]
8495
}
8596
},
8697
"server": {
@@ -126,7 +137,9 @@
126137
"builder": "@angular-devkit/build-angular:tslint",
127138
"options": {
128139
"tsConfig": "e2e/tsconfig.e2e.json",
129-
"exclude": ["**/node_modules/**"]
140+
"exclude": [
141+
"**/node_modules/**"
142+
]
130143
}
131144
}
132145
}

src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,8 @@ protected async Task SpaTemplateImplAsync(
6666
using var lintResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npm run lint");
6767
Assert.True(0 == lintResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm run lint", Project, lintResult));
6868

69-
if (template == "react" || template == "reactredux")
70-
{
71-
using var testResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npm run test");
72-
Assert.True(0 == testResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm run test", Project, testResult));
73-
}
69+
using var testResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npm run test");
70+
Assert.True(0 == testResult.ExitCode, ErrorMessages.GetFailedProcessMessage("npm run test", Project, testResult));
7471

7572
using var publishResult = await Project.RunDotNetPublishAsync();
7673
Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, publishResult));

0 commit comments

Comments
 (0)