Skip to content

Commit 926b169

Browse files
committedFeb 11, 2019
commit build
1 parent ed4f483 commit 926b169

7 files changed

+3803
-1010
lines changed
 

‎.eslintrc

+27-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
{
2-
extends: [ 'prettier'],
2+
root: true,
3+
"env": {
4+
"node": true,
5+
"es6": true,
6+
"mocha": true
7+
},
8+
extends: [
9+
'plugin:vue/recommended',
10+
'@vue/prettier',
11+
'eslint:recommended',
12+
'plugin:security/recommended'
13+
],
314
rules: {
4-
'prefer-destructuring': 'off',
5-
'consistent-return': 'off',
6-
'no-underscore-dangle': 'off',
7-
'no-multi-assign': 'off',
8-
'class-methods-use-this': 'off'
9-
}
15+
'no-console': 'error',
16+
'no-debugger': 'error',
17+
'no-else-return': ['error', { allowElseIf: true }],
18+
'arrow-parens': 'off',
19+
'generator-star-spacing': 'off',
20+
semi: 'off',
21+
'prefer-const': 'error',
22+
'no-var': 'error',
23+
'security/detect-new-buffer': 'off',
24+
'security/detect-object-injection': 'off'
25+
},
26+
parserOptions: {
27+
parser: 'babel-eslint'
28+
},
29+
plugins: ['security']
1030
}

‎dist/index.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var debugLogger = _interopDefault(require('debug'));
1414
var io = _interopDefault(require('socket.io-client'));
1515
var SimplePeer = _interopDefault(require('simple-peer'));
1616

17-
var version = "1.0.8";
17+
var version = "1.0.9";
1818

1919
var version$1 = version;
2020

@@ -85,7 +85,7 @@ var lifeCycle = {
8585
sendOffer: 'sendOffer',
8686
answerReceived: 'answerReceived',
8787
RtcConnectedEvent: 'RtcConnectedEvent',
88-
RtcConnectedEmitted: "RtcConnectedEmitted",
88+
RtcConnectedEmitted: 'RtcConnectedEmitted',
8989
RtcClosedEvent: 'RtcClosedEvent',
9090
RtcDisconnectEvent: 'RtcDisconnectEvent',
9191
RtcFailedEvent: 'RtcFailedEvent',
@@ -272,18 +272,17 @@ var MewConnectCommon = function (_EventEmitter) {
272272
}
273273
var browserVersion = browser.version.split(0, 1)[0];
274274
/*
275-
* Chrome > 23
276-
* Firefox > 22
277-
* Opera > 18
278-
* Safari > 11 (caveats exist)
279-
* Edge - none (RTCDataChannel not supported)
280-
* IE - none
281-
* */
275+
* Chrome > 23
276+
* Firefox > 22
277+
* Opera > 18
278+
* Safari > 11 (caveats exist)
279+
* Edge - none (RTCDataChannel not supported)
280+
* IE - none
281+
* */
282282
if (typeof window !== 'undefined') {
283283
if (browser.name === 'safari') {
284284
// eslint-disable-next-line global-require
285285
require('webrtc-adapter');
286-
// console.log(adapter); // todo remove dev item
287286
return MewConnectCommon.buildBrowserResult(true, 'Safari', 'version: ' + browser.version);
288287
}
289288
if (browser.name === 'ie') {
@@ -1013,7 +1012,6 @@ var MewConnectInitiator = function (_MewConnectCommon) {
10131012
this.socketEmit(this.signals.rtcConnected, this.socketKey);
10141013
this.socketDisconnect();
10151014
this.uiCommunicator(this.lifeCycle.RtcConnectedEvent);
1016-
this.uiCommunicator(this.lifeCycle.RtcConnectedEvent);
10171015
}
10181016
}, {
10191017
key: 'onData',

‎package-lock.json

+3,749-979
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"name": "@myetherwallet/mewconnect-web-client",
33
"homepage": "https://github.com/myetherwallet/MEWconnect-web-client",
44
"version": "1.0.9",
5-
"main": "./src",
6-
"distMain": "./dist/index.js",
5+
"main": "./dist/index.js",
76
"scripts": {
87
"start": "node ./example/peer_server/www.js",
98
"test:jest": "jest --detectOpenHandles --forceExit --runInBand",
@@ -32,7 +31,11 @@
3231
"webrtc-adapter": "^6.4.3"
3332
},
3433
"devDependencies": {
34+
"@vue/cli-plugin-babel": "3.4.0",
35+
"@vue/cli-plugin-eslint": "3.4.0",
36+
"@vue/eslint-config-prettier": "^4.0.1",
3537
"babel-core": "^6.26.3",
38+
"babel-eslint": "^10.0.1",
3639
"babel-jest": "*",
3740
"babel-loader": "^7.1.5",
3841
"babel-plugin-external-helpers": "^6.22.0",
@@ -48,6 +51,7 @@
4851
"eslint-config-airbnb-base": "^13.1.0",
4952
"eslint-config-prettier": "^3.0.1",
5053
"eslint-plugin-import": "^2.14.0",
54+
"eslint-plugin-security": "^1.4.0",
5155
"jest": "^23.6.0",
5256
"nyc": "^13.0.1",
5357
"opn": "^5.4.0",

‎src/MewConnectCommon.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@ export default class MewConnectCommon extends EventEmitter {
8989

9090
static checkBrowser() {
9191
let browser = detect();
92-
if(browser === null){
93-
browser = {version: {split: () => [1]}}
92+
if (browser === null) {
93+
browser = { version: { split: () => [1] } };
9494
}
9595
const browserVersion = browser.version.split(0, 1)[0];
9696
/*
97-
* Chrome > 23
98-
* Firefox > 22
99-
* Opera > 18
100-
* Safari > 11 (caveats exist)
101-
* Edge - none (RTCDataChannel not supported)
102-
* IE - none
103-
* */
97+
* Chrome > 23
98+
* Firefox > 22
99+
* Opera > 18
100+
* Safari > 11 (caveats exist)
101+
* Edge - none (RTCDataChannel not supported)
102+
* IE - none
103+
* */
104104
if (typeof window !== 'undefined') {
105105
if (browser.name === 'safari') {
106106
// eslint-disable-next-line global-require

‎src/MewConnectInitiator.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ export default class MewConnectInitiator extends MewConnectCommon {
346346
this.p.on(this.rtcEvents.signal, signalListener.bind(this));
347347
this.p._pc.addEventListener('iceconnectionstatechange', evt => {
348348
// eslint-disable-next-line no-undef
349-
if(typeof jest === 'undefined'){ // included because target is not defined in jest
349+
if (typeof jest === 'undefined') {
350+
// included because target is not defined in jest
350351
debug(`iceConnectionState: ${evt.target.iceConnectionState}`);
351352
if (
352353
evt.target.iceConnectionState === 'connected' ||

‎src/constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const lifeCycle = {
7979
sendOffer: 'sendOffer',
8080
answerReceived: 'answerReceived',
8181
RtcConnectedEvent: 'RtcConnectedEvent',
82-
RtcConnectedEmitted: "RtcConnectedEmitted",
82+
RtcConnectedEmitted: 'RtcConnectedEmitted',
8383
RtcClosedEvent: 'RtcClosedEvent',
8484
RtcDisconnectEvent: 'RtcDisconnectEvent',
8585
RtcFailedEvent: 'RtcFailedEvent',

0 commit comments

Comments
 (0)
Please sign in to comment.