File tree Expand file tree Collapse file tree 3 files changed +75
-58
lines changed Expand file tree Collapse file tree 3 files changed +75
-58
lines changed Original file line number Diff line number Diff line change 16
16
},
17
17
"dependencies" : {
18
18
"detect-browser" : " ^4.0.4" ,
19
- "rxjs" : " ^6.3.3 " ,
19
+ "rxjs" : " ^6.4.0 " ,
20
20
"semver-compare" : " ^1.0.0" ,
21
21
"socket.io-client" : " 2.2.0"
22
22
},
23
23
"devDependencies" : {
24
24
"babel-cli" : " ^6.26.0" ,
25
25
"babel-core" : " ^6.26.3" ,
26
26
"babel-eslint" : " ^10.0.1" ,
27
- "babel-loader" : " ^7.1.4 " ,
27
+ "babel-loader" : " ^7.1.5 " ,
28
28
"babel-plugin-transform-object-rest-spread" : " ^6.26.0" ,
29
29
"babel-preset-env" : " ^1.7.0" ,
30
30
"babel-preset-es2015" : " ^6.24.1" ,
33
33
"cross-env" : " ^5.2.0" ,
34
34
"eslint" : " ^5.12.1" ,
35
35
"eslint-config-airbnb-base" : " ^13.1.0" ,
36
- "eslint-plugin-import" : " ^2.14 .0" ,
36
+ "eslint-plugin-import" : " ^2.16 .0" ,
37
37
"html-webpack-plugin" : " ^3.2.0" ,
38
38
"react" : " ^16.7.0" ,
39
39
"react-dom" : " ^16.7.0" ,
40
40
"rimraf" : " ^2.6.3" ,
41
41
"rollup" : " ^0.59.4" ,
42
- "rollup-plugin-babel" : " ^3.0.4 " ,
42
+ "rollup-plugin-babel" : " ^3.0.7 " ,
43
43
"rollup-plugin-commonjs" : " ^9.1.3" ,
44
44
"rollup-plugin-node-resolve" : " ^3.3.0" ,
45
45
"rollup-plugin-replace" : " ^2.0.0" ,
Original file line number Diff line number Diff line change @@ -168,9 +168,8 @@ export default class SocketDaemon extends Daemon {
168
168
this . error . next ( 'plugin version incompatible' ) ;
169
169
return Promise . reject ( new Error ( 'plugin version incompatible' ) ) ;
170
170
} ) )
171
- . catch ( ( ) =>
172
- // If version API broken, go ahead with current version
173
- this . agentInfo ) ;
171
+ // If version API broken, go ahead with current version
172
+ . catch ( ( ) => this . agentInfo ) ;
174
173
}
175
174
176
175
// Set channelOpen false for the first time
@@ -355,10 +354,7 @@ export default class SocketDaemon extends Daemon {
355
354
*/
356
355
closeSerialMonitor ( port ) {
357
356
const serialPort = this . devicesList . getValue ( ) . serial . find ( p => p . Name === port ) ;
358
- if ( ! serialPort ) {
359
- return this . serialMonitorOpened . error ( new Error ( `Can't find board at ${ port } ` ) ) ;
360
- }
361
- if ( ! serialPort . IsOpen ) {
357
+ if ( ! serialPort || ! serialPort . IsOpen ) {
362
358
return ;
363
359
}
364
360
You can’t perform that action at this time.
0 commit comments