Skip to content

Commit 08b75bf

Browse files
committed
Course updated to Angular 6
1 parent 8cf7d3b commit 08b75bf

File tree

11 files changed

+2122
-1574
lines changed

11 files changed

+2122
-1574
lines changed

au-input/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "au-input",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",

au-mask/.angular-cli.json

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

au-mask/angular.json

Lines changed: 128 additions & 0 deletions
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+
"au-mask": {
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": "au-mask:build"
52+
},
53+
"configurations": {
54+
"production": {
55+
"browserTarget": "au-mask:build:production"
56+
}
57+
}
58+
},
59+
"extract-i18n": {
60+
"builder": "@angular-devkit/build-angular:extract-i18n",
61+
"options": {
62+
"browserTarget": "au-mask: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+
"au-mask-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": "au-mask: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": "au-mask",
119+
"schematics": {
120+
"@schematics/angular:component": {
121+
"prefix": "",
122+
"styleext": "css"
123+
},
124+
"@schematics/angular:directive": {
125+
"prefix": ""
126+
}
127+
}
128+
}

au-mask/karma.conf.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
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
files: [
19-
{ pattern: './src/test.ts', watched: false }
19+
2020
],
2121
preprocessors: {
22-
'./src/test.ts': ['@angular/cli']
22+
2323
},
2424
mime: {
2525
'text/x-typescript': ['ts','tsx']
2626
},
2727
coverageIstanbulReporter: {
28-
reports: [ 'html', 'lcovonly' ],
28+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2929
fixWebpackSourcePaths: true
3030
},
3131
angularCli: {

au-mask/package.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,27 @@
1212
},
1313
"private": false,
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",
2725
"lodash.findindex": "^4.6.0",
2826
"lodash.findlastindex": "^4.6.0",
29-
"lodash.includes": "^4.3.0"
27+
"lodash.includes": "^4.3.0",
28+
"rxjs": "6.1.0",
29+
"zone.js": "0.8.26",
30+
"rxjs-compat": "^6.0.0-rc.0"
3031
},
3132
"devDependencies": {
32-
"@angular/cli": "1.5.0",
33-
"@angular/compiler-cli": "^5.0.0",
34-
"@angular/language-service": "^5.0.0",
33+
"@angular/cli": "^6.0.0",
34+
"@angular/compiler-cli": "6.0.0",
35+
"@angular/language-service": "6.0.0",
3536
"@types/jasmine": "~2.5.53",
3637
"@types/jasminewd2": "~2.0.2",
3738
"@types/node": "~6.0.60",
@@ -47,6 +48,7 @@
4748
"protractor": "~5.1.2",
4849
"ts-node": "~3.2.0",
4950
"tslint": "~5.7.0",
50-
"typescript": "~2.4.2"
51+
"typescript": "2.7.2",
52+
"@angular-devkit/build-angular": "~0.6.0"
5153
}
52-
}
54+
}

au-mask/src/tsconfig.spec.json

Lines changed: 2 additions & 1 deletion
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",

au-mask/tslint.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"eofline": true,
1414
"forin": true,
1515
"import-blacklist": [
16-
true,
17-
"rxjs"
16+
true
1817
],
1918
"import-spacing": true,
2019
"indent": [

0 commit comments

Comments
 (0)