Skip to content

Commit a3d4e5f

Browse files
committed
Course updated to Angular 6
1 parent aa488e4 commit a3d4e5f

8 files changed

+6625
-4500
lines changed

.angular-cli.json

Lines changed: 0 additions & 91 deletions
This file was deleted.

angular.json

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular-security-course": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.ts",
17+
"tsConfig": "src/tsconfig.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico",
22+
"src/manifest.json"
23+
],
24+
"styles": [
25+
"src/styles.css"
26+
],
27+
"scripts": []
28+
},
29+
"configurations": {
30+
"production": {
31+
"optimization": true,
32+
"outputHashing": "all",
33+
"sourceMap": false,
34+
"extractCss": true,
35+
"namedChunks": false,
36+
"aot": true,
37+
"extractLicenses": true,
38+
"vendorChunk": false,
39+
"buildOptimizer": true,
40+
"serviceWorker": true,
41+
"ngswConfigPath": "src/ngsw-config.json",
42+
"fileReplacements": [
43+
{
44+
"replace": "src/environments/environment.ts",
45+
"with": "src/environments/environment.prod.ts"
46+
}
47+
]
48+
}
49+
}
50+
},
51+
"serve": {
52+
"builder": "@angular-devkit/build-angular:dev-server",
53+
"options": {
54+
"browserTarget": "angular-security-course:build"
55+
},
56+
"configurations": {
57+
"production": {
58+
"browserTarget": "angular-security-course:build:production"
59+
}
60+
}
61+
},
62+
"extract-i18n": {
63+
"builder": "@angular-devkit/build-angular:extract-i18n",
64+
"options": {
65+
"browserTarget": "angular-security-course:build"
66+
}
67+
},
68+
"test": {
69+
"builder": "@angular-devkit/build-angular:karma",
70+
"options": {
71+
"main": "src/test.ts",
72+
"karmaConfig": "./karma.conf.js",
73+
"polyfills": "src/polyfills.ts",
74+
"tsConfig": "src/tsconfig.spec.json",
75+
"scripts": [],
76+
"styles": [
77+
"src/styles.css"
78+
],
79+
"assets": [
80+
"src/assets",
81+
"src/favicon.ico",
82+
"src/manifest.json"
83+
]
84+
}
85+
},
86+
"lint": {
87+
"builder": "@angular-devkit/build-angular:tslint",
88+
"options": {
89+
"tsConfig": [
90+
"src/tsconfig.app.json",
91+
"src/tsconfig.spec.json"
92+
],
93+
"exclude": []
94+
}
95+
},
96+
"server": {
97+
"builder": "@angular-devkit/build-angular:server",
98+
"options": {
99+
"outputPath": "dist-server/",
100+
"main": "main.server.ts",
101+
"tsConfig": "tsconfig.server.json"
102+
}
103+
}
104+
}
105+
},
106+
"angular-security-course-e2e": {
107+
"root": "",
108+
"sourceRoot": "",
109+
"projectType": "application",
110+
"architect": {
111+
"e2e": {
112+
"builder": "@angular-devkit/build-angular:protractor",
113+
"options": {
114+
"protractorConfig": "./protractor.conf.js",
115+
"devServerTarget": "angular-security-course:serve"
116+
}
117+
},
118+
"lint": {
119+
"builder": "@angular-devkit/build-angular:tslint",
120+
"options": {
121+
"tsConfig": [
122+
"e2e/tsconfig.e2e.json"
123+
],
124+
"exclude": []
125+
}
126+
}
127+
}
128+
}
129+
},
130+
"defaultProject": "angular-security-course",
131+
"schematics": {
132+
"@schematics/angular:component": {
133+
"prefix": "",
134+
"styleext": "css"
135+
},
136+
"@schematics/angular:directive": {
137+
"prefix": ""
138+
}
139+
}
140+
}

karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
19+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2020
fixWebpackSourcePaths: true
2121
},
2222
angularCli: {

0 commit comments

Comments
 (0)