Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 7fdb40c

Browse files
committed
chore: replace VSCode-specific settings.json with broadly recommended .editorconfig
closes #1022
1 parent c1f2c39 commit 7fdb40c

File tree

6 files changed

+54
-17
lines changed

6 files changed

+54
-17
lines changed

.editorconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
13+
[*.md]
14+
max_line_length = 0
15+
trim_trailing_whitespace = false
16+
17+
[*.jade]
18+
max_line_length = 0
19+
trim_trailing_whitespace = false
20+
21+
# Indentation override
22+
#[lib/**.js]
23+
#[{package.json,.travis.yml}]
24+
#[**/**.js]

.vscode/settings.json

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

gulpfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ var _excludeMatchers = _excludePatterns.map(function(excludePattern){
6969
});
7070

7171
var _exampleBoilerplateFiles = [
72+
'.editorconfig',
7273
'karma.conf.js',
7374
'karma-test-shim.js',
7475
'package.json',

public/docs/_examples/.editorconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
13+
[*.md]
14+
max_line_length = 0
15+
trim_trailing_whitespace = false
16+
17+
# Indentation override
18+
#[lib/**.js]
19+
#[{package.json,.travis.yml}]
20+
#[**/**.js]

public/docs/_examples/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.editorconfig
12
styles.css
23
typings
34
typings.json

tools/plunker-builder/plunkerBuilder.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,16 @@ function initConfigAndCollectFileNames(configFileName) {
107107
}
108108
});
109109
// var defaultExcludes = [ '!**/node_modules/**','!**/typings/**','!**/tsconfig.json', '!**/*plnkr.json', '!**/*plnkr.html', '!**/*plnkr.no-link.html' ];
110-
var defaultExcludes = [
110+
var defaultExcludes = [
111111
'!**/typings/**',
112112
'!**/typings.json',
113-
'!**/tsconfig.json',
114-
'!**/*plnkr.*',
115-
'!**/package.json',
113+
'!**/tsconfig.json',
114+
'!**/*plnkr.*',
115+
'!**/package.json',
116116
'!**/example-config.json',
117-
'!**/*.spec.*'
117+
'!**/*.spec.*',
118+
'!**/tslint.json',
119+
'!**/.editorconfig'
118120
];
119121
Array.prototype.push.apply(gpaths, defaultExcludes);
120122

@@ -263,4 +265,4 @@ function escapeHtml(unsafe) {
263265
// fs.writeFileSync(outputFn, html, 'utf-8' );
264266
// }
265267
// });
266-
//}
268+
//}

0 commit comments

Comments
 (0)