Skip to content

Commit c56fb80

Browse files
Merge pull request #10961 from isaac2004/5431-work
Updated Angular from 7.2.5 to 8.0 using ng update #5431
2 parents 8a7508d + 5f5ba7a commit c56fb80

17 files changed

+1746
-1975
lines changed

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

+6-19
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
"main": "src/main.ts",
2121
"polyfills": "src/polyfills.ts",
2222
"tsConfig": "src/tsconfig.app.json",
23-
"assets": [
24-
"src/assets"
25-
],
23+
"assets": ["src/assets"],
2624
"styles": [
2725
"node_modules/bootstrap/dist/css/bootstrap.min.css",
2826
"src/styles.css"
@@ -73,25 +71,16 @@
7371
"polyfills": "src/polyfills.ts",
7472
"tsConfig": "src/tsconfig.spec.json",
7573
"karmaConfig": "src/karma.conf.js",
76-
"styles": [
77-
"styles.css"
78-
],
74+
"styles": ["styles.css"],
7975
"scripts": [],
80-
"assets": [
81-
"src/assets"
82-
]
76+
"assets": ["src/assets"]
8377
}
8478
},
8579
"lint": {
8680
"builder": "@angular-devkit/build-angular:tslint",
8781
"options": {
88-
"tsConfig": [
89-
"src/tsconfig.app.json",
90-
"src/tsconfig.spec.json"
91-
],
92-
"exclude": [
93-
"**/node_modules/**"
94-
]
82+
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
83+
"exclude": ["**/node_modules/**"]
9584
}
9685
},
9786
"server": {
@@ -137,9 +126,7 @@
137126
"builder": "@angular-devkit/build-angular:tslint",
138127
"options": {
139128
"tsConfig": "e2e/tsconfig.e2e.json",
140-
"exclude": [
141-
"**/node_modules/**"
142-
]
129+
"exclude": ["**/node_modules/**"]
143130
}
144131
}
145132
}
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
// Protractor configuration file, see link for more information
22
// https://github.com/angular/protractor/blob/master/lib/config.ts
33

4-
const { SpecReporter } = require('jasmine-spec-reporter');
4+
const { SpecReporter } = require("jasmine-spec-reporter");
55

66
exports.config = {
77
allScriptsTimeout: 11000,
8-
specs: [
9-
'./src/**/*.e2e-spec.ts'
10-
],
8+
specs: ["./src/**/*.e2e-spec.ts"],
119
capabilities: {
12-
'browserName': 'chrome'
10+
browserName: "chrome"
1311
},
1412
directConnect: true,
15-
baseUrl: 'http://localhost:4200/',
16-
framework: 'jasmine',
13+
baseUrl: "http://localhost:4200/",
14+
framework: "jasmine",
1715
jasmineNodeOpts: {
1816
showColors: true,
1917
defaultTimeoutInterval: 30000,
2018
print: function() {}
2119
},
2220
onPrepare() {
23-
require('ts-node').register({
24-
project: require('path').join(__dirname, './tsconfig.e2e.json')
21+
require("ts-node").register({
22+
project: require("path").join(__dirname, "./tsconfig.e2e.json")
2523
});
26-
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
24+
jasmine
25+
.getEnv()
26+
.addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
2727
}
2828
};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"node"
1111
]
1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)