Skip to content

Commit 5be49b0

Browse files
committed
Backport @angular/cli 1.4.x default
1 parent 9c1de7b commit 5be49b0

File tree

4 files changed

+188
-222
lines changed

4 files changed

+188
-222
lines changed

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Karma configuration file, see link for more information
2-
// https://karma-runner.github.io/0.13/config/configuration-file.html
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

44
module.exports = function (config) {
55
config.set({

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@
3333
"@angular/platform-browser": "^4.3.0",
3434
"@angular/platform-browser-dynamic": "^4.3.0",
3535
"core-js": "^2.4.1",
36-
"rxjs": "^5.4.1",
36+
"rxjs": "^5.4.2",
3737
"zone.js": "^0.8.14"
3838
},
3939
"devDependencies": {
40-
"@angular/cli": "^1.2.0",
40+
"@angular/cli": "^1.4.1",
4141
"@angular/compiler-cli": "^4.3.0",
4242
"@angular/language-service": "^4.3.0",
4343
"@types/jasmine": "~2.5.53",
4444
"@types/jasminewd2": "~2.0.2",
4545
"@types/node": "~6.0.60",
46-
"codelyzer": "~3.0.1",
46+
"codelyzer": "~3.1.1",
4747
"gulp": "^3.9.1",
4848
"gulp-clean": "^0.3.2",
4949
"gulp-inline-ng2-template": "^4.0.0",
@@ -58,7 +58,7 @@
5858
"karma-phantomjs-launcher": "^1.0.4",
5959
"phantomjs-prebuilt": "^2.1.14",
6060
"protractor": "~5.1.2",
61-
"ts-node": "~3.0.4",
61+
"ts-node": "~3.2.0",
6262
"tslint": "~5.3.2",
6363
"typescript": "~2.3.3"
6464
}

tslint.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,14 @@
3131
"member-access": false,
3232
"member-ordering": [
3333
true,
34-
"static-before-instance",
35-
"variables-before-functions"
34+
{
35+
"order": [
36+
"static-field",
37+
"instance-field",
38+
"static-method",
39+
"instance-method"
40+
]
41+
}
3642
],
3743
"no-arg": true,
3844
"no-bitwise": true,
@@ -80,6 +86,7 @@
8086
],
8187
"radix": true,
8288
"semicolon": [
89+
true,
8390
"always"
8491
],
8592
"triple-equals": [

0 commit comments

Comments
 (0)