Merge pull request #90 from mtgto/update_linter

Update eslint

.eslintignore

@@ -2,3 +2,4 @@ node_modules
 out
 dist
 tmp
+*.d.ts

.eslintrc.yml

@@ -1,30 +1,40 @@
+parser: '@typescript-eslint/parser'
+
 env:
   browser: true
-  es6: true
+  es2017: true
   node: true
   mocha: true
 
+extends:
+  - eslint:recommended
+  - plugin:@typescript-eslint/recommended
+  - prettier/@typescript-eslint
+  - plugin:react/recommended
+  - plugin:prettier/recommended
+
 parserOptions:
+  ecmaVersion: 2017
   sourceType: module
   ecmaFeatures:
     jsx: true
 
-plugins:
-  - react
-
-extends:
-  - eslint:recommended
-  - plugin:react/recommended
-  - prettier
-  - prettier/react
-
 rules:
   eqeqeq: [error, allow-null]
   prefer-const: error
+  no-undef: off
+  no-unused-vars: off
+  '@typescript-eslint/ban-ts-ignore': off
+  '@typescript-eslint/no-use-before-define': off
+
+plugins:
+  - react
+
+settings:
+  react:
+    version: detect
 
 overrides:
-  files: ['**/*.ts', '**/*.tsx']
-  parser: typescript-eslint-parser
-  rules:
-    no-undef: off
-    no-unused-vars: off
+  - files: ['webpack.config.js']
+    rules:
+      '@typescript-eslint/no-var-requires': off

package.json

@@ -18,7 +18,7 @@
     "test:build": "webpack --env.BUILD_ENV=test --mode=development && electron-builder build --config electron-builder.test.yml --publish never --dir",
     "test:integration": "yarn run test:build && mocha --exit test/integration/test.ts",
     "lint": "yarn run lint:eslint && yarn run lint:tsc && yarn run lint:prettier",
-    "lint:eslint": "eslint --ext '.js,.jsx,.ts,.tsx' .",
+    "lint:eslint": "eslint --ext \".js,.jsx,.ts,.tsx\" .",
     "lint:tsc": "tsc --noEmit",
     "lint:prettier": "prettier --list-different \"./**/*.{js,jsx,ts,tsx,css,json}\"",
     "format": "prettier --write \"./**/*.{js,jsx,ts,tsx,css,json}\"",
@@ -67,16 +67,19 @@
     "@types/react-splitter-layout": "3.0.0",
     "@types/sqlite3": "3.1.6",
     "@types/webdriverio": "4.10.3",
+    "@typescript-eslint/eslint-plugin": "2.19.0",
+    "@typescript-eslint/parser": "2.19.0",
     "clean-webpack-plugin": "0.1.19",
     "copy-webpack-plugin": "4.5.1",
     "css-loader": "0.28.8",
     "electron": "7.1.2",
     "electron-builder": "21.2.0",
     "electron-mocha": "6.0.1",
     "electron-publisher-s3": "20.14.4",
-    "eslint": "4.16.0",
-    "eslint-config-prettier": "2.9.0",
-    "eslint-plugin-react": "7.5.1",
+    "eslint": "~6.8.0",
+    "eslint-config-prettier": "~6.10.0",
+    "eslint-plugin-prettier": "3.1.2",
+    "eslint-plugin-react": "~7.18.3",
     "execa": "0.9.0",
     "file-loader": "~4.3.0",
     "mini-css-extract-plugin": "~0.8.0",
@@ -85,7 +88,6 @@
     "ts-loader": "6.2.1",
     "ts-node": "5.0.1",
     "typescript": "3.7.2",
-    "typescript-eslint-parser": "22.0.0",
     "url-loader": "0.6.2",
     "webpack": "4.41.2",
     "webpack-cli": "3.3.10",

src/lib/DataSourceDefinition/TreasureData.ts

@@ -37,35 +37,33 @@ export default class TreasureData extends Base {
     ];
   }
 
-  execute(query: string): Promise<any> {
+  async execute(query: string): Promise<any> {
     if (this.jobId) {
       return Promise.reject(new Error("A query is running"));
     }
 
-    return new Promise(async (resolve, reject) => {
-      let canceled = false;
-      this._cancel = () => {
-        canceled = true;
-        reject(new Error("Killed query"));
-      };
+    let canceled = false;
+    this._cancel = () => {
+      canceled = true;
+      return Promise.reject(new Error("Killed query"));
+    };
 
-      this.jobId = await this._execQuery(query);
+    this.jobId = await this._execQuery(query);
 
-      if (canceled) {
-        this.kill();
-        this.jobId = null;
-        return;
-      }
-
-      const { fields, rows, err } = await this.wait();
+    if (canceled) {
+      this.kill();
       this.jobId = null;
+      return;
+    }
 
-      if (err) {
-        reject(new Error(err));
-      } else {
-        resolve({ fields, rows });
-      }
-    });
+    const { fields, rows, err } = await this.wait();
+    this.jobId = null;
+
+    if (err) {
+      return Promise.reject(new Error(err));
+    } else {
+      return { fields, rows };
+    }
   }
 
   cancel(): void {

src/lib/Database/Connection.ts

@@ -20,17 +20,17 @@ export default class Connection {
   async migrate(migrations: Migration[]): Promise<void> {
     await this.exec("begin;");
     try {
-      const current_version: number = await this.get(`pragma user_version`).then(row => row.user_version);
-      let last_version: number = 0;
+      const currentVersion: number = await this.get(`pragma user_version`).then(row => row.user_version);
+      let lastVersion = 0;
       for (const m of migrations) {
-        if (m.version <= last_version) {
+        if (m.version <= lastVersion) {
           throw new Error(`Wrong migration script: version ${m.version}`);
         }
-        if (m.version > current_version) {
+        if (m.version > currentVersion) {
           await this.exec(m.query);
           await this.exec(`pragma user_version = ${m.version}`);
         }
-        last_version = m.version;
+        lastVersion = m.version;
       }
       await this.exec("commit;");
     } catch (err) {

src/renderer/components/QueryResultNav/QueryResultNav.tsx

@@ -17,9 +17,8 @@ type State = {
 };
 
 export default class QueryResultNav extends React.Component<Props, State> {
-  constructor(...args) {
-    // @ts-ignore
-    super(...args);
+  constructor(props: Props) {
+    super(props);
     this.state = { openShareFlyout: false };
   }