Skip to content

Commit

Permalink
Update common files
Browse files Browse the repository at this point in the history
  • Loading branch information
mrmlnc committed Aug 8, 2017
1 parent 5dad987 commit 95e175f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 14 deletions.
11 changes: 4 additions & 7 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# editorconfig.org
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = tab
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

# The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
[{.travis.yml,npm-shrinkwrap.json,package.json}]
[{.travis.yml,appveyor.yml,npm-shrinkwrap.json,package.json}]
indent_style = space
indent_size = 2
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@ logs/
*.log
npm-debug.log*

# IDE & editors
.idea
.vscode-test

# Dependency directory
node_modules/

# Build directory
# Compiled and tempory files
.tmp/
out/

# Other files
package-lock.json
yarn.lock
15 changes: 9 additions & 6 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
.vscode/**
.vscode-test/**
typings/**
fixtures/**
src/**
out/**/*.d.ts
out/test/**
.editorconfig
.gitignore
.travis.yml
package-lock.json
yarn.lock
tsconfig.json
tslint.json
.travis.yml

.vscode/**
src/**
smoke/**

0 comments on commit 95e175f

Please sign in to comment.