Skip to content

Commit

Permalink
fix(@angular/cli): format files according to tslint
Browse files Browse the repository at this point in the history
Includes minor changes in generated static files to prevent them from
being changed when formatting or being picked up when running TSLint.

Close #5751
  • Loading branch information
Hirse authored and hansl committed May 9, 2017
1 parent 59575cf commit 377a062
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
2 changes: 1 addition & 1 deletion packages/@angular/cli/blueprints/ng/files/e2e/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { browser, element, by } from 'protractor';
import { browser, by, element } from 'protractor';

export class <%= jsComponentName %>Page {
navigateTo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types":[
"types": [
"jasmine",
"node"
]
Expand Down
25 changes: 20 additions & 5 deletions packages/@angular/cli/blueprints/ng/files/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
"curly": true,
"eofline": true,
"forin": true,
"import-blacklist": [true, "rxjs"],
"import-blacklist": [
true,
"rxjs"
],
"import-spacing": true,
"indent": [
true,
Expand Down Expand Up @@ -47,7 +50,10 @@
"no-empty": false,
"no-empty-interface": true,
"no-eval": true,
"no-inferrable-types": [true, "ignore-params"],
"no-inferrable-types": [
true,
"ignore-params"
],
"no-misused-new": true,
"no-non-null-assertion": true,
"no-shadowed-variable": true,
Expand Down Expand Up @@ -101,9 +107,18 @@
"check-separator",
"check-type"
],

"directive-selector": [true, "attribute", "<%= prefix %>", "camelCase"],
"component-selector": [true, "element", "<%= prefix %>", "kebab-case"],
"directive-selector": [
true,
"attribute",
"<%= prefix %>",
"camelCase"
],
"component-selector": [
true,
"element",
"<%= prefix %>",
"kebab-case"
],
"use-input-property-decorator": true,
"use-output-property-decorator": true,
"use-host-property-decorator": true,
Expand Down

0 comments on commit 377a062

Please sign in to comment.