Skip to content

Commit 1782e09

Browse files
committed
Backport ng-cli 1.5.0 defaults
1 parent fdf76f2 commit 1782e09

File tree

2 files changed

+144
-141
lines changed

2 files changed

+144
-141
lines changed

polyfills.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,17 @@ import 'core-js/es6/set';
3737
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
3838
// import 'classlist.js'; // Run `npm install --save classlist.js`.
3939

40-
/** Evergreen browsers require these. **/
40+
/** IE10 and IE11 requires the following for the Reflect API. */
4141
import 'core-js/es6/reflect';
42+
43+
44+
/** Evergreen browsers require these. **/
45+
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
4246
import 'core-js/es7/reflect';
4347

4448

4549
/**
46-
* Required to support Web Animations `@angular/animation`.
50+
* Required to support Web Animations `@angular/platform-browser/animations`.
4751
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
4852
**/
4953
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

tslint.json

Lines changed: 138 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,141 @@
11
{
2-
"rulesDirectory": [
3-
"node_modules/codelyzer"
2+
"rulesDirectory": [
3+
"node_modules/codelyzer"
4+
],
5+
"rules": {
6+
"arrow-return-shorthand": true,
7+
"callable-types": true,
8+
"class-name": true,
9+
"comment-format": [
10+
true,
11+
"check-space"
412
],
5-
"rules": {
6-
"arrow-return-shorthand": true,
7-
"callable-types": true,
8-
"class-name": true,
9-
"comment-format": [
10-
true,
11-
"check-space"
12-
],
13-
"curly": true,
14-
"eofline": true,
15-
"forin": true,
16-
"import-blacklist": [
17-
true,
18-
"rxjs"
19-
],
20-
"import-spacing": true,
21-
"indent": [
22-
true,
23-
"spaces"
24-
],
25-
"interface-over-type-literal": true,
26-
"label-position": true,
27-
"max-line-length": [
28-
true,
29-
140
30-
],
31-
"member-access": false,
32-
"member-ordering": [
33-
true,
34-
{
35-
"order": [
36-
"static-field",
37-
"instance-field",
38-
"static-method",
39-
"instance-method"
40-
]
41-
}
42-
],
43-
"no-arg": true,
44-
"no-bitwise": true,
45-
"no-console": [
46-
true,
47-
"debug",
48-
"info",
49-
"time",
50-
"timeEnd",
51-
"trace"
52-
],
53-
"no-construct": true,
54-
"no-debugger": true,
55-
"no-duplicate-super": true,
56-
"no-empty": false,
57-
"no-empty-interface": true,
58-
"no-eval": true,
59-
"no-inferrable-types": [
60-
true,
61-
"ignore-params"
62-
],
63-
"no-misused-new": true,
64-
"no-non-null-assertion": true,
65-
"no-shadowed-variable": true,
66-
"no-string-literal": false,
67-
"no-string-throw": true,
68-
"no-switch-case-fall-through": true,
69-
"no-trailing-whitespace": true,
70-
"no-unnecessary-initializer": true,
71-
"no-unused-expression": true,
72-
"no-use-before-declare": true,
73-
"no-var-keyword": true,
74-
"object-literal-sort-keys": false,
75-
"one-line": [
76-
true,
77-
"check-open-brace",
78-
"check-catch",
79-
"check-else",
80-
"check-whitespace"
81-
],
82-
"prefer-const": true,
83-
"quotemark": [
84-
true,
85-
"single"
86-
],
87-
"radix": true,
88-
"semicolon": [
89-
true,
90-
"always"
91-
],
92-
"triple-equals": [
93-
true,
94-
"allow-null-check"
95-
],
96-
"typedef-whitespace": [
97-
true,
98-
{
99-
"call-signature": "nospace",
100-
"index-signature": "nospace",
101-
"parameter": "nospace",
102-
"property-declaration": "nospace",
103-
"variable-declaration": "nospace"
104-
}
105-
],
106-
"typeof-compare": true,
107-
"unified-signatures": true,
108-
"variable-name": false,
109-
"whitespace": [
110-
true,
111-
"check-branch",
112-
"check-decl",
113-
"check-operator",
114-
"check-separator",
115-
"check-type"
116-
],
117-
"directive-selector": [
118-
true,
119-
"attribute",
120-
null,
121-
"camelCase"
122-
],
123-
"component-selector": [
124-
true,
125-
"element",
126-
null,
127-
"kebab-case"
128-
],
129-
"use-input-property-decorator": true,
130-
"use-output-property-decorator": true,
131-
"use-host-property-decorator": true,
132-
"no-input-rename": true,
133-
"no-output-rename": true,
134-
"use-life-cycle-interface": true,
135-
"use-pipe-transform-interface": true,
136-
"component-class-suffix": true,
137-
"directive-class-suffix": true,
138-
"no-access-missing-member": true,
139-
"templates-use-public": true,
140-
"invoke-injectable": true
141-
}
13+
"curly": true,
14+
"eofline": true,
15+
"forin": true,
16+
"import-blacklist": [
17+
true,
18+
"rxjs",
19+
"rxjs/Rx"
20+
],
21+
"import-spacing": true,
22+
"indent": [
23+
true,
24+
"spaces"
25+
],
26+
"interface-over-type-literal": true,
27+
"label-position": true,
28+
"max-line-length": [
29+
true,
30+
140
31+
],
32+
"member-access": false,
33+
"member-ordering": [
34+
true,
35+
{
36+
"order": [
37+
"static-field",
38+
"instance-field",
39+
"static-method",
40+
"instance-method"
41+
]
42+
}
43+
],
44+
"no-arg": true,
45+
"no-bitwise": true,
46+
"no-console": [
47+
true,
48+
"debug",
49+
"info",
50+
"time",
51+
"timeEnd",
52+
"trace"
53+
],
54+
"no-construct": true,
55+
"no-debugger": true,
56+
"no-duplicate-super": true,
57+
"no-empty": false,
58+
"no-empty-interface": true,
59+
"no-eval": true,
60+
"no-inferrable-types": [
61+
true,
62+
"ignore-params"
63+
],
64+
"no-misused-new": true,
65+
"no-non-null-assertion": true,
66+
"no-shadowed-variable": true,
67+
"no-string-literal": false,
68+
"no-string-throw": true,
69+
"no-switch-case-fall-through": true,
70+
"no-trailing-whitespace": true,
71+
"no-unnecessary-initializer": true,
72+
"no-unused-expression": true,
73+
"no-use-before-declare": true,
74+
"no-var-keyword": true,
75+
"object-literal-sort-keys": false,
76+
"one-line": [
77+
true,
78+
"check-open-brace",
79+
"check-catch",
80+
"check-else",
81+
"check-whitespace"
82+
],
83+
"prefer-const": true,
84+
"quotemark": [
85+
true,
86+
"single"
87+
],
88+
"radix": true,
89+
"semicolon": [
90+
true,
91+
"always"
92+
],
93+
"triple-equals": [
94+
true,
95+
"allow-null-check"
96+
],
97+
"typedef-whitespace": [
98+
true,
99+
{
100+
"call-signature": "nospace",
101+
"index-signature": "nospace",
102+
"parameter": "nospace",
103+
"property-declaration": "nospace",
104+
"variable-declaration": "nospace"
105+
}
106+
],
107+
"typeof-compare": true,
108+
"unified-signatures": true,
109+
"variable-name": false,
110+
"whitespace": [
111+
true,
112+
"check-branch",
113+
"check-decl",
114+
"check-operator",
115+
"check-separator",
116+
"check-type"
117+
],
118+
"directive-selector": [
119+
true,
120+
"attribute",
121+
null,
122+
"camelCase"
123+
],
124+
"component-selector": [
125+
true,
126+
"element",
127+
null,
128+
"kebab-case"
129+
],
130+
"use-input-property-decorator": true,
131+
"use-output-property-decorator": true,
132+
"use-host-property-decorator": true,
133+
"no-input-rename": true,
134+
"no-output-rename": true,
135+
"use-life-cycle-interface": true,
136+
"use-pipe-transform-interface": true,
137+
"component-class-suffix": true,
138+
"directive-class-suffix": true,
139+
"invoke-injectable": true
140+
}
142141
}

0 commit comments

Comments
 (0)