Merge d237b04 into 6d5f72f

ringcentral · Jan 1, 2020 · 458d42b · 458d42b
2 parents 6d5f72f + d237b04
commit 458d42b
Show file tree

Hide file tree

Showing 117 changed files with 546 additions and 476 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,12 +7,19 @@
       "experimentalObjectRestSpread": true
     }
   },
-  "parser": "typescript-eslint-parser",
-  "plugins": ["typescript"],
+  "parser": "@typescript-eslint/parser",
+  "plugins": [
+    "typescript"
+  ],
   "env": {
     "es6": true,
     "node": true
   },
+  "settings": {
+    "react": {
+      "version": "16.7.18"
+    }
+  },
   "rules": {
     "typescript/type-annotation-spacing": [2, {
       "before": false,

diff --git a/bin/publish.js b/bin/publish.js
@@ -32,7 +32,7 @@ async function task(pkg) {
                     location: pkg.location,
                     published,
                 });
-            }
+            },
         );
     });
 }

diff --git a/package.json b/package.json
@@ -15,9 +15,8 @@
     "cleanup:packages": "lerna clean --yes && lerna exec --parallel -- node ../../bin/cleanup",
     "add-package-files": "lerna exec --no-sort -- node ../../bin/add-package-files",
     "generate-readme": "lerna exec --no-sort -- node ../../bin/generate-readme",
-    "lint": "npm run lint:src && npm run lint:test",
-    "lint:src": "lerna exec --parallel --ignore=\"@testring/@(e2e-test-app)\" -- eslint \"./src/**/*.[tj]s\"",
-    "lint:test": "lerna exec --parallel --no-sort --ignore=\"@testring/@(ui-kit|types)\" -- eslint ./test/**/*.[tj]s",
+    "lint": "lerna exec --parallel --no-sort -- eslint ./**/*.ts",
+    "lint:fix": "lerna exec --parallel --no-sort --no-bail -- eslint --fix ./**/*.ts",
     "test": "lerna exec --ignore=\"@testring/@(ui-kit|types|e2e-test-app)\" -- mocha --opts mocha.opts",
     "test:watch": "lerna exec --ignore=\"@testring/@(ui-kit|types|e2e-test-app)\" --parallel -- mocha --opts mocha.opts --watch",
     "test:e2e": "lerna run --stream --scope @testring/e2e-test-app e2e",
@@ -36,7 +35,7 @@
     "publish:version": "lerna version --exact",
     "publish:ci": "node ./bin/publish.js",
     "storybook": "lerna run --stream --scope @testring/ui-kit storybook",
-    "check-deps": "check-deps:precommit && npm run check-deps:root && npm run check-deps:packages",
+    "check-deps": "npm run check-deps:precommit && npm run check-deps:root && npm run check-deps:packages",
     "check-deps:precommit": "lerna exec -- node ../../bin/check-packages-versions",
     "check-deps:root": "npm-check -u",
     "check-deps:packages": "lerna exec --no-bail -- npm-check --no-color --no-emoji --ignore @testring/*",
@@ -72,22 +71,26 @@
     ]
   },
   "devDependencies": {
-    "@lerna/batch-packages": "3.13.0",
-    "@lerna/filter-packages": "3.13.0",
-    "@lerna/project": "3.13.1",
-    "@lerna/run-parallel-batches": "3.13.0",
+    "@lerna/batch-packages": "3.16.0",
+    "@lerna/filter-packages": "3.18.0",
+    "@lerna/project": "3.18.0",
+    "@lerna/run-parallel-batches": "3.16.0",
     "@types/chai": "4.1.7",
     "@types/mocha": "5.2.5",
-    "@types/node": "10.5.6",
+    "@types/node": "12.12.21",
+    "@typescript-eslint/parser": "2.14.0",
     "babel-eslint": "10.0.1",
     "chai": "4.2.0",
     "coveralls": "3.0.2",
-    "eslint": "5.12.0",
-    "eslint-config-ringcentral": "0.3.1",
-    "eslint-plugin-react": "7.9.1",
+    "eslint": "6.8.0",
+    "eslint-config-ringcentral": "3.0.0",
+    "eslint-plugin-import": "2.19.1",
+    "eslint-plugin-react": "7.17.0",
+    "eslint-plugin-ringcentral": "3.0.0",
+    "eslint-plugin-sonarjs": "0.5.0",
     "eslint-plugin-typescript": "0.14.0",
     "glob": "7.1.3",
-    "lerna": "3.13.1",
+    "lerna": "3.20.1",
     "lerna-update-wizard": "0.11.1",
     "mocha": "5.2.0",
     "npm-check": "5.9.0",
@@ -96,8 +99,7 @@
     "pre-commit": "1.2.2",
     "rimraf": "2.6.3",
     "sinon": "7.2.2",
-    "ts-node": "7.0.1",
-    "typescript": "3.1.1",
-    "typescript-eslint-parser": "21.0.2"
+    "ts-node": "8.5.4",
+    "typescript": "3.7.3"
   }
 }
diff --git a/packages/api/src/run.ts b/packages/api/src/run.ts
@@ -9,7 +9,7 @@ function getValidCopyVmError(error) {
         return error;
     }
 
-    // TODO check signature
+    // TODO (flops) check signature
     let tmpError = new Error(error.message);
     tmpError.stack = error.stack;
     return tmpError;

diff --git a/packages/api/src/test-context.ts b/packages/api/src/test-context.ts
@@ -97,7 +97,7 @@ export class TestContext {
         for (const customApplication of this.customApplications) {
             if (!customApplication.isStopped()) {
                 requests.push(
-                    customApplication.end()
+                    customApplication.end(),
                 );
             }
         }

diff --git a/packages/async-breakpoints/package.json b/packages/async-breakpoints/package.json
@@ -13,6 +13,7 @@
     "url": "https://github.com/ringcentral/testring/issues"
   },
   "devDependencies": {
+    "@types/node": "12.12.21",
     "chai": "4.2.0"
   }
 }
diff --git a/packages/async-breakpoints/src/async-breakpoints.ts b/packages/async-breakpoints/src/async-breakpoints.ts
@@ -70,15 +70,15 @@ export class AsyncBreakpoints extends EventEmitter {
 
     async waitForBreakpoint(
         type: BreakpointsTypes,
-        hasBreakpointCallback: HasBreakpointCallback
+        hasBreakpointCallback: HasBreakpointCallback,
     ): Promise<void> {
         if (this.breakpoints.has(type)) {
             await hasBreakpointCallback(true);
             return this.breakpoints.get(type) as Promise<void>;
-        } else {
+        }
             await hasBreakpointCallback(false);
             return Promise.resolve();
-        }
+
     }
 
 
@@ -87,7 +87,7 @@ export class AsyncBreakpoints extends EventEmitter {
     }
 
     public async waitBeforeInstructionBreakpoint(
-        hasBreakpointCallback: HasBreakpointCallback = () => undefined
+        hasBreakpointCallback: HasBreakpointCallback = () => undefined,
     ): Promise<void> {
         return this.waitForBreakpoint(
             BreakpointsTypes.beforeInstruction,
@@ -109,7 +109,7 @@ export class AsyncBreakpoints extends EventEmitter {
     }
 
     public async waitAfterInstructionBreakpoint(
-        hasBreakpointCallback: HasBreakpointCallback = () => undefined
+        hasBreakpointCallback: HasBreakpointCallback = () => undefined,
     ): Promise<void> {
         return this.waitForBreakpoint(
             BreakpointsTypes.afterInstruction,

diff --git a/packages/async-breakpoints/test/async-breakpoints.spec.ts b/packages/async-breakpoints/test/async-breakpoints.spec.ts
@@ -1,4 +1,5 @@
 /// <reference types="mocha" />
+/* eslint sonarjs/no-identical-functions: 0 */
 import * as chai from 'chai';
 
 import { AsyncBreakpoints, BreakStackError } from '../src';

diff --git a/packages/browser-proxy/package.json b/packages/browser-proxy/package.json
@@ -16,7 +16,6 @@
     "@testring/transport": "0.5.14",
     "@testring/types": "0.5.14",
     "@testring/utils": "0.5.14",
-    "@types/node": "10.5.6",
     "@types/yargs": "12.0.0",
     "yargs": "12.0.1"
   },

diff --git a/packages/browser-proxy/src/browser-proxy-worker.ts b/packages/browser-proxy/src/browser-proxy-worker.ts
@@ -41,7 +41,7 @@ export class BrowserProxyWorker implements IBrowserProxyWorker {
                 if (this.workerID === source) {
                     this.onCommandResponse(response);
                 }
-            }
+            },
         );
 
         this.transport.on(BrowserProxyMessageTypes.exception, (error, source) => {
@@ -68,11 +68,11 @@ export class BrowserProxyWorker implements IBrowserProxyWorker {
             }
 
             return resolve(response);
-        } else {
+        } 
             this.logger.error(`Browser Proxy controller: cannot find command with uid ${uid}`);
 
             throw new ReferenceError(`Cannot find command with uid ${uid}`);
-        }
+
     }
 
     private onProxyConnect(): void {
@@ -96,7 +96,7 @@ export class BrowserProxyWorker implements IBrowserProxyWorker {
         this.logger.debug(
             'Browser Proxy controller: miss connection with child process',
             'code', code,
-            'error', error
+            'error', error,
         );
 
 
@@ -118,7 +118,7 @@ export class BrowserProxyWorker implements IBrowserProxyWorker {
                 uid,
                 command,
                 applicant,
-            }
+            },
         ).catch((err) => {
             this.logger.error(err);
         });
@@ -138,13 +138,21 @@ export class BrowserProxyWorker implements IBrowserProxyWorker {
 
         this.worker.on('exit', this.onExit);
 
-        this.worker.stdout.on('data', (message) => {
-            this.logger.log(`[logged] ${message.toString()}`);
-        });
+        if (this.worker.stdout) {
+            this.worker.stdout.on('data', (message) => {
+                this.logger.log(`[logged] ${message.toString()}`);
+            });
+        } else {
+            this.logger.warn(`[logged] The STDOUT of worker ${this.workerID} is null`);
+        }
 
-        this.worker.stderr.on('data', (message) => {
-            this.logger.warn(`[logged] ${message.toString()}`);
-        });
+        if (this.worker.stderr) {
+            this.worker.stderr.on('data', (message) => {
+                this.logger.warn(`[logged] ${message.toString()}`);
+            });
+        } else {
+            this.logger.warn(`[logged] The STDERR of worker ${this.workerID} is null`);
+        }
 
         this.transport.registerChild(this.workerID, this.worker);
 

diff --git a/packages/browser-proxy/src/browser-proxy/browser-proxy.ts b/packages/browser-proxy/src/browser-proxy/browser-proxy.ts
@@ -29,7 +29,7 @@ export class BrowserProxy {
     constructor(
         private transportInstance: ITransport,
         pluginPath: string,
-        pluginConfig: any
+        pluginConfig: any,
     ) {
         this.loadPlugin(pluginPath, pluginConfig);
         this.registerCommandListener();
@@ -50,7 +50,7 @@ export class BrowserProxy {
             } catch (error) {
                 this.transportInstance.broadcast(
                     BrowserProxyMessageTypes.exception,
-                    error
+                    error,
                 );
             }
         }
@@ -59,14 +59,14 @@ export class BrowserProxy {
     private registerCommandListener() {
         this.transportInstance.on(
             BrowserProxyMessageTypes.execute,
-            (message) => this.onMessage(message)
+            (message) => this.onMessage(message),
         );
     }
 
     private sendEmptyResponse(uid: string) {
         this.transportInstance.broadcast(
             BrowserProxyMessageTypes.response,
-            { uid }
+            { uid },
         );
     }
 
@@ -86,9 +86,9 @@ export class BrowserProxy {
                 ) {
                     this.sendEmptyResponse(uid);
                     return;
-                } else {
+                } 
                     throw new ReferenceError('Cannot find browser proxy plugin!');
-                }
+
             }
 
             if (command.action === BrowserProxyActions.kill) {
@@ -103,7 +103,7 @@ export class BrowserProxy {
                     uid,
                     response,
                     error: null,
-                }
+                },
             );
         } catch (error) {
             this.transportInstance.broadcast<IBrowserProxyCommandResponse>(
@@ -112,7 +112,7 @@ export class BrowserProxy {
                     uid,
                     error,
                     response: null,
-                }
+                },
             );
         }
     }

diff --git a/packages/browser-proxy/test/browser-proxy-controller.functional.spec.ts b/packages/browser-proxy/test/browser-proxy-controller.functional.spec.ts
@@ -1,4 +1,5 @@
 /// <reference types="mocha" />
+/* eslint sonarjs/no-identical-functions: 0 */
 
 import * as path from 'path';
 import * as chai from 'chai';

diff --git a/packages/browser-proxy/test/browser-proxy.spec.ts b/packages/browser-proxy/test/browser-proxy.spec.ts
@@ -1,4 +1,5 @@
 /// <reference types="mocha" />
+/* eslint sonarjs/no-identical-functions: 0 */
 
 import * as path from 'path';
 import * as chai from 'chai';
@@ -40,7 +41,7 @@ describe('Browser proxy', () => {
                 uid,
                 applicant: 'test',
                 command: commandMock,
-            }
+            },
         );
     });
 
@@ -61,7 +62,7 @@ describe('Browser proxy', () => {
             {
                 uid,
                 command: commandMock,
-            }
+            },
         );
     });
 
@@ -77,7 +78,7 @@ describe('Browser proxy', () => {
                 chai.expect(response).to.have.property('error');
 
                 callback();
-            }
+            },
         );
 
         transport.emit(
@@ -88,7 +89,7 @@ describe('Browser proxy', () => {
                     action: 'barrelRoll' as BrowserProxyActions,
                     arguments: ['foo', 'bar'],
                 },
-            }
+            },
         );
     });
 });
diff --git a/packages/browser-proxy/test/fixtures/async-plugin.ts b/packages/browser-proxy/test/fixtures/async-plugin.ts
@@ -8,4 +8,5 @@ class AsyncPlugin {
     }
 }
 
+// eslint-disable-next-line import/no-default-export
 export default (config) => new AsyncPlugin();
diff --git a/packages/browser-proxy/test/fixtures/sync-plugin.ts b/packages/browser-proxy/test/fixtures/sync-plugin.ts
@@ -8,4 +8,5 @@ class SyncPlugin {
     }
 }
 
+// eslint-disable-next-line import/no-default-export
 export default (config) => new SyncPlugin();
diff --git a/packages/child-process/src/fork.ts b/packages/child-process/src/fork.ts
@@ -95,12 +95,12 @@ export async function fork(
     if (IS_WIN) {
         childProcess = spawn(
             'node',
-            [...processArgs, ...getAdditionalParameters(filePath), filePath, childArg, ...args]
+            [...processArgs, ...getAdditionalParameters(filePath), filePath, childArg, ...args],
         );
     } else {
         childProcess = spawn(
             getExecutor(filePath),
-            [...processArgs, filePath, childArg, ...args]
+            [...processArgs, filePath, childArg, ...args],
         );
     }
 

diff --git a/packages/child-process/src/resolve-binary.ts b/packages/child-process/src/resolve-binary.ts
@@ -29,9 +29,9 @@ function escapify(str) {
         return path.normalize(str).split(/\\/).map(windowsQuotes).join('\\\\');
     } else if (/[^-_.~/\w]/.test(str)) {
         return '\'' + str.replace(/'/g, '\'"\'"\'') + '\'';
-    } else {
+    } 
         return str;
-    }
+
 }
 
 export function resolveBinary(name: string) {

diff --git a/packages/child-process/test/utils.spec.ts → packages/child-process/test/utils.ts b/packages/child-process/test/utils.spec.ts → packages/child-process/test/utils.ts