Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: move testing dependencies to workspace and bump dependencies #552

Merged
merged 4 commits into from Apr 6, 2020
Merged

chore: move testing dependencies to workspace and bump dependencies #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b8b8b2
chore: move testing dependencies to workspace and bump dependencies
chentsulin Apr 6, 2020
d0de97a
chore: modify config.url assertions
chentsulin Apr 6, 2020
964c392
Merge branch 'master' into move-test-deps-workspace
chentsulin Apr 6, 2020
1f74110
Merge branch 'master' into move-test-deps-workspace
chentsulin Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ module.exports = {
plugins: ['@typescript-eslint'],
rules: {
'import/no-extraneous-dependencies': 'off',
'import/extensions': 'off',

'@typescript-eslint/camelcase': 'off',
},
Expand Down
40 changes: 21 additions & 19 deletions package.json
View file
Open in desktop
Expand Up @@ -30,33 +30,35 @@
"devDependencies": {
"@types/append-query": "^2.0.0",
"@types/debug": "^4.1.5",
"@types/invariant": "^2.2.30",
"@types/jest": "^24.0.23",
"@types/lodash": "^4.14.148",
"@types/invariant": "^2.2.31",
"@types/jest": "^25.2.1",
"@types/lodash": "^4.14.149",
"@types/map-obj": "^3.1.0",
"@types/pascal-case": "^1.1.2",
"@types/url-join": "^4.0.0",
"@types/warning": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^2.7.0",
"@typescript-eslint/parser": "^2.7.0",
"chalk": "^3.0.0",
"eslint": "^6.6.0",
"eslint-config-prettier": "^6.5.0",
"eslint-config-yoctol-base": "^0.21.2",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^3.1.1",
"@typescript-eslint/eslint-plugin": "^2.26.0",
"@typescript-eslint/parser": "^2.26.0",
"axios": "^0.19.2",
"axios-mock-adapter": "^1.18.1",
"chalk": "^4.0.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.1",
"eslint-config-yoctol-base": "^0.22.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-sort-imports-es6-autofix": "^0.5.0",
"husky": "^3.0.9",
"jest": "^24.9.0",
"lerna": "^3.18.4",
"lint-staged": "^9.4.3",
"husky": "^4.2.3",
"jest": "^25.2.7",
"lerna": "^3.20.2",
"lint-staged": "^10.1.2",
"micromatch": "^4.0.2",
"mkdir": "^0.0.2",
"prettier": "^1.19.1",
"prettier-package-json": "^2.1.0",
"rimraf": "^3.0.0",
"ts-jest": "^24.1.0",
"typescript": "^3.7.2"
"prettier-package-json": "^2.1.3",
"rimraf": "^3.0.2",
"ts-jest": "^25.3.1",
"typescript": "^3.8.3"
},
"engines": {
"node": ">=8"
Expand Down
5 changes: 2 additions & 3 deletions packages/axios-error/package.json
View file
Open in desktop
Expand Up @@ -9,9 +9,8 @@
"version": "1.0.0-beta.5",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"devDependencies": {
"axios": "^0.19.0",
"axios-mock-adapter": "^1.17.0"
"dependencies": {
"axios": "^0.19.2"
},
"keywords": [
"axios",
Expand Down
8 changes: 4 additions & 4 deletions packages/messaging-api-common/package.json
View file
Open in desktop
Expand Up @@ -10,13 +10,13 @@
"main": "dist/index.js",
"types": "dist/index.d.ts",
"dependencies": {
"axios": "^0.19.0",
"camel-case": "^3.0.0",
"axios": "^0.19.2",
"camel-case": "^4.1.1",
"debug": "^4.1.1",
"lodash": "^4.17.15",
"map-obj": "^4.1.0",
"pascal-case": "^2.0.1",
"snake-case": "^2.1.0",
"pascal-case": "^3.1.1",
"snake-case": "^3.0.3",
"url-join": "^4.0.1"
},
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions packages/messaging-api-common/src/case.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import camelCase from 'camel-case';
import mapObject from 'map-obj';
import pascalCase from 'pascal-case';
import snakeCase from 'snake-case';
import { camelCase } from 'camel-case';
import { pascalCase } from 'pascal-case';
import { snakeCase } from 'snake-case';

function isLastCharNumber(key: string) {
return /^\d$/.test(key[key.length - 1]);
Expand Down
6 changes: 2 additions & 4 deletions packages/messaging-api-line/package.json
View file
Open in desktop
Expand Up @@ -11,16 +11,14 @@
"browser": "lib/browser.js",
"types": "dist/index.d.ts",
"dependencies": {
"axios": "^0.19.0",
"axios": "^0.19.2",
"axios-error": "file:../axios-error",
"image-type": "^4.1.0",
"invariant": "^2.2.4",
"messaging-api-common": "file:../messaging-api-common",
"warning": "^4.0.3"
},
"devDependencies": {
"axios-mock-adapter": "^1.17.0"
},
"devDependencies": {},
"keywords": [
"bot",
"chatbot",
Expand Down
8 changes: 4 additions & 4 deletions packages/messaging-api-line/src/LineNotify.ts
View file
Open in desktop
Expand Up @@ -141,7 +141,7 @@ export default class LineNotify {
code,
};
return this.axios
.post('oauth/token', querystring.encode(formData), { headers })
.post('/oauth/token', querystring.encode(formData), { headers })
.then(res => res.data.access_token, handleError);
}

Expand Down Expand Up @@ -178,7 +178,7 @@ export default class LineNotify {
Authorization: `Bearer ${accessToken}`,
};
return this.apiAxios
.get('api/status', { headers })
.get('/api/status', { headers })
.then(throwWhenNotSuccess, handleError);
}

Expand Down Expand Up @@ -218,7 +218,7 @@ export default class LineNotify {
...options,
};
return this.apiAxios
.post('api/notify', querystring.encode(formData), { headers })
.post('/api/notify', querystring.encode(formData), { headers })
.then(throwWhenNotSuccess, handleError);
}

Expand Down Expand Up @@ -255,7 +255,7 @@ export default class LineNotify {
Authorization: `Bearer ${accessToken}`,
};
return this.apiAxios
.post('api/revoke', {}, { headers })
.post('/api/revoke', {}, { headers })
.then(throwWhenNotSuccess, handleError);
}
}
72 changes: 20 additions & 52 deletions packages/messaging-api-line/src/__tests__/LineClient-audience.spec.ts
View file
Open in desktop
Expand Up @@ -53,9 +53,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onPost().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/upload'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/upload');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -85,9 +83,7 @@ describe('Audience', () => {
});

mock.onPost().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/upload'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/upload');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -131,9 +127,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onPut().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/upload'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/upload');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -163,9 +157,7 @@ describe('Audience', () => {
});

mock.onPut().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/upload'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/upload');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -211,9 +203,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onPost().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/click'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/click');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand All @@ -238,9 +228,7 @@ describe('Audience', () => {
});

mock.onPost().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/click'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/click');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -279,9 +267,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onPost().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/imp'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/imp');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand All @@ -303,9 +289,7 @@ describe('Audience', () => {
});

mock.onPost().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/imp'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/imp');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -339,7 +323,7 @@ describe('Audience', () => {

mock.onPut().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/${audienceGroupId}/updateDescription`
`/v2/bot/audienceGroup/${audienceGroupId}/updateDescription`
);
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
Expand All @@ -363,7 +347,7 @@ describe('Audience', () => {

mock.onPut().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/${audienceGroupId}/updateDescription`
`/v2/bot/audienceGroup/${audienceGroupId}/updateDescription`
);
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
Expand Down Expand Up @@ -393,9 +377,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onDelete().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/${audienceGroupId}`
);
expect(config.url).toEqual(`/v2/bot/audienceGroup/${audienceGroupId}`);
expect(config.headers).toEqual(headers);
return [200, reply];
});
Expand All @@ -413,9 +395,7 @@ describe('Audience', () => {
});

mock.onDelete().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/${audienceGroupId}`
);
expect(config.url).toEqual(`/v2/bot/audienceGroup/${audienceGroupId}`);
expect(config.headers).toEqual(headers);
return [200, reply];
});
Expand Down Expand Up @@ -449,9 +429,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onGet().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/${audienceGroupId}`
);
expect(config.url).toEqual(`/v2/bot/audienceGroup/${audienceGroupId}`);
expect(config.headers).toEqual(headers);
return [200, reply];
});
Expand All @@ -469,9 +447,7 @@ describe('Audience', () => {
});

mock.onGet().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/${audienceGroupId}`
);
expect(config.url).toEqual(`/v2/bot/audienceGroup/${audienceGroupId}`);
expect(config.headers).toEqual(headers);
return [200, reply];
});
Expand Down Expand Up @@ -516,7 +492,7 @@ describe('Audience', () => {

mock.onGet().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/list?page=${page}&description=${description}&status=${status}&size=${size}`
`/v2/bot/audienceGroup/list?page=${page}&description=${description}&status=${status}&size=${size}`
);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand All @@ -541,7 +517,7 @@ describe('Audience', () => {

mock.onGet().reply(config => {
expect(config.url).toEqual(
`https://api.line.me/v2/bot/audienceGroup/list?page=${page}&description=${description}&status=${status}&size=${size}`
`/v2/bot/audienceGroup/list?page=${page}&description=${description}&status=${status}&size=${size}`
);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down Expand Up @@ -570,9 +546,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onGet().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/authorityLevel'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/authorityLevel');
expect(config.headers).toEqual(headers);
return [200, reply];
});
Expand All @@ -590,9 +564,7 @@ describe('Audience', () => {
});

mock.onGet().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/authorityLevel'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/authorityLevel');
expect(config.headers).toEqual(headers);
return [200, reply];
});
Expand All @@ -618,9 +590,7 @@ describe('Audience', () => {
const { client, mock, headers } = createMock();

mock.onPut().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/authorityLevel'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/authorityLevel');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand All @@ -639,9 +609,7 @@ describe('Audience', () => {
});

mock.onPut().reply(config => {
expect(config.url).toEqual(
'https://api.line.me/v2/bot/audienceGroup/authorityLevel'
);
expect(config.url).toEqual('/v2/bot/audienceGroup/authorityLevel');
expect(JSON.parse(config.data)).toEqual(body);
expect(config.headers).toEqual(headers);
return [200, reply];
Expand Down