Skip to content

Commit

Permalink
Merge 787570a into f150364
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalexiei committed May 16, 2020
2 parents f150364 + 787570a commit b6a1c85
Show file tree
Hide file tree
Showing 99 changed files with 2,039 additions and 1,280 deletions.
6 changes: 1 addition & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.js]
[*.{js,ts}]
indent_style = space
indent_size = 2

[*.md]
indent_style = space
indent_size = 4

[*.ts]
indent_style = space
indent_size = 4
5 changes: 4 additions & 1 deletion .eslintrc → .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"extends": "eslint:recommended",
"root": true,
"extends": [
"eslint:recommended"
],
"env": {
"es6": true
},
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ perf/control/*

# Log files
*.log

# Documentation
docs
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-dev=true
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"editorconfig.editorconfig",
"ms-vscode.vscode-typescript-tslint-plugin",
"dbaeumer.vscode-eslint"
]
}
8 changes: 6 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@
"statusBarItem.hoverBackground": "#00919b",
"statusBar.foreground": "#15202b"
},
"peacock.color": "#00c1ce"
}
"peacock.color": "#00c1ce",
"typescript.tsdk": "node_modules/typescript/lib",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}

0 comments on commit b6a1c85

Please sign in to comment.