[AMSA-60] Update typescript and fix errors from console (#111)

* [AMSA-60] Update typescript and fix errors from console * [AMSA-60] Update package-lock * [AMSA-60] bump v0.1.44
appodeal · Oct 6, 2023 · ff813c6 · ff813c6
1 parent ff0c0aa
commit ff813c6
Show file tree

Hide file tree

Showing 10 changed files with 630 additions and 394 deletions.
diff --git a/chrome-extension/background/jobs/enable-reporting.tab.job.ts b/chrome-extension/background/jobs/enable-reporting.tab.job.ts
@@ -44,7 +44,7 @@ export class EnableReportingTabJob implements IJob {
 
 
     async run () {
-        return new Promise(resolve => {
+        return new Promise<void>(resolve => {
             if (this.isDone) {
                 resolve();
             }

diff --git a/chrome-extension/common/localstorage.ts b/chrome-extension/common/localstorage.ts
@@ -1,6 +1,6 @@
 export const extLocalStorage = {
     async set (value) {
-        return new Promise(resolve => chrome.storage.local.set(value, resolve));
+        return new Promise<void>(resolve => chrome.storage.local.set(value, resolve));
     },
     async get (value) {
         return new Promise(resolve => chrome.storage.local.get(value, resolve));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "repository": "https://github.com/appodeal/admob-sync-app",
   "description": "Appodeal AdMob Sync application",
   "private": true,
-  "version": "0.1.43",
+  "version": "0.1.44",
   "scripts": {
     "start": "npm run start:app",
     "start:app": "node --max_old_space_size=4096 node_modules/.bin/webpack --watch --progress --config=webpack/development.ts",
@@ -146,9 +146,9 @@
     "sass-loader": "^10.4.1",
     "script-ext-html-webpack-plugin": "^2.1.3",
     "ts-jest": "^24.0.0",
-    "ts-loader": "^5.3.3",
-    "ts-node": "^8.0.2",
-    "typescript": "^3.3.3",
+    "ts-loader": "^8.4.0",
+    "ts-node": "10.8.1",
+    "typescript": "^4.7.4",
     "webpack": "^4.39.2",
     "webpack-cli": "^3.2.3",
     "webpack-dev-server": "^3.2.0",
@@ -168,10 +168,12 @@
     "electron": "^13.3.0",
     "electron-platform": "^1.2.0",
     "escape-string-regexp": "^2.0.0",
+    "fast-safe-stringify": "^2.1.1",
     "fs-extra": "^7.0.1",
     "graphql": "^14.1.1",
     "graphql-tag": "^2.10.1",
     "json-stable-stringify": "^1.0.1",
+    "json-stringify-safe": "^5.0.1",
     "jwt-decode": "^2.2.0",
     "lodash.trim": "^4.5.1",
     "mobx": "^5.9.0",

diff --git a/src/core/sync-apps/sync.service.ts b/src/core/sync-apps/sync.service.ts
@@ -37,7 +37,7 @@ export class SyncService {
 
 
     public async runSync (appodealAccountId: string, admobAccount: AdMobAccount, runner: SyncRunner) {
-        return new Promise(async (resolve, reject) => {
+        return new Promise<void>(async (resolve, reject) => {
             if (this.onlineService.isOffline()) {
                 console.log('[Sync Service] Can not run sync. No Internet Connection');
                 return reject(new Error('Can not run sync. No Internet Connection'));

diff --git a/src/lib/debug.ts b/src/lib/debug.ts
@@ -149,7 +149,7 @@ export class Debug {
     }
 
     wait (time: number) {
-        return new Promise(resolve => setTimeout(() => resolve(), time));
+        return new Promise<void>(resolve => setTimeout(() => resolve(), time));
     }
 
     /**

diff --git a/src/lib/sync-logs/logger.ts b/src/lib/sync-logs/logger.ts
@@ -9,6 +9,7 @@ import * as winston from 'winston';
 import {Logger} from 'winston';
 
 
+// @ts-ignore
 export interface LoggerInstance extends Logger {
     /**
      * @deprecated use closeAsync instead

diff --git a/src/lib/task-runner.ts b/src/lib/task-runner.ts
@@ -55,7 +55,7 @@ export class TaskRunner extends EventEmitter {
     }
 
     break () {
-        return new Promise(resolve => {
+        return new Promise<void>(resolve => {
             if (this.state === TaskRunnerState.running) {
                 this.once('cancel', () => resolve());
             } else {
@@ -92,7 +92,7 @@ export class TaskRunner extends EventEmitter {
     }
 
     private exec () {
-        return new Promise(async (resolve, reject) => {
+        return new Promise<void>(async (resolve, reject) => {
 
             const runNext = () => {
                 if (this.state === TaskRunnerState.cancelled) {

diff --git a/src/lib/tray-icon.ts b/src/lib/tray-icon.ts
@@ -23,7 +23,7 @@ export class TrayIcon {
 
     listenStatusChanges () {
         this.sub = observe(this.store.state, (change) => {
-            if (['account', 'history', 'syncProgress', 'selectedAppodealAccount'].includes(change.name)) {
+            if (['account', 'history', 'syncProgress', 'selectedAppodealAccount'].includes(<string>change.name)) {
                 this.checkIcon();
             }
         });

diff --git a/webpack/default.ts b/webpack/default.ts
@@ -32,6 +32,11 @@ export const entriesConfig = entries.map(
             devtool: 'source-map',
             module: {
                 rules: [
+                    {
+                        test: /\.mjs$/,
+                        include: /node_modules/,
+                        type: 'javascript/auto'
+                    },
                     {
                         test: /\.ts|\.tsx$/,
                         use: ['ts-loader']
@@ -105,7 +110,7 @@ export const entriesConfig = entries.map(
                 ]
             },
             resolve: {
-                extensions: ['.tsx', '.json', '.ts', '.js', '.svg'],
+                extensions: ['.tsx', '.json', '.ts', '.js', '.svg', '.mjs', '.gql', '.graphql'],
                 modules: [
                     'node_modules',
                     '@typings',
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,7 +149,7 @@ export class Debug { @@
         }
         wait (time: number) {
-            return new Promise(resolve => setTimeout(() => resolve(), time));
+            return new Promise<void>(resolve => setTimeout(() => resolve(), time));
         }
         /**
@@ Expand Down @@