diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-12-22 22:35:38 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-12-22 22:35:38 +0100 |
commit | dca0dfdfddca8ee55cd2111cd0c87afcbb2f88f3 (patch) | |
tree | 6d2a33fc7c4728f40ae4b1af9dccbfa4340544bf /packages | |
parent | build: Add electron-builder (diff) | |
download | sophie-dca0dfdfddca8ee55cd2111cd0c87afcbb2f88f3.tar.gz sophie-dca0dfdfddca8ee55cd2111cd0c87afcbb2f88f3.tar.zst sophie-dca0dfdfddca8ee55cd2111cd0c87afcbb2f88f3.zip |
build: Simplify project structure
Diffstat (limited to 'packages')
-rw-r--r-- | packages/main/package.json | 8 | ||||
-rw-r--r-- | packages/main/tsconfig.json | 10 | ||||
-rw-r--r-- | packages/main/types/vite-env.d.ts | 5 | ||||
-rw-r--r-- | packages/main/vite.config.js | 6 | ||||
-rw-r--r-- | packages/preload/package.json | 7 | ||||
-rw-r--r-- | packages/preload/tsconfig.json | 11 | ||||
-rw-r--r-- | packages/preload/vite.config.js | 6 | ||||
-rw-r--r-- | packages/renderer/package.json | 7 | ||||
-rw-r--r-- | packages/renderer/tsconfig.json | 14 | ||||
-rw-r--r-- | packages/renderer/vite.config.js | 5 |
10 files changed, 34 insertions, 45 deletions
diff --git a/packages/main/package.json b/packages/main/package.json index 1eba6c1..11a6270 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -1,12 +1,20 @@ | |||
1 | { | 1 | { |
2 | "name": "@sophie/main", | 2 | "name": "@sophie/main", |
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "private": true, | ||
5 | "main": "dist/index.cjs", | ||
6 | "scripts": { | ||
7 | "build": "vite build", | ||
8 | "typecheck": "tsc --noEmit" | ||
9 | }, | ||
4 | "dependencies": { | 10 | "dependencies": { |
5 | "electron": "^16.0.5" | 11 | "electron": "^16.0.5" |
6 | }, | 12 | }, |
7 | "devDependencies": { | 13 | "devDependencies": { |
8 | "@types/electron-devtools-installer": "^2.2.0", | 14 | "@types/electron-devtools-installer": "^2.2.0", |
15 | "@types/node": "^16.11.15", | ||
9 | "electron-devtools-installer": "^3.2.0", | 16 | "electron-devtools-installer": "^3.2.0", |
17 | "typescript": "^4.5.4", | ||
10 | "vite": "^2.7.6" | 18 | "vite": "^2.7.6" |
11 | } | 19 | } |
12 | } | 20 | } |
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json index 7181228..1a569d2 100644 --- a/packages/main/tsconfig.json +++ b/packages/main/tsconfig.json | |||
@@ -1,19 +1,13 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "baseUrl": ".", | ||
5 | "paths": { | ||
6 | "/@/*": [ | ||
7 | "src/*" | ||
8 | ] | ||
9 | }, | ||
10 | "types": [ | 4 | "types": [ |
11 | "node", | 5 | "node", |
12 | "vite/client" | 6 | "vite/client" |
13 | ] | 7 | ] |
14 | }, | 8 | }, |
15 | "include": [ | 9 | "include": [ |
16 | "src/**/*", | 10 | "src/**/*.ts", |
17 | "../../types/**/*.d.ts" | 11 | "types/**/*.d.ts" |
18 | ] | 12 | ] |
19 | } | 13 | } |
diff --git a/packages/main/types/vite-env.d.ts b/packages/main/types/vite-env.d.ts new file mode 100644 index 0000000..c6d56a6 --- /dev/null +++ b/packages/main/types/vite-env.d.ts | |||
@@ -0,0 +1,5 @@ | |||
1 | /// <reference types="vite/client" /> | ||
2 | |||
3 | interface ImportMetaEnv { | ||
4 | VITE_DEV_SERVER_URL: string | undefined; | ||
5 | } | ||
diff --git a/packages/main/vite.config.js b/packages/main/vite.config.js index 45c2c8c..556fcf8 100644 --- a/packages/main/vite.config.js +++ b/packages/main/vite.config.js | |||
@@ -1,7 +1,6 @@ | |||
1 | // @ts-check | 1 | // @ts-check |
2 | 2 | ||
3 | import { builtinModules } from 'module'; | 3 | import { builtinModules } from 'module'; |
4 | import { join } from 'path'; | ||
5 | 4 | ||
6 | // `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless. | 5 | // `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless. |
7 | // @ts-expect-error | 6 | // @ts-expect-error |
@@ -18,11 +17,6 @@ const config = { | |||
18 | mode: process.env.MODE, | 17 | mode: process.env.MODE, |
19 | root: PACKAGE_ROOT, | 18 | root: PACKAGE_ROOT, |
20 | envDir: process.cwd(), | 19 | envDir: process.cwd(), |
21 | resolve: { | ||
22 | alias: { | ||
23 | '/@/': join(PACKAGE_ROOT, 'src') + '/', | ||
24 | }, | ||
25 | }, | ||
26 | build: { | 20 | build: { |
27 | sourcemap: 'inline', | 21 | sourcemap: 'inline', |
28 | target: `node${node}`, | 22 | target: `node${node}`, |
diff --git a/packages/preload/package.json b/packages/preload/package.json index 538c583..5417ec0 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json | |||
@@ -1,10 +1,17 @@ | |||
1 | { | 1 | { |
2 | "name": "@sophie/preload", | 2 | "name": "@sophie/preload", |
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "private": true, | ||
5 | "main": "dist/index.cjs", | ||
6 | "scripts": { | ||
7 | "build": "vite build", | ||
8 | "typecheck": "tsc --noEmit" | ||
9 | }, | ||
4 | "dependencies": { | 10 | "dependencies": { |
5 | "electron": "^16.0.5" | 11 | "electron": "^16.0.5" |
6 | }, | 12 | }, |
7 | "devDependencies": { | 13 | "devDependencies": { |
14 | "typescript": "^4.5.4", | ||
8 | "vite": "^2.7.6" | 15 | "vite": "^2.7.6" |
9 | } | 16 | } |
10 | } | 17 | } |
diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json index 580d63a..6bb6145 100644 --- a/packages/preload/tsconfig.json +++ b/packages/preload/tsconfig.json | |||
@@ -1,15 +1,6 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | ||
4 | "baseUrl": ".", | ||
5 | "paths": { | ||
6 | "/@/*": [ | ||
7 | "src/*" | ||
8 | ] | ||
9 | } | ||
10 | }, | ||
11 | "include": [ | 3 | "include": [ |
12 | "src/**/*", | 4 | "src/**/*.ts" |
13 | "../../types/**/*.d.ts" | ||
14 | ] | 5 | ] |
15 | } | 6 | } |
diff --git a/packages/preload/vite.config.js b/packages/preload/vite.config.js index 8f11028..bc37ccb 100644 --- a/packages/preload/vite.config.js +++ b/packages/preload/vite.config.js | |||
@@ -1,7 +1,6 @@ | |||
1 | // @ts-check | 1 | // @ts-check |
2 | 2 | ||
3 | import { builtinModules } from 'module'; | 3 | import { builtinModules } from 'module'; |
4 | import { join } from 'path'; | ||
5 | 4 | ||
6 | // `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless. | 5 | // `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless. |
7 | // @ts-expect-error | 6 | // @ts-expect-error |
@@ -18,11 +17,6 @@ const config = { | |||
18 | mode: process.env.MODE, | 17 | mode: process.env.MODE, |
19 | root: PACKAGE_ROOT, | 18 | root: PACKAGE_ROOT, |
20 | envDir: process.cwd(), | 19 | envDir: process.cwd(), |
21 | resolve: { | ||
22 | alias: { | ||
23 | '/@/': join(PACKAGE_ROOT, 'src') + '/', | ||
24 | }, | ||
25 | }, | ||
26 | build: { | 20 | build: { |
27 | sourcemap: 'inline', | 21 | sourcemap: 'inline', |
28 | target: `chrome${chrome}`, | 22 | target: `chrome${chrome}`, |
diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 89a87b2..0c006a8 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json | |||
@@ -1,6 +1,12 @@ | |||
1 | { | 1 | { |
2 | "name": "@sophie/renderer", | 2 | "name": "@sophie/renderer", |
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "private": true, | ||
5 | "main": "dist/index.html", | ||
6 | "scripts": { | ||
7 | "build": "vite build", | ||
8 | "typecheck": "tsc --noEmit" | ||
9 | }, | ||
4 | "dependencies": { | 10 | "dependencies": { |
5 | "react": "^17.0.2", | 11 | "react": "^17.0.2", |
6 | "react-dom": "^17.0.2" | 12 | "react-dom": "^17.0.2" |
@@ -9,6 +15,7 @@ | |||
9 | "@types/react": "^17.0.37", | 15 | "@types/react": "^17.0.37", |
10 | "@types/react-dom": "^17.0.11", | 16 | "@types/react-dom": "^17.0.11", |
11 | "@vitejs/plugin-react": "^1.1.3", | 17 | "@vitejs/plugin-react": "^1.1.3", |
18 | "typescript": "^4.5.4", | ||
12 | "vite": "^2.7.6" | 19 | "vite": "^2.7.6" |
13 | } | 20 | } |
14 | } | 21 | } |
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json index ff4fe7c..4a80025 100644 --- a/packages/renderer/tsconfig.json +++ b/packages/renderer/tsconfig.json | |||
@@ -1,21 +1,15 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "baseUrl": ".", | ||
5 | "jsx": "react", | 4 | "jsx": "react", |
6 | "paths": { | 5 | "lib": [ |
7 | "/@/*": [ | ||
8 | "src/*" | ||
9 | ] | ||
10 | }, | ||
11 | "types": [ | ||
12 | "dom", | 6 | "dom", |
13 | "dom.iterable" | 7 | "dom.iterable", |
8 | "esnext" | ||
14 | ] | 9 | ] |
15 | }, | 10 | }, |
16 | "include": [ | 11 | "include": [ |
17 | "src/**/*.ts", | 12 | "src/**/*.ts", |
18 | "src/**/*.tsx", | 13 | "src/**/*.tsx" |
19 | "../../types/**/*.d.ts" | ||
20 | ] | 14 | ] |
21 | } | 15 | } |
diff --git a/packages/renderer/vite.config.js b/packages/renderer/vite.config.js index c10b81f..ff34b6d 100644 --- a/packages/renderer/vite.config.js +++ b/packages/renderer/vite.config.js | |||
@@ -20,11 +20,6 @@ const PACKAGE_ROOT = __dirname; | |||
20 | const config = { | 20 | const config = { |
21 | mode: process.env.MODE, | 21 | mode: process.env.MODE, |
22 | root: PACKAGE_ROOT, | 22 | root: PACKAGE_ROOT, |
23 | resolve: { | ||
24 | alias: { | ||
25 | '/@/': join(PACKAGE_ROOT, 'src') + '/', | ||
26 | }, | ||
27 | }, | ||
28 | plugins: [ | 23 | plugins: [ |
29 | react(), | 24 | react(), |
30 | ], | 25 | ], |