From e46099ac744919c927909f741d9b5870abab5a58 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 30 Dec 2021 12:07:19 +0100 Subject: build: Only use vite typings in renderer The rest of the packages aren't buld with vite, so we shouldn't use its typings. --- jest.config.js | 1 - packages/main/tsconfig.json | 3 +-- packages/main/types/importMeta.d.ts | 8 ++++++++ packages/main/types/vite-env.d.ts | 5 ----- packages/preload/tsconfig.json | 6 +++--- packages/preload/types/importMeta.d.ts | 7 +++++++ 6 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 packages/main/types/importMeta.d.ts delete mode 100644 packages/main/types/vite-env.d.ts create mode 100644 packages/preload/types/importMeta.d.ts diff --git a/jest.config.js b/jest.config.js index d0ba361..eda029a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -18,7 +18,6 @@ module.exports = { testEnvironment: 'node', testPathIgnorePatterns: [ '/dist/', - '/dist-types', '/node_modules/', ], }; diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json index 6387562..10f5765 100644 --- a/packages/main/tsconfig.json +++ b/packages/main/tsconfig.json @@ -3,8 +3,7 @@ "compilerOptions": { "noEmit": true, "types": [ - "node", - "vite/client" + "node" ] }, "references": [ diff --git a/packages/main/types/importMeta.d.ts b/packages/main/types/importMeta.d.ts new file mode 100644 index 0000000..3da01d3 --- /dev/null +++ b/packages/main/types/importMeta.d.ts @@ -0,0 +1,8 @@ +interface ImportMeta { + env: { + DEV: boolean; + MODE: string; + PROD: boolean; + VITE_DEV_SERVER_URL: string; + } +} diff --git a/packages/main/types/vite-env.d.ts b/packages/main/types/vite-env.d.ts deleted file mode 100644 index c6d56a6..0000000 --- a/packages/main/types/vite-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// - -interface ImportMetaEnv { - VITE_DEV_SERVER_URL: string | undefined; -} diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json index af0fd5f..741d435 100644 --- a/packages/preload/tsconfig.json +++ b/packages/preload/tsconfig.json @@ -8,8 +8,7 @@ "esnext" ], "types": [ - "@types/jest", - "vite/client" + "@types/jest" ] }, "references": [ @@ -18,6 +17,7 @@ } ], "include": [ - "src/**/*.ts" + "src/**/*.ts", + "types/**/*.d.ts" ] } diff --git a/packages/preload/types/importMeta.d.ts b/packages/preload/types/importMeta.d.ts new file mode 100644 index 0000000..9b73170 --- /dev/null +++ b/packages/preload/types/importMeta.d.ts @@ -0,0 +1,7 @@ +interface ImportMeta { + env: { + DEV: boolean; + MODE: string; + PROD: boolean; + } +} -- cgit v1.2.3-54-g00ecf