Skip to content

Commit e2cc9ff

Browse files
johnnynaderjohnnynader
authored
Merge branch 'master' into patch-1
2 parents 8beed56 + a2a59d0 commit e2cc9ff

File tree

117 files changed

+11526
-8276
lines changed

Some content is hidden

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

117 files changed

+11526
-8276
lines changed

‎.babelrc

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

‎.circleci/config.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
11
version: 2
22
jobs:
3-
build:
4-
docker:
5-
- image: circleci/node:14-browsers
3+
build:
4+
docker:
5+
- image: circleci/node:14-browsers
66

7-
working_directory: ~/intercom-node
7+
working_directory: ~/intercom-node
88

9-
environment:
10-
- YARN_VERSION: 1.22.10
11-
12-
steps:
13-
- checkout
14-
- run: export PATH="${PATH}:/home/circleci/.yarn/bin"
15-
- run:
16-
name: Install Yarn
17-
command: |
18-
if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then
19-
echo "Download and install Yarn."
20-
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION
21-
else
22-
echo "The correct version of Yarn is already installed."
23-
fi
24-
- run: yarn
25-
- run: yarn test
9+
steps:
10+
- checkout
11+
- run: export PATH="${PATH}:/home/circleci/.yarn/bin"
12+
- run: npm install --prefix=$HOME/.local --global corepack
13+
- run: yarn
14+
- run: yarn prepublish
15+
- run: yarn test
2616

2717
notify:
28-
webhooks:
29-
- url: https://muster.intercom.io/circle_webhooks
18+
webhooks:
19+
- url: https://muster.intercom.io/circle_webhooks

‎.editorconfig

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
root = true
22

33
[*]
4-
indent_style = space
5-
indent_size = 2
6-
charset = utf-8
7-
trim_trailing_whitespace = true
4+
end_of_line = lf
85
insert_final_newline = true
6+
trim_trailing_whitespace = true
7+
charset = utf-8
8+
indent_style = space
9+
indent_size = 4
910

1011
[*.md]
1112
trim_trailing_whitespace = false
13+
14+
[*.{json,yml}]
15+
indent_style = space
16+
indent_size = 2

‎.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Temporary workaround for Gulp's ESLint
2+
dist/
3+
node_modules/

‎.eslintrc

Lines changed: 42 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1,44 @@
11
{
2-
"parser": "babel-eslint",
3-
"rules": {
4-
"strict": [
5-
2,
6-
"global"
7-
],
8-
"quotes": [
9-
2,
10-
"single"
11-
],
12-
"indent": [
13-
2,
14-
2
15-
],
16-
"one-var": [
17-
2,
18-
"never"
19-
],
20-
"consistent-return": 0,
21-
"no-use-before-define": [
22-
2,
23-
"nofunc"
24-
],
25-
"space-before-function-paren": [
26-
2,
27-
{
28-
"anonymous": "always",
29-
"named": "never"
30-
}
31-
],
32-
"keyword-spacing": 2,
33-
"array-bracket-spacing": [
34-
2,
35-
"never"
36-
],
37-
"space-in-parens": [
38-
2,
39-
"never"
40-
],
41-
"quote-props": [
42-
2,
43-
"as-needed"
44-
],
45-
"no-multiple-empty-lines": [
46-
2,
47-
{
48-
"max": 2
49-
}
50-
],
51-
"brace-style": [
52-
2,
53-
"1tbs"
54-
],
55-
"curly": [
56-
2,
57-
"all"
58-
],
59-
"key-spacing": [
60-
2,
61-
{
62-
"beforeColon": false,
63-
"afterColon": true
64-
}
65-
],
66-
"space-infix-ops": 2,
67-
"no-eval": 2,
68-
"no-with": 2,
69-
"eol-last": 2,
70-
"comma-dangle": [
71-
2,
72-
"never"
73-
],
74-
"no-cond-assign": 2,
75-
"no-constant-condition": 2,
76-
"no-control-regex": 2,
77-
"no-debugger": 2,
78-
"no-dupe-args": 2,
79-
"no-dupe-keys": 2,
80-
"no-duplicate-case": 2,
81-
"no-empty-character-class": 2,
82-
"no-empty": 2,
83-
"no-ex-assign": 2,
84-
"no-extra-boolean-cast": 2,
85-
"no-extra-semi": 2,
86-
"no-func-assign": 2,
87-
"no-inner-declarations": [
88-
2,
89-
"functions"
90-
],
91-
"no-invalid-regexp": 2,
92-
"no-irregular-whitespace": 2,
93-
"no-negated-in-lhs": 2,
94-
"no-obj-calls": 2,
95-
"no-regex-spaces": 2,
96-
"no-sparse-arrays": 2,
97-
"no-unreachable": 2,
98-
"use-isnan": 2,
99-
"valid-typeof": 2,
100-
"dot-notation": [
101-
2,
102-
{
103-
"allowKeywords": true
104-
}
105-
],
106-
"eqeqeq": 2,
107-
"no-alert": 2,
108-
"no-caller": 2,
109-
"no-extend-native": 2,
110-
"no-extra-bind": 2,
111-
"no-fallthrough": 2,
112-
"no-implied-eval": 2,
113-
"no-iterator": 2,
114-
"no-labels": 2,
115-
"no-lone-blocks": 2,
116-
"no-loop-func": 2,
117-
"no-multi-spaces": 2,
118-
"no-multi-str": 2,
119-
"no-native-reassign": 2,
120-
"no-new-func": 2,
121-
"no-new-wrappers": 2,
122-
"no-new": 2,
123-
"no-octal-escape": 2,
124-
"no-octal": 2,
125-
"no-proto": 2,
126-
"no-redeclare": 2,
127-
"no-return-assign": 2,
128-
"no-script-url": 2,
129-
"no-sequences": 2,
130-
"no-unused-expressions": 2,
131-
"yoda": 2,
132-
"no-delete-var": 2,
133-
"no-label-var": 2,
134-
"no-shadow-restricted-names": 2,
135-
"no-shadow": 2,
136-
"no-undef-init": 2,
137-
"no-undef": 2,
138-
"no-unused-vars": [
139-
2,
140-
{
141-
"vars": "all",
142-
"args": "after-used"
143-
}
144-
],
145-
"camelcase": 0,
146-
"comma-spacing": 2,
147-
"new-cap": 2,
148-
"new-parens": 2,
149-
"no-array-constructor": 2,
150-
"no-mixed-spaces-and-tabs": [
151-
2,
152-
false
153-
],
154-
"no-new-object": 2,
155-
"no-spaced-func": 2,
156-
"no-trailing-spaces": 2,
157-
"no-underscore-dangle": 2,
158-
"no-extra-parens": 2,
159-
"semi-spacing": [
160-
2,
161-
{
162-
"before": false,
163-
"after": true
164-
}
165-
],
166-
"semi": 2
167-
},
168-
"env": {
169-
"node": true,
170-
"mocha": true,
171-
"es6": true
172-
}
2+
"root": true,
3+
"parser": "@typescript-eslint/parser",
4+
"plugins": ["@typescript-eslint"],
5+
"rules": {
6+
"keyword-spacing": 2,
7+
"array-bracket-spacing": [2, "never"],
8+
"space-in-parens": [2, "never"],
9+
"no-multiple-empty-lines": [
10+
2,
11+
{
12+
"max": 2
13+
}
14+
],
15+
"no-eval": 2,
16+
"no-with": 2,
17+
"no-debugger": 2,
18+
"no-dupe-args": 2,
19+
"no-dupe-keys": 2,
20+
"no-duplicate-case": 2,
21+
"no-empty-character-class": 2,
22+
"no-empty": 2,
23+
"no-ex-assign": 2,
24+
"no-extra-boolean-cast": 2,
25+
"no-extra-semi": 2,
26+
"no-func-assign": 2,
27+
"no-inner-declarations": [2, "functions"],
28+
"no-invalid-regexp": 2,
29+
"no-irregular-whitespace": 2,
30+
"no-negated-in-lhs": 2,
31+
"no-obj-calls": 2,
32+
"no-regex-spaces": 2,
33+
"no-sparse-arrays": 2,
34+
"no-unreachable": 2,
35+
"use-isnan": 2,
36+
"valid-typeof": 2
37+
},
38+
"extends": [
39+
"eslint:recommended",
40+
"plugin:@typescript-eslint/eslint-recommended",
41+
"plugin:@typescript-eslint/recommended",
42+
"prettier"
43+
]
17344
}

‎.github/ISSUE_TEMPLATE.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ Please use the following template to submit your issue. Following this template
22

33
For feature requests please contact us at team@intercom.io
44

5-
65
## Version info
7-
- intercom-node version:
8-
- Node version:
6+
7+
- intercom-node version:
8+
- Node version:
99

1010
## Expected behavior
1111

1212
## Actual behavior
1313

1414
## Steps to reproduce
15-
1.
16-
2.
17-
3.
15+
16+
1.
17+
2.
18+
3.
1819

1920
## Logs

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#### Why?
2+
23
Why are you making this change?
34

45
#### How?
6+
57
Technical details on your change

‎.gitignore

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,36 @@ pids
99
*.pid
1010
*.seed
1111

12-
# Coverage directory used by tools like istanbul
13-
coverage
12+
# Coverage directory used by nyc
13+
.nyc_output
1414

1515
# node-waf configuration
1616
.lock-wscript
1717

18-
# Compiled binary addons (http://nodejs.org/api/addons.html)
19-
build/Release
20-
2118
# Dependency directory
2219
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
2320
node_modules
2421

25-
# Babel
22+
# Compiled version
2623
dist
24+
25+
# Yarn 3.x
26+
.pnp.*
27+
.yarn/*
28+
!.yarn/patches
29+
!.yarn/plugins
30+
!.yarn/releases
31+
!.yarn/sdks
32+
!.yarn/versions
33+
34+
# Typescript mappings for lib
35+
lib/*.map
36+
lib/**/*.map
37+
# Typescript mappings for test
38+
test/*.map
39+
test/**/*.map
40+
# Generated Javascript
41+
lib/*.js
42+
lib/**/*.js
43+
test/*.js
44+
test/**/*.js

‎.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Should exist, because dist is in .gitignore
2+
# More here: https://docs.npmjs.com/cli/v8/using-npm/developers#keeping-files-out-of-your-package

‎.nycrc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"extends": "@istanbuljs/nyc-config-typescript",
3+
"include": [
4+
"lib/**/*.ts"
5+
],
6+
"exclude": [
7+
"lib/**/*.types.ts"
8+
],
9+
"require": [
10+
"ts-node/register"
11+
],
12+
"sourceMap": true,
13+
"instrument": true,
14+
"cache": true,
15+
"all": true,
16+
"check-coverage": true
17+
}

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ignore artifacts:
2+
dist
3+
node_modules

‎.prettierrc.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"trailingComma": "es5",
3+
"endOfLine": "lf",
4+
"useTabs": false,
5+
"tabWidth": 4,
6+
"semi": true,
7+
"singleQuote": true
8+
}

0 commit comments

Comments
 (0)