Skip to content

Commit f2cfda9

Browse files
authored
Merge branch 'master' into add-npm
2 parents 1bbcf00 + d0e12a4 commit f2cfda9

100 files changed

Lines changed: 3837 additions & 2344 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.yml

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
env:
2-
node: true
3-
es6: true
1+
env:
2+
node: true
3+
es6: true
4+
parserOptions:
5+
ecmaVersion: 2017
46

5-
rules:
6-
indent-legacy: [2, 2]
7-
quotes: [2, single]
8-
no-trailing-spaces: 2
9-
comma-spacing: [2, { before: false, after: true }]
10-
eqeqeq: [2, always]
11-
linebreak-style: [2, unix]
12-
semi: [2, always]
13-
max-len: [2, 80]
14-
no-multi-spaces: 2
15-
no-useless-escape: 2
16-
array-bracket-spacing: [2, never]
17-
brace-style: 2
18-
capitalized-comments: 2
19-
eol-last: [2, always]
20-
func-call-spacing: [2, never]
21-
semi-spacing: 2
22-
strict: 2
23-
no-var: 2
7+
rules:
8+
eqeqeq: [error, always]
9+
no-useless-escape: error
10+
capitalized-comments: [error, always, { ignoreConsecutiveComments: true }]
11+
strict: error
12+
no-var: error
13+
prefer-template: error
14+
no-template-curly-in-string: error
15+
prefer-arrow-callback: error
16+
padding-line-between-statements:
17+
- error
18+
- { blankLine: always, prev: directive, next: '*' }
2419

25-
extends: eslint:recommended
20+
extends:
21+
- eslint:recommended
22+
- plugin:prettier/recommended

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ Platform: output of `uname -a` (UNIX), or version and 32 or 64-bit (Windows)
1010
If possible, please provide code that demonstrates the problem, keeping it as
1111
simple and free of external dependencies as you are able.
1212
-->
13-
* **Node Version**:
14-
* **CitGM Version**:
15-
* **Platform**:
13+
14+
- **Node Version**:
15+
- **CitGM Version**:
16+
- **Platform**:
1617

1718
<!-- Enter your issue details below this comment. -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ the requirements below.
44
-->
55

66
##### Checklist
7+
78
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
89

910
- [ ] `npm test` passes
1011
- [ ] tests are included
1112
- [ ] documentation is changed or added
12-
- [ ] contribution guidelines followed [here](https://github.com/nodejs/citgm/blob/master/CONTRIBUTING.md)
13+
- [ ] contribution guidelines followed
14+
[here](https://github.com/nodejs/citgm/blob/master/CONTRIBUTING.md)

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ test/scaffold/*/node_modules
33
test/.*
44
coverage/
55
.nyc_output/
6-
package-lock.json
6+
.eslintcache

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
James M Snell <jasnell@gmail.com> <jasnell@users.noreply.github.com>
2+
Bartosz Sosnowski <bartosz@janeasystems.com> <bzoz@users.noreply.github.com>
3+
Oleksandr Kushchak <oleksandrkushchak@gmail.com> <Oleksandr.Kushchak@ibm.com>

.npmignore

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

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package-lock=false

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ language: node_js
22
os:
33
- linux
44
- osx
5+
- windows
56
node_js:
6-
- "8"
7-
- "6"
8-
- "4"
7+
- '12'
8+
- '11'
9+
- '10'
10+
- '8'
11+
script: 'npm run test-ci'
12+
after_script: 'bash <(curl -s https://codecov.io/bash)'

AUTHORS

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,47 @@
1-
Myles Borins <mborins@us.ibm.com>
1+
# Authors ordered by first contribution.
2+
23
James M Snell <jasnell@gmail.com>
3-
George Adams <george.adams@uk.ibm.com>
4-
Bryan English <bryan@bryanenglish.com>
5-
Benjamin Coe <ben@npmjs.com>
6-
Bartosz Sosnowski <bartosz@janeasystems.com>
7-
Wayne Andrews <andreww@uk.ibm.com>
8-
jnvm <j@nvm.io>
9-
Сковорода Никита Андреевич <chalkerx@gmail.com>
4+
Myles Borins <myles.borins@gmail.com>
5+
Gibson Fahnestock <gibfahn@gmail.com>
106
Douglas Wilson <dougwilson@live.com>
11-
Gibson Fahnestock <gib@uk.ibm.com>
7+
Benjamin Coe <bencoe@gmail.com>
128
Jeremiah Senkpiel <fishrock123@rocketmail.com>
9+
Bryan English <bryan@bryanenglish.com>
1310
Michael Dawson <michael_dawson@ca.ibm.com>
11+
Wayne Andrews <andreww@uk.ibm.com>
1412
Michael Mifsud <xzyfer@gmail.com>
13+
George Adams <george.adams@uk.ibm.com>
14+
Bartosz Sosnowski <bartosz@janeasystems.com>
15+
jnvm <j@nvm.io>
16+
Сковорода Никита Андреевич <chalkerx@gmail.com>
1517
Steven R. Loomis <srloomis@us.ibm.com>
18+
Nathan Hammond <github.com@nathanhammond.com>
19+
Marc Bachmann <marc.brookman@gmail.com>
20+
Richard Lau <riclau@uk.ibm.com>
21+
Joyee Cheung <joyeec9h3@gmail.com>
22+
Evan Lucas <evanlucas@me.com>
23+
Myles Borins <mborins@google.com>
24+
Michaël Zasso <targos@protonmail.com>
25+
Stewart X Addison <sxa@uk.ibm.com>
26+
Douglas Christopher Wilson <doug@somethingdoug.com>
27+
Luigi Pinca <luigipinca@gmail.com>
28+
Kyle Kelley <rgbkrk@gmail.com>
29+
Emil Bay <github@tixz.dk>
30+
Refael Ackermann <refack@gmail.com>
31+
Thomas Watson Steen <w@tson.dk>
32+
Wes <wes@wesleytodd.com>
33+
Nicolas Morel <nicolas@morel.io>
34+
Anna Henningsen <anna@addaleax.net>
35+
Oleksandr Kushchak <oleksandrkushchak@gmail.com>
36+
Vincent Weevers <mail@vincentweevers.nl>
37+
Steve Faulkner <southpolesteve@gmail.com>
38+
Aaron Meese <ajmeese7@gmail.com>
39+
Ruben Bridgewater <ruben@bridgewater.de>
40+
Simen Bekkhus <sbekkhus91@gmail.com>
41+
Matteo Collina <matteo.collina@gmail.com>
42+
Rich Trott <rtrott@gmail.com>
43+
Renée Kooi <renee@kooi.me>
44+
Francis Gulotta <wizard@roborooter.com>
45+
Wade Simmons <wsimmons@gmail.com>
46+
47+
# Generated by tools/update-authors.js

0 commit comments

Comments
 (0)