fix custom typescript helper types resolving

vladimiry · Jun 6, 2019 · 6c11541 · 6c11541
1 parent 576d87a
commit 6c11541
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/scripts/electron-builder/hooks/afterPack/tsconfig.json b/scripts/electron-builder/hooks/afterPack/tsconfig.json
@@ -6,7 +6,8 @@
     "sourceMap": false,
     "outDir": "."
   },
-  "files": [
-    "./index.ts"
+  "include": [
+    "../../../../src/@types/**/*",
+    "./**/*"
   ]
 }
diff --git a/src/electron-main/tsconfig.json b/src/electron-main/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "include": [
-    "./**/*",
-    "./../../src/@types/**/*"
+    "../../src/@types/**/*",
+    "./**/*"
   ],
   "exclude": [
     "./**/*.spec.ts"

diff --git a/src/electron-preload/tsconfig.json b/src/electron-preload/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "include": [
-    "./../../src/@types/**/*"
+    "../../src/@types/**/*"
   ]
 }
diff --git a/webpack/electron-builder-hooks.ts b/webpack/electron-builder-hooks.ts
@@ -2,6 +2,7 @@ import nodeExternals from "webpack-node-externals";
 import path from "path";
 import {Configuration} from "webpack";
 
+import {LoaderConfig as TsLoaderConfig} from "awesome-typescript-loader/src/interfaces";
 import {buildBaseConfig, rootRelativePath} from "./lib";
 
 const hooksDir = (...value: string[]) => path.join(
@@ -41,7 +42,9 @@ const configurations: Configuration[] = hooksToBuild.map((hookDirName) => {
                         test: /\.ts$/,
                         use: {
                             loader: "awesome-typescript-loader",
-                            options: {configFileName: tsConfigFile},
+                            options: {
+                                configFileName: tsConfigFile,
+                            } as TsLoaderConfig,
                         },
                     },
                 ],

diff --git a/webpack/electron-main.ts b/webpack/electron-main.ts
@@ -1,5 +1,6 @@
 import nodeExternals from "webpack-node-externals";
 
+import {LoaderConfig as TsLoaderConfig} from "awesome-typescript-loader/src/interfaces";
 import {buildBaseConfig, srcRelativePath} from "./lib";
 
 const tsConfigFile = srcRelativePath("./electron-main/tsconfig.json");
@@ -16,7 +17,9 @@ export default buildBaseConfig(
                     test: /\.ts$/,
                     use: {
                         loader: "awesome-typescript-loader",
-                        options: {configFileName: tsConfigFile},
+                        options: {
+                            configFileName: tsConfigFile,
+                        } as TsLoaderConfig,
                     },
                 },
             ],

diff --git a/webpack/electron-preload.ts b/webpack/electron-preload.ts
@@ -1,5 +1,6 @@
 import {Configuration} from "webpack";
 
+import {LoaderConfig as TsLoaderConfig} from "awesome-typescript-loader/src/interfaces";
 import {buildBaseConfig, environment, srcRelativePath} from "./lib";
 
 const configs = [
@@ -55,7 +56,9 @@ function buildRendererConfig(entry: Configuration["entry"], tsConfigFile: string
                         test: /\.ts$/,
                         use: {
                             loader: "awesome-typescript-loader",
-                            options: {configFileName: tsConfigFile},
+                            options: {
+                                configFileName: tsConfigFile,
+                            } as TsLoaderConfig,
                         },
                     },
                 ],