From e3907914f29b4c4f9f51d49003e70aa57af64df3 Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Tue, 12 Apr 2022 17:59:22 +0200
Subject: [PATCH] build: fixed module resolution and workers webpack config

---
 src/common/interfaces/antares.ts     | 2 +-
 src/main/libs/clients/MySQLClient.ts | 4 ++--
 src/main/main.ts                     | 2 +-
 tsconfig.json                        | 2 +-
 webpack.workers.config.js            | 7 ++++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/common/interfaces/antares.ts b/src/common/interfaces/antares.ts
index 9ef4172f..81179f64 100644
--- a/src/common/interfaces/antares.ts
+++ b/src/common/interfaces/antares.ts
@@ -1,4 +1,4 @@
-import mysql from 'mysql2/promise';
+import * as mysql from 'mysql2/promise';
 import * as pg from 'pg';
 import SSHConfig from 'ssh2-promise/lib/sshConfig';
 import { MySQLClient } from '../../main/libs/clients/MySQLClient';
diff --git a/src/main/libs/clients/MySQLClient.ts b/src/main/libs/clients/MySQLClient.ts
index 8332e439..e62bc424 100644
--- a/src/main/libs/clients/MySQLClient.ts
+++ b/src/main/libs/clients/MySQLClient.ts
@@ -1,7 +1,7 @@
 import * as antares from 'common/interfaces/antares';
-import mysql from 'mysql2/promise';
+import * as mysql from 'mysql2/promise';
 import { AntaresCore } from '../AntaresCore';
-import dataTypes from 'common/data-types/mysql';
+import * as dataTypes from 'common/data-types/mysql';
 import SSH2Promise from 'ssh2-promise';
 import SSHConfig from 'ssh2-promise/lib/sshConfig';
 
diff --git a/src/main/main.ts b/src/main/main.ts
index 0915e8d7..563b66c6 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -1,6 +1,6 @@
 import { app, BrowserWindow, /* session, */ nativeImage, Menu } from 'electron';
 import * as path from 'path';
-import Store from 'electron-store';
+import * as Store from 'electron-store';
 import * as windowStateKeeper from 'electron-window-state';
 import * as remoteMain from '@electron/remote/main';
 
diff --git a/tsconfig.json b/tsconfig.json
index df9a8d8c..5b3d9663 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
     "baseUrl": "./",
     "target": "es2021",
     "allowJs": true,
-    "moduleResolution": "node12",
+    "module": "CommonJS",
     "noImplicitAny": true,
     "types": [
       "node"
diff --git a/webpack.workers.config.js b/webpack.workers.config.js
index 0a71d2ef..29397557 100644
--- a/webpack.workers.config.js
+++ b/webpack.workers.config.js
@@ -30,6 +30,11 @@ const config = {
    externals: externals.filter((d) => !whiteListedModules.includes(d)),
    module: {
       rules: [
+         {
+            test: /\.ts$/,
+            exclude: /node_modules/,
+            loader: 'ts-loader'
+         },
          {
             test: /\.js$/,
             use: 'babel-loader',
@@ -42,7 +47,7 @@ const config = {
       ]
    },
    resolve: {
-      extensions: ['.js', '.json'],
+      extensions: ['.js', '.json', '.ts'],
       alias: {
          src: path.join(__dirname, 'src/'),
          common: path.resolve(__dirname, 'src/common')