Skip to content

Commit 74a23c1

Browse files
authored
Merge pull request #40 from ipdata/develop
Update master
2 parents 57ffa46 + 995941b commit 74a23c1

6 files changed

Lines changed: 7091 additions & 4693 deletions

File tree

.eslintrc.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ module.exports = {
1010
'airbnb-base',
1111
'plugin:@typescript-eslint/recommended',
1212
'prettier/@typescript-eslint',
13-
'plugin:prettier/recommended'
13+
'plugin:prettier/recommended',
14+
'plugin:import/recommended',
15+
'plugin:import/typescript'
1416
],
1517
parser: '@typescript-eslint/parser',
1618
parserOptions: {
@@ -20,7 +22,17 @@ module.exports = {
2022
'@typescript-eslint'
2123
],
2224
rules: {
23-
'lines-between-class-members': 'off'
25+
'lines-between-class-members': 'off',
26+
"import/extensions": [
27+
"error",
28+
"ignorePackages",
29+
{
30+
"js": "never",
31+
"jsx": "never",
32+
"ts": "never",
33+
"tsx": "never"
34+
}
35+
]
2436
},
2537
overrides: [
2638
{
@@ -42,13 +54,12 @@ module.exports = {
4254
}
4355
],
4456
settings: {
57+
'import/parsers': {
58+
"@typescript-eslint/parser": [".ts", ".tsx"]
59+
},
4560
'import/resolver': {
46-
node: {
47-
extensions: [
48-
'.js',
49-
'.ts'
50-
]
51-
}
61+
typescript: true,
62+
node: true
5263
}
5364
}
5465
};

.github/workflows/main.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout repository
10-
uses: actions/checkout@v1
10+
uses: actions/checkout@v3
1111
- name: Install node
12-
uses: actions/setup-node@v1
12+
uses: actions/setup-node@v3
1313
- name: Install dependencies
1414
run: npm ci
1515
- name: Lint
@@ -19,9 +19,9 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v1
22+
uses: actions/checkout@v3
2323
- name: Install node
24-
uses: actions/setup-node@v1
24+
uses: actions/setup-node@v3
2525
- name: Install dependencies
2626
run: npm ci
2727
- name: Test
@@ -34,15 +34,17 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v1
37+
uses: actions/checkout@v3
3838
- name: Install node
39-
uses: actions/setup-node@v1
39+
uses: actions/setup-node@v3
40+
with:
41+
registry-url: 'https://registry.npmjs.org'
4042
- name: Install dependencies
4143
run: npm ci
4244
- name: Build
4345
run: npm run build
4446
- name: Release
45-
uses: primer/publish@master
47+
run: npm publish
4648
env:
4749
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
50+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

0 commit comments

Comments
 (0)