diff --git a/scripts/electron-builder/hooks/afterPack/tsconfig.json b/scripts/electron-builder/hooks/afterPack/tsconfig.json index ada001000..8e82de86a 100644 --- 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 index 0282a5605..a19be60f5 100644 --- 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 index 89bc1ad5e..8794759bb 100644 --- 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 index edb2eed34..3b5000aa9 100644 --- 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 index 645dc7e37..802224ff4 100644 --- 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 index 3f5cd9f19..c1fafe3ac 100644 --- 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, }, }, ],