fix: added the @globals back and removed some merge leftovers

This commit is contained in:
lilezek 2024-04-30 11:09:29 +02:00
parent c8fe984171
commit 6d36db5446
8 changed files with 535 additions and 367 deletions

View file

@ -1,6 +1,6 @@
{
"extends": "@electron-toolkit/tsconfig/tsconfig.node.json",
"include": ["electron.vite.config.*", "src/main/**/*", "src/preload/**/*", "src/locales/index.ts"],
"include": ["electron.vite.config.*", "src/main/**/*", "src/preload/**/*", "src/locales/index.ts", "src/globals.ts"],
"compilerOptions": {
"module": "ESNext",
"composite": true,
@ -14,7 +14,8 @@
"@renderer/*": ["src/renderer/*"],
"@types": ["src/types/index.ts"],
"@locales": ["src/locales/index.ts"],
"@resources": ["src/resources/index.ts"]
"@resources": ["src/resources/index.ts"],
"@globals": ["src/globals.ts"]
}
}
}