Skip to content

Commit fb16b70

Browse files
authored
Merge pull request #1 from visionmedia/master
merge from upstream
2 parents 22f9932 + 5c7c61d commit fb16b70

27 files changed

+933
-1205
lines changed

.coveralls.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.editorconfig

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
root = true
2+
3+
[*]
4+
indent_style = tab
5+
indent_size = 4
6+
tab_width = 4
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[{*.json,*.json.example,*.gyp,*.yml,*.yaml}]
13+
indent_style = space
14+
indent_size = 2
15+
16+
[{*.py,*.asm}]
17+
indent_style = space
18+
19+
[*.py]
20+
indent_size = 4
21+
22+
[*.asm]
23+
indent_size = 8
24+
25+
[*.md]
26+
trim_trailing_whitespace = false
27+
28+
# Ideal settings - some plugins might support these.
29+
[*.js]
30+
quote_type = single
31+
32+
[{*.c,*.cc,*.h,*.hh,*.cpp,*.hpp,*.m,*.mm,*.mpp,*.js,*.java,*.go,*.rs,*.php,*.ng,*.jsx,*.ts,*.d,*.cs,*.swift}]
33+
curly_bracket_next_line = false
34+
spaces_around_operators = true
35+
spaces_around_brackets = outside
36+
# close enough to 1TB
37+
indent_brace_style = K&R

.eslintrc

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

.github/ISSUE_TEMPLATE.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
3+
DO NOT SUBMIT ISSUES ASKING TO REMOVE ES6.
4+
5+
IT WILL BE CLOSED.
6+
IT WILL BE LOCKED.
7+
8+
We use ES2015+ for a reason. Modern best
9+
practices dictate the use of tooling like
10+
Babel and @babel/preset-env in order to
11+
target the browsers that make sense for
12+
your project.
13+
14+
For more information, please see:
15+
https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491
16+
17+
-->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<!--
2+
3+
DO NOT SUBMIT PULL REQUESTS REMOVING ES6.
4+
5+
IT WILL BE CLOSED.
6+
IT WILL NOT BE MERGED.
7+
8+
We use ES2015+ for a reason. Modern best
9+
practices dictate the use of tooling like
10+
Babel and @babel/preset-env in order to
11+
target the browsers that make sense for
12+
your project.
13+
14+
For more information, please see:
15+
https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491
16+
17+
-->

.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
.DS_Store
2-
node_modules
2+
node_modules/
33
*.sock
4-
build
4+
/build/
55
npm-debug.log
6-
dist
7-
coverage
6+
yarn-error.log
7+
/dist/
8+
/coverage/
89

910
# lockfiles
1011
yarn.lock

.npmignore

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

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ sudo: false
33
language: node_js
44

55
node_js:
6-
- "4"
76
- "6"
87
- "8"
8+
- "10"
9+
- "11"
910

1011
install:
11-
- make install
12+
- npm install
1213

1314
script:
14-
- make lint
15-
- make test
16-
17-
matrix:
18-
include:
19-
- node_js: '8'
20-
env: BROWSER=1
15+
- npm run lint
16+
- npm test
17+
- npm run test:coverage

0 commit comments

Comments
 (0)