Skip to content

Commit 7e86203

Browse files
committed
chore: upgrade to angular-cli beta.19-3
1 parent 7271b54 commit 7e86203

File tree

6 files changed

+37
-19
lines changed

6 files changed

+37
-19
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ root = true
55
charset = utf-8
66
indent_style = space
77
indent_size = 2
8-
end_of_line = lf
98
insert_final_newline = true
109
trim_trailing_whitespace = true
1110

angular-cli.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
22
"project": {
3-
"version": "1.0.0-beta.17",
3+
"version": "1.0.0-beta.19-3",
44
"name": "routing-angular-cli"
55
},
66
"apps": [
77
{
88
"root": "src",
99
"outDir": "dist",
10-
"assets": "assets",
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
1114
"index": "index.html",
1215
"main": "main.ts",
1316
"test": "test.ts",
@@ -39,6 +42,18 @@
3942
},
4043
"defaults": {
4144
"styleExt": "scss",
42-
"prefixInterfaces": false
45+
"prefixInterfaces": false,
46+
"inline": {
47+
"style": false,
48+
"template": false
49+
},
50+
"spec": {
51+
"class": false,
52+
"component": true,
53+
"directive": true,
54+
"module": false,
55+
"pipe": true,
56+
"service": true
57+
}
4358
}
4459
}

karma.conf.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ module.exports = function (config) {
2727
config: './angular-cli.json',
2828
environment: 'dev'
2929
},
30-
reporters: ['progress', 'karma-remap-istanbul'],
30+
reporters: config.angularCli && config.angularCli.codeCoverage
31+
? ['progress', 'karma-remap-istanbul']
32+
: ['progress'],
3133
port: 9876,
3234
colors: true,
3335
logLevel: config.LOG_INFO,

package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
},
1515
"private": true,
1616
"dependencies": {
17-
"@angular/common": "~2.0.0",
18-
"@angular/compiler": "~2.0.0",
19-
"@angular/core": "~2.0.0",
20-
"@angular/forms": "~2.0.0",
21-
"@angular/http": "~2.0.0",
22-
"@angular/platform-browser": "~2.0.0",
23-
"@angular/platform-browser-dynamic": "~2.0.0",
24-
"@angular/router": "~3.0.0",
17+
"@angular/common": "~2.1.0",
18+
"@angular/compiler": "~2.1.0",
19+
"@angular/core": "~2.1.0",
20+
"@angular/forms": "~2.1.0",
21+
"@angular/http": "~2.1.0",
22+
"@angular/platform-browser": "~2.1.0",
23+
"@angular/platform-browser-dynamic": "~2.1.0",
24+
"@angular/router": "~3.1.0",
2525
"core-js": "^2.4.1",
2626
"rxjs": "5.0.0-beta.12",
2727
"ts-helpers": "^1.1.1",
@@ -30,8 +30,8 @@
3030
"devDependencies": {
3131
"@types/jasmine": "^2.2.30",
3232
"@types/node": "^6.0.42",
33-
"angular-cli": "1.0.0-beta.17",
34-
"codelyzer": "~0.0.26",
33+
"angular-cli": "1.0.0-beta.19-3",
34+
"codelyzer": "1.0.0-beta.1",
3535
"jasmine-core": "2.4.1",
3636
"jasmine-spec-reporter": "2.5.0",
3737
"karma": "1.2.0",
@@ -42,6 +42,7 @@
4242
"protractor": "4.0.9",
4343
"ts-node": "1.2.1",
4444
"tslint": "3.13.0",
45-
"typescript": "2.0.2"
45+
"typescript": "~2.0.3",
46+
"webdriver-manager": "10.2.5"
4647
}
4748
}

src/typings.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Typings reference file, see links for more information
2-
// https://github.com/typings/typings
1+
// Typings reference file, you can add your own global typings here
32
// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
43

54
declare var System: any;

tslint.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
"use-life-cycle-interface": true,
108108
"use-pipe-transform-interface": true,
109109
"component-class-suffix": true,
110-
"directive-class-suffix": true
110+
"directive-class-suffix": true,
111+
"templates-use-public": true,
112+
"invoke-injectable": true
111113
}
112114
}

0 commit comments

Comments
 (0)