Skip to content

Commit c7743f3

Browse files
committed
Course updated to Angular 6
1 parent 338bd83 commit c7743f3

File tree

6 files changed

+2126
-1558
lines changed

6 files changed

+2126
-1558
lines changed

client/.angular-cli.json

-57
This file was deleted.

client/angular.json

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

client/package.json

+18-16
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,24 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^5.0.0",
16-
"@angular/common": "^5.0.0",
17-
"@angular/compiler": "^5.0.0",
18-
"@angular/core": "^5.0.0",
19-
"@angular/forms": "^5.0.0",
20-
"@angular/http": "^5.0.0",
21-
"@angular/platform-browser": "^5.0.0",
22-
"@angular/platform-browser-dynamic": "^5.0.0",
23-
"@angular/router": "^5.0.0",
15+
"@angular/animations": "6.0.0",
16+
"@angular/common": "6.0.0",
17+
"@angular/compiler": "6.0.0",
18+
"@angular/core": "6.0.0",
19+
"@angular/forms": "6.0.0",
20+
"@angular/http": "6.0.0",
21+
"@angular/platform-browser": "6.0.0",
22+
"@angular/platform-browser-dynamic": "6.0.0",
23+
"@angular/router": "6.0.0",
2424
"core-js": "^2.4.1",
25-
"rxjs": "^5.5.2",
26-
"zone.js": "^0.8.14"
25+
"rxjs": "6.1.0",
26+
"zone.js": "0.8.26",
27+
"rxjs-compat": "^6.0.0-rc.0"
2728
},
2829
"devDependencies": {
29-
"@angular/cli": "1.5.0",
30-
"@angular/compiler-cli": "^5.0.0",
31-
"@angular/language-service": "^5.0.0",
30+
"@angular/cli": "^6.0.0",
31+
"@angular/compiler-cli": "6.0.0",
32+
"@angular/language-service": "6.0.0",
3233
"@types/jasmine": "~2.5.53",
3334
"@types/jasminewd2": "~2.0.2",
3435
"@types/node": "~6.0.60",
@@ -44,6 +45,7 @@
4445
"protractor": "~5.1.2",
4546
"ts-node": "~3.2.0",
4647
"tslint": "~5.7.0",
47-
"typescript": "~2.4.2"
48+
"typescript": "~2.7.2",
49+
"@angular-devkit/build-angular": "~0.6.0"
4850
}
49-
}
51+
}

client/src/tsconfig.spec.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
]
1212
},
1313
"files": [
14-
"test.ts"
14+
"test.ts",
15+
"polyfills.ts"
1516
],
1617
"include": [
1718
"**/*.spec.ts",

client/tslint.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"curly": true,
1313
"eofline": true,
1414
"forin": true,
15-
"import-blacklist": [true, "rxjs"],
15+
"import-blacklist": [true],
1616
"import-spacing": true,
1717
"indent": [
1818
true,

0 commit comments

Comments
 (0)