Skip to content

Commit 5111766

Browse files
watanabeyuwatanabeyu
authored
Merge pull request #19 from watanabeyu/develop
v1.3.2
2 parents 5181627 + 3c151e1 commit 5111766

9 files changed

Lines changed: 18326 additions & 7131 deletions

File tree

‎.eslintignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/
2-
dist/
2+
dist/
3+
.eslintrc.js

‎.eslintrc.js‎

Lines changed: 65 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,74 @@
11
module.exports = {
2-
"parser": "@typescript-eslint/parser",
3-
"env": {
4-
"es6": true,
5-
"browser": true,
6-
"jest": true
2+
parser: '@typescript-eslint/parser',
3+
parserOptions: {
4+
project: './tsconfig.json',
75
},
8-
"extends": "airbnb",
9-
"globals": {
10-
"__DEV__": true
6+
env: {
7+
es6: true,
8+
browser: true,
9+
jest: true,
1110
},
12-
"plugins": [
13-
"@typescript-eslint"
11+
extends: [
12+
'airbnb-typescript/base',
1413
],
15-
"settings": {
16-
"import/extensions": [
17-
".js",
18-
".jsx",
19-
".ts",
20-
".tsx"
14+
globals: {
15+
__DEV__: true,
16+
},
17+
plugins: [
18+
'@typescript-eslint',
19+
],
20+
settings: {
21+
'import/extensions': [
22+
'.js',
23+
'.jsx',
24+
'.ts',
25+
'.tsx',
2126
],
22-
"import/resolver": {
23-
"node": {
24-
"extensions": [
25-
".js",
26-
".jsx",
27-
".ts",
28-
".tsx"
29-
]
30-
}
31-
}
27+
'import/core-modules': [
28+
'app',
29+
],
30+
'import/resolver': {
31+
node: {
32+
extensions: [
33+
'.js',
34+
'.jsx',
35+
'.ts',
36+
'.tsx',
37+
],
38+
},
39+
},
3240
},
33-
"rules": {
34-
"max-len": [
35-
1,
36-
140,
37-
2
41+
rules: {
42+
camelcase: 0,
43+
'import/prefer-default-export': 0,
44+
'no-unused-vars': 'off',
45+
'@typescript-eslint/no-unused-vars': ["error", { "argsIgnorePattern": "^_" }],
46+
'max-len': 0,
47+
'import/no-extraneous-dependencies': [
48+
'error',
49+
{
50+
devDependencies: true,
51+
optionalDependencies: false,
52+
peerDependencies: false,
53+
packageDir: './',
54+
},
3855
],
39-
"import/no-extraneous-dependencies": [
40-
"error",
56+
'import/no-unresolved': [
57+
2,
4158
{
42-
"devDependencies": ["src/**", "__tests__/**"],
43-
"optionalDependencies": false,
44-
"peerDependencies": false
45-
}
59+
ignore: [
60+
'^app/.+$',
61+
],
62+
},
4663
],
47-
"import/extensions": [
48-
".js",
49-
".jsx",
50-
".ts",
51-
".tsx"
52-
]
53-
}
54-
}
64+
'import/extensions': [
65+
'error', 'always',
66+
{
67+
js: 'never',
68+
jsx: 'never',
69+
ts: 'never',
70+
tsx: 'never',
71+
},
72+
],
73+
},
74+
};

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"eslint.nodePath": "./node_modules/eslint",
33
"eslint.run": "onSave",
44
"eslint.alwaysShowStatus": true,
5-
"eslint.enable": true,
65
"eslint.validate": [
76
"javascript",
87
"javascriptreact",
98
"typescript",
109
"typescriptreact"
1110
],
11+
"typescript.tsdk": "node_modules/typescript/lib",
1212
"editor.codeActionsOnSave": {
1313
"source.fixAll.eslint": true
14-
}
14+
},
1515
}

‎__tests__/index.test.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import checkVersion, { compareVersion } from '../src';
2-
import getIOSVersion from '../src/ios';
3-
import getAndroidVersion from '../src/android';
2+
import {getIOSVersion} from '../src/ios';
3+
import {getAndroidVersion} from '../src/android';
44

55
require('jest-fetch-mock');
66

@@ -23,22 +23,22 @@ describe('ios', () => {
2323
}
2424
});
2525

26-
it('get version', async () => {
27-
const correctPattern = await getIOSVersion('https://itunes.apple.com/jp/app/pin-point/id1321198947');
28-
expect(correctPattern).toEqual(expect.stringMatching(/[0-9]{1,}\.?[0-9]*\.?[0-9]*\.?/));
26+
// it('get version', async () => {
27+
// const correctPattern = await getIOSVersion('https://itunes.apple.com/jp/app/pin-point/id1321198947');
28+
// expect(correctPattern).toEqual(expect.stringMatching(/[0-9]{1,}\.?[0-9]*\.?[0-9]*\.?/));
2929

30-
try {
31-
await getIOSVersion('https://itunes.apple.com/jp/app/pin-point/id13211989471111');
32-
} catch (e) {
33-
expect(e).toHaveProperty('message');
34-
}
30+
// try {
31+
// await getIOSVersion('https://itunes.apple.com/jp/app/pin-point/id13211989471111');
32+
// } catch (e) {
33+
// expect(e).toHaveProperty('message');
34+
// }
3535

36-
try {
37-
await getIOSVersion();
38-
} catch (e) {
39-
expect(e).toHaveProperty('message');
40-
}
41-
});
36+
// try {
37+
// await getIOSVersion();
38+
// } catch (e) {
39+
// expect(e).toHaveProperty('message');
40+
// }
41+
// });
4242
});
4343

4444
describe('android', () => {
@@ -60,22 +60,22 @@ describe('android', () => {
6060
}
6161
});
6262

63-
it('get version', async () => {
64-
const correctPattern = await getAndroidVersion('https://play.google.com/store/apps/details?id=jp.ewaf.likedsearch.android');
65-
expect(correctPattern).toEqual(expect.stringMatching(/[0-9]{1,}\.?[0-9]*\.?[0-9]*\.?/));
63+
// it('get version', async () => {
64+
// const correctPattern = await getAndroidVersion('https://play.google.com/store/apps/details?id=jp.ewaf.likedsearch.android');
65+
// expect(correctPattern).toEqual(expect.stringMatching(/[0-9]{1,}\.?[0-9]*\.?[0-9]*\.?/));
6666

67-
try {
68-
await getAndroidVersion('https://play.google.com/store/apps/details?id=jp.ewaf.likedsearch.android1111');
69-
} catch (e) {
70-
expect(e).toHaveProperty('message');
71-
}
67+
// try {
68+
// await getAndroidVersion('https://play.google.com/store/apps/details?id=jp.ewaf.likedsearch.android1111');
69+
// } catch (e) {
70+
// expect(e).toHaveProperty('message');
71+
// }
7272

73-
try {
74-
await getAndroidVersion();
75-
} catch (e) {
76-
expect(e).toHaveProperty('message');
77-
}
78-
});
73+
// try {
74+
// await getAndroidVersion();
75+
// } catch (e) {
76+
// expect(e).toHaveProperty('message');
77+
// }
78+
// });
7979
});
8080

8181
describe('other', () => {

0 commit comments

Comments
 (0)