aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-12-30 12:07:19 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2021-12-30 12:38:24 +0100
commite46099ac744919c927909f741d9b5870abab5a58 (patch)
tree393985ecf730f0908db1eefaaedb6fb92c726e40
parentbuild: Use shared packages through modules (diff)
downloadsophie-e46099ac744919c927909f741d9b5870abab5a58.tar.gz
sophie-e46099ac744919c927909f741d9b5870abab5a58.tar.zst
sophie-e46099ac744919c927909f741d9b5870abab5a58.zip
build: Only use vite typings in renderer
The rest of the packages aren't buld with vite, so we shouldn't use its typings.
-rw-r--r--jest.config.js1
-rw-r--r--packages/main/tsconfig.json3
-rw-r--r--packages/main/types/importMeta.d.ts8
-rw-r--r--packages/main/types/vite-env.d.ts5
-rw-r--r--packages/preload/tsconfig.json6
-rw-r--r--packages/preload/types/importMeta.d.ts7
6 files changed, 19 insertions, 11 deletions
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 = {
18 testEnvironment: 'node', 18 testEnvironment: 'node',
19 testPathIgnorePatterns: [ 19 testPathIgnorePatterns: [
20 '/dist/', 20 '/dist/',
21 '/dist-types',
22 '/node_modules/', 21 '/node_modules/',
23 ], 22 ],
24}; 23};
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 @@
3 "compilerOptions": { 3 "compilerOptions": {
4 "noEmit": true, 4 "noEmit": true,
5 "types": [ 5 "types": [
6 "node", 6 "node"
7 "vite/client"
8 ] 7 ]
9 }, 8 },
10 "references": [ 9 "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 @@
1interface ImportMeta {
2 env: {
3 DEV: boolean;
4 MODE: string;
5 PROD: boolean;
6 VITE_DEV_SERVER_URL: string;
7 }
8}
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 @@
1/// <reference types="vite/client" />
2
3interface ImportMetaEnv {
4 VITE_DEV_SERVER_URL: string | undefined;
5}
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 @@
8 "esnext" 8 "esnext"
9 ], 9 ],
10 "types": [ 10 "types": [
11 "@types/jest", 11 "@types/jest"
12 "vite/client"
13 ] 12 ]
14 }, 13 },
15 "references": [ 14 "references": [
@@ -18,6 +17,7 @@
18 } 17 }
19 ], 18 ],
20 "include": [ 19 "include": [
21 "src/**/*.ts" 20 "src/**/*.ts",
21 "types/**/*.d.ts"
22 ] 22 ]
23} 23}
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 @@
1interface ImportMeta {
2 env: {
3 DEV: boolean;
4 MODE: string;
5 PROD: boolean;
6 }
7}