Skip to content

Commit 2966604

Browse files
authored
sync new features and bugfixs from 4ee10fc (#1595)
1 parent 52b402c commit 2966604

File tree

262 files changed

+1905
-1109
lines changed

Some content is hidden

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

262 files changed

+1905
-1109
lines changed

.sync

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
442e6d0fea4d9f52ab21cd56bf9dea8522af25af
1+
4ee10fca8127a13f965ab9d735635c50e53a16ad

packages/babel-settings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"peerDependencies": {
3131
"@babel/polyfill": "^7.3.4",
32-
"babel-jest": "^24.5.0"
32+
"babel-jest": "^24.8.0"
3333
},
3434
"ci": {
3535
"ringcentral-js-widgets": "**"

packages/eslint-settings/.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ module.exports = {
9191
'no-mixed-operators': 0,
9292
'react/no-did-mount-set-state': 0, // dom size detection after mount may require setState in didMount
9393
'consistent-return': 0,
94+
'react/jsx-no-target-blank': 0
9495
},
9596
overrides: [
9697
{

packages/glip-widgets/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"gulp-istanbul": "^1.1.1",
4141
"gulp-sourcemaps": "^2.4.0",
4242
"identity-obj-proxy": "^3.0.0",
43-
"react-svg-loader": "^2.1.0",
43+
"react-svg-loader": "^3.0.3",
4444
"redux-logger": "^3.0.6",
4545
"redux-thunk": "^2.2.0",
4646
"yargs": "^11.1.0"
@@ -50,7 +50,7 @@
5050
"immutable": "^3.7.4",
5151
"prop-types": "^15.7.2",
5252
"ramda": "^0.25.0",
53-
"rc-editor-mention": "https://github.com/embbnux/editor-mention#release",
53+
"rc-editor-mention": "^1.1.13",
5454
"react-emojione": "^5.0.0",
5555
"react-markdown": "^3.1.4",
5656
"react-virtualized": "^9.19.1"

packages/i18n/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
},
2020
"devDependencies": {
2121
"@ringcentral-integration/babel-settings": "*",
22-
"babel-jest": "^24.5.0",
22+
"babel-jest": "^24.8.0",
2323
"faker": "^4.1.0",
2424
"fs-extra": "^7.0.1",
2525
"gulp": "^4.0.2",
2626
"gulp-babel": "^8.0.0",
2727
"gulp-sourcemaps": "^2.6.4",
28-
"jest": "^24.7.1"
28+
"jest": "^24.8.0"
2929
},
3030
"scripts": {
3131
"test": "jest",

packages/locale-loader/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"devDependencies": {
2727
"@babel/core": "^7.3.4",
2828
"@ringcentral-integration/babel-settings": "*",
29-
"babel-jest": "^24.5.0",
29+
"babel-jest": "^24.8.0",
3030
"gulp": "^4.0.2",
3131
"gulp-babel": "^8.0.0",
3232
"gulp-sourcemaps": "^2.6.4",
33-
"jest": "^24.7.1",
33+
"jest": "^24.8.0",
3434
"jest-junit": "^6.3.0"
3535
},
3636
"dependencies": {

packages/phone-number/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"peerDependencies": {},
2222
"devDependencies": {
2323
"@ringcentral-integration/babel-settings": "*",
24-
"babel-jest": "^24.5.0",
24+
"babel-jest": "^24.8.0",
2525
"fs-extra": "^7.0.1",
2626
"gulp": "^4.0.2",
2727
"gulp-babel": "^8.0.0",
2828
"gulp-sourcemaps": "^2.6.4",
29-
"jest": "^24.7.1",
29+
"jest": "^24.8.0",
3030
"jest-junit": "^6.3.0"
3131
},
3232
"scripts": {

packages/ringcentral-integration/integration-test/spec-modules/accountExtension.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import { ensureLogin } from '../utils/HelpUtil';
22
import { waitInSeconds } from '../utils/WaitUtil';
3-
import ClientHistoryRequest from '../utils/ClientHistoryRequest';
3+
// import ClientHistoryRequest from '../utils/ClientHistoryRequest';
44
import * as mock from '../mock';
55

66
const authzProfileBody = require('../mock/data/authzProfile');
77

88
export default (auth, client, accountExtension, account) => {
9-
describe('AccountExtension:', function () {
9+
describe('AccountExtension:', () => {
1010
this.timeout(20000);
1111
mock.mockClient(client);
1212

1313
let isLoginSuccess;
14-
const clientHistoryRequest = new ClientHistoryRequest(new Map(), client);
14+
// const clientHistoryRequest = new ClientHistoryRequest(new Map(), client);
1515

16-
afterEach(async function () {
16+
afterEach(async () => {
1717
await auth.logout();
1818
await waitInSeconds(1);
1919
});

packages/ringcentral-integration/integration-test/spec-modules/accountInfo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import permissionsMessages from '../../modules/RolesAndPermissions/permissionsMe
77
const authzProfileBody = require('../mock/data/authzProfile');
88

99
export default (auth, client, accountInfo, account, alert) => {
10-
describe('AccountInfo:', function () {
10+
describe('AccountInfo:', () => {
1111
this.timeout(20000);
1212
mock.mockClient(client);
1313

1414
let isLoginSuccess;
1515
const clientHistoryRequest = new ClientHistoryRequest(new Map(), client);
1616

17-
afterEach(async function () {
17+
afterEach(async () => {
1818
if (auth.loggedIn) {
1919
await auth.logout();
2020
}

packages/ringcentral-integration/integration-test/spec-modules/accountPhoneNumber.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import * as mock from '../mock';
66
const authzProfileBody = require('../mock/data/authzProfile');
77

88
export default (auth, client, accountPhoneNumber, account) => {
9-
describe('AccountPhoneNumber:', function () {
9+
describe('AccountPhoneNumber:', () => {
1010
this.timeout(20000);
1111
mock.mockClient(client);
1212

1313
let isLoginSuccess;
1414
const clientHistoryRequest = new ClientHistoryRequest(new Map(), client);
1515

16-
describe('when there is ReadCompanyPhoneNumbers permission:', function () {
16+
describe('when there is ReadCompanyPhoneNumbers permission:', () => {
1717
before(async function() {
1818
mock.restore();
1919
mock.mockForLogin();
@@ -24,7 +24,7 @@ export default (auth, client, accountPhoneNumber, account) => {
2424
}
2525
});
2626

27-
after(async function () {
27+
after(async () => {
2828
await auth.logout();
2929
await waitInSeconds(1);
3030
});
@@ -42,7 +42,7 @@ export default (auth, client, accountPhoneNumber, account) => {
4242
});
4343
});
4444

45-
describe("when there isn't ReadCompanyPhoneNumbers permission:", function () {
45+
describe("when there isn't ReadCompanyPhoneNumbers permission:", () => {
4646
before(async function() {
4747
mock.restore();
4848
mock.mockForLogin({ mockAuthzProfile: false });
@@ -56,7 +56,7 @@ export default (auth, client, accountPhoneNumber, account) => {
5656
}
5757
});
5858

59-
after(async function () {
59+
after(async () => {
6060
await auth.logout();
6161
await waitInSeconds(1);
6262
});

0 commit comments

Comments
 (0)