diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | package.json | 10 | ||||
-rw-r--r-- | packages/main/package.json | 3 | ||||
-rw-r--r-- | packages/main/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/preload/package.json | 3 | ||||
-rw-r--r-- | packages/preload/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/renderer/package.json | 3 | ||||
-rw-r--r-- | packages/renderer/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/shared/package.json | 4 | ||||
-rw-r--r-- | packages/shared/tsconfig.json | 3 | ||||
-rw-r--r-- | packages/shared/vite.config.js | 2 | ||||
-rw-r--r-- | yarn.lock | 5 |
12 files changed, 40 insertions, 9 deletions
@@ -7,4 +7,5 @@ | |||
7 | !.yarn/releases | 7 | !.yarn/releases |
8 | !.yarn/versions | 8 | !.yarn/versions |
9 | dist/ | 9 | dist/ |
10 | dist-types/ | ||
10 | *.tsbuildinfo | 11 | *.tsbuildinfo |
diff --git a/package.json b/package.json index cf271bd..2b45f8e 100644 --- a/package.json +++ b/package.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "name": "sophie", | 2 | "name": "sophie", |
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "description": "Messaging app build from the ground up with security in mind", | 4 | "description": "Messaging app built from the ground up with security in mind", |
5 | "keywords": [ | 5 | "keywords": [ |
6 | "messaging", | 6 | "messaging", |
7 | "app" | 7 | "app" |
@@ -13,12 +13,17 @@ | |||
13 | }, | 13 | }, |
14 | "main": "packages/main/dist/index.cjs", | 14 | "main": "packages/main/dist/index.cjs", |
15 | "scripts": { | 15 | "scripts": { |
16 | "clean": "rimraf dist .log && yarn workspaces foreach run clean", | ||
16 | "build": "yarn workspaces foreach -vpt run build", | 17 | "build": "yarn workspaces foreach -vpt run build", |
17 | "precompile": "cross-env MODE=production yarn run build", | 18 | "precompile": "cross-env MODE=production yarn run build", |
18 | "compile": "yarn precompile && electron-builder build --config .electron-builder.config.js --dir --config.asar=false", | 19 | "compile": "yarn precompile && electron-builder build --config .electron-builder.config.js --dir --config.asar=false", |
19 | "watch": "node scripts/watch.js", | 20 | "watch": "node scripts/watch.js", |
20 | "typecheck": "yarn workspaces foreach -vpt run typecheck", | 21 | "typecheck": "yarn workspaces foreach -vpt run typecheck", |
21 | "update-electron-vendors": "node scripts/update-electron-vendors.js" | 22 | "update-electron-vendors": "node scripts/update-electron-vendors.js", |
23 | "main": "yarn workspace @sophie/main", | ||
24 | "preload": "yarn workspace @sophie/preload", | ||
25 | "renderer": "yarn workspace @sophie/renderer", | ||
26 | "shared": "yarn workspace @sophie/shared" | ||
22 | }, | 27 | }, |
23 | "workspaces": [ | 28 | "workspaces": [ |
24 | "packages/main", | 29 | "packages/main", |
@@ -33,6 +38,7 @@ | |||
33 | "electron": "16.0.5", | 38 | "electron": "16.0.5", |
34 | "electron-builder": "22.14.11", | 39 | "electron-builder": "22.14.11", |
35 | "eslint": "8.5.0", | 40 | "eslint": "8.5.0", |
41 | "rimraf": "^3.0.2", | ||
36 | "rollup": "^2.61.1", | 42 | "rollup": "^2.61.1", |
37 | "typescript": "4.5.4", | 43 | "typescript": "4.5.4", |
38 | "vite": "2.7.6" | 44 | "vite": "2.7.6" |
diff --git a/packages/main/package.json b/packages/main/package.json index 1f5e749..509acdc 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -3,7 +3,9 @@ | |||
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "private": true, | 4 | "private": true, |
5 | "main": "dist/index.cjs", | 5 | "main": "dist/index.cjs", |
6 | "types": "dist-types/index.d.ts", | ||
6 | "scripts": { | 7 | "scripts": { |
8 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | ||
7 | "build": "vite build", | 9 | "build": "vite build", |
8 | "typecheck": "tsc" | 10 | "typecheck": "tsc" |
9 | }, | 11 | }, |
@@ -17,6 +19,7 @@ | |||
17 | "@types/electron-devtools-installer": "^2.2.0", | 19 | "@types/electron-devtools-installer": "^2.2.0", |
18 | "@types/node": "^17.0.4", | 20 | "@types/node": "^17.0.4", |
19 | "electron-devtools-installer": "^3.2.0", | 21 | "electron-devtools-installer": "^3.2.0", |
22 | "rimraf": "^3.0.2", | ||
20 | "typescript": "^4.5.4", | 23 | "typescript": "^4.5.4", |
21 | "vite": "^2.7.6" | 24 | "vite": "^2.7.6" |
22 | } | 25 | } |
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json index 970215c..5afee21 100644 --- a/packages/main/tsconfig.json +++ b/packages/main/tsconfig.json | |||
@@ -1,7 +1,10 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "noEmit": true, | 4 | "composite": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "rootDir": "src", | ||
5 | "types": [ | 8 | "types": [ |
6 | "node", | 9 | "node", |
7 | "vite/client" | 10 | "vite/client" |
diff --git a/packages/preload/package.json b/packages/preload/package.json index 2ad215c..e050b9a 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json | |||
@@ -4,7 +4,9 @@ | |||
4 | "private": true, | 4 | "private": true, |
5 | "sideEffects": false, | 5 | "sideEffects": false, |
6 | "main": "dist/index.cjs", | 6 | "main": "dist/index.cjs", |
7 | "types": "dist-types/index.d.ts", | ||
7 | "scripts": { | 8 | "scripts": { |
9 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | ||
8 | "build": "vite build", | 10 | "build": "vite build", |
9 | "typecheck": "tsc" | 11 | "typecheck": "tsc" |
10 | }, | 12 | }, |
@@ -15,6 +17,7 @@ | |||
15 | "mobx-state-tree": "^5.1.0" | 17 | "mobx-state-tree": "^5.1.0" |
16 | }, | 18 | }, |
17 | "devDependencies": { | 19 | "devDependencies": { |
20 | "rimraf": "^3.0.2", | ||
18 | "typescript": "^4.5.4", | 21 | "typescript": "^4.5.4", |
19 | "vite": "^2.7.6" | 22 | "vite": "^2.7.6" |
20 | } | 23 | } |
diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json index 8bfa0ec..66726e3 100644 --- a/packages/preload/tsconfig.json +++ b/packages/preload/tsconfig.json | |||
@@ -1,7 +1,10 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "noEmit": true | 4 | "composite": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "rootDir": "src" | ||
5 | }, | 8 | }, |
6 | "references": [ | 9 | "references": [ |
7 | { | 10 | { |
diff --git a/packages/renderer/package.json b/packages/renderer/package.json index ceec3a5..5f9bd57 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json | |||
@@ -3,7 +3,9 @@ | |||
3 | "version": "0.1.0", | 3 | "version": "0.1.0", |
4 | "private": true, | 4 | "private": true, |
5 | "main": "dist/index.html", | 5 | "main": "dist/index.html", |
6 | "types": "dist-types/index.d.ts", | ||
6 | "scripts": { | 7 | "scripts": { |
8 | "clean": "rimraf dist dist-types node_modules tsconfig.tsbuildinfo", | ||
7 | "build": "vite build", | 9 | "build": "vite build", |
8 | "typecheck": "tsc" | 10 | "typecheck": "tsc" |
9 | }, | 11 | }, |
@@ -26,6 +28,7 @@ | |||
26 | "@vitejs/plugin-react": "^1.1.3", | 28 | "@vitejs/plugin-react": "^1.1.3", |
27 | "mst-middlewares": "^5.1.0", | 29 | "mst-middlewares": "^5.1.0", |
28 | "remotedev": "^0.2.9", | 30 | "remotedev": "^0.2.9", |
31 | "rimraf": "^3.0.2", | ||
29 | "typescript": "^4.5.4", | 32 | "typescript": "^4.5.4", |
30 | "vite": "^2.7.6" | 33 | "vite": "^2.7.6" |
31 | } | 34 | } |
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json index 8746462..998ed07 100644 --- a/packages/renderer/tsconfig.json +++ b/packages/renderer/tsconfig.json | |||
@@ -1,8 +1,11 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "noEmit": true, | 4 | "composite": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
5 | "jsx": "react", | 7 | "jsx": "react", |
8 | "rootDir": "src", | ||
6 | "lib": [ | 9 | "lib": [ |
7 | "dom", | 10 | "dom", |
8 | "dom.iterable", | 11 | "dom.iterable", |
diff --git a/packages/shared/package.json b/packages/shared/package.json index f49be47..83aec54 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json | |||
@@ -4,12 +4,14 @@ | |||
4 | "private": true, | 4 | "private": true, |
5 | "main": "dist/index.cjs", | 5 | "main": "dist/index.cjs", |
6 | "module": "dist/index.es.js", | 6 | "module": "dist/index.es.js", |
7 | "types": "dist/index.d.ts", | 7 | "types": "dist-types/index.d.ts", |
8 | "scripts": { | 8 | "scripts": { |
9 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | ||
9 | "build": "vite build", | 10 | "build": "vite build", |
10 | "typecheck": "tsc" | 11 | "typecheck": "tsc" |
11 | }, | 12 | }, |
12 | "devDependencies": { | 13 | "devDependencies": { |
14 | "rimraf": "^3.0.2", | ||
13 | "typescript": "^4.5.4", | 15 | "typescript": "^4.5.4", |
14 | "vite": "^2.7.6" | 16 | "vite": "^2.7.6" |
15 | }, | 17 | }, |
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index d441cc8..de75833 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json | |||
@@ -2,8 +2,7 @@ | |||
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "composite": true, |
5 | "declaration": true, | 5 | "declarationDir": "dist-types", |
6 | "declarationDir": "dist", | ||
7 | "emitDeclarationOnly": true, | 6 | "emitDeclarationOnly": true, |
8 | "rootDir": "src" | 7 | "rootDir": "src" |
9 | }, | 8 | }, |
diff --git a/packages/shared/vite.config.js b/packages/shared/vite.config.js index 05ec118..a3efc87 100644 --- a/packages/shared/vite.config.js +++ b/packages/shared/vite.config.js | |||
@@ -36,7 +36,7 @@ const config = { | |||
36 | ...builtinModules, | 36 | ...builtinModules, |
37 | ], | 37 | ], |
38 | }, | 38 | }, |
39 | emptyOutDir: false, // Do not remove `.d.ts` files. | 39 | emptyOutDir: true, |
40 | brotliSize: false, | 40 | brotliSize: false, |
41 | }, | 41 | }, |
42 | }; | 42 | }; |
@@ -829,6 +829,7 @@ __metadata: | |||
829 | electron-devtools-installer: ^3.2.0 | 829 | electron-devtools-installer: ^3.2.0 |
830 | mobx: ^6.3.10 | 830 | mobx: ^6.3.10 |
831 | mobx-state-tree: ^5.1.0 | 831 | mobx-state-tree: ^5.1.0 |
832 | rimraf: ^3.0.2 | ||
832 | typescript: ^4.5.4 | 833 | typescript: ^4.5.4 |
833 | vite: ^2.7.6 | 834 | vite: ^2.7.6 |
834 | languageName: unknown | 835 | languageName: unknown |
@@ -842,6 +843,7 @@ __metadata: | |||
842 | electron: ^16.0.5 | 843 | electron: ^16.0.5 |
843 | mobx: ^6.3.10 | 844 | mobx: ^6.3.10 |
844 | mobx-state-tree: ^5.1.0 | 845 | mobx-state-tree: ^5.1.0 |
846 | rimraf: ^3.0.2 | ||
845 | typescript: ^4.5.4 | 847 | typescript: ^4.5.4 |
846 | vite: ^2.7.6 | 848 | vite: ^2.7.6 |
847 | languageName: unknown | 849 | languageName: unknown |
@@ -867,6 +869,7 @@ __metadata: | |||
867 | react: ^17.0.2 | 869 | react: ^17.0.2 |
868 | react-dom: ^17.0.2 | 870 | react-dom: ^17.0.2 |
869 | remotedev: ^0.2.9 | 871 | remotedev: ^0.2.9 |
872 | rimraf: ^3.0.2 | ||
870 | typescript: ^4.5.4 | 873 | typescript: ^4.5.4 |
871 | vite: ^2.7.6 | 874 | vite: ^2.7.6 |
872 | languageName: unknown | 875 | languageName: unknown |
@@ -878,6 +881,7 @@ __metadata: | |||
878 | dependencies: | 881 | dependencies: |
879 | mobx: ^6.3.10 | 882 | mobx: ^6.3.10 |
880 | mobx-state-tree: ^5.1.0 | 883 | mobx-state-tree: ^5.1.0 |
884 | rimraf: ^3.0.2 | ||
881 | typescript: ^4.5.4 | 885 | typescript: ^4.5.4 |
882 | vite: ^2.7.6 | 886 | vite: ^2.7.6 |
883 | languageName: unknown | 887 | languageName: unknown |
@@ -4914,6 +4918,7 @@ __metadata: | |||
4914 | electron: 16.0.5 | 4918 | electron: 16.0.5 |
4915 | electron-builder: 22.14.11 | 4919 | electron-builder: 22.14.11 |
4916 | eslint: 8.5.0 | 4920 | eslint: 8.5.0 |
4921 | rimraf: ^3.0.2 | ||
4917 | rollup: ^2.61.1 | 4922 | rollup: ^2.61.1 |
4918 | typescript: 4.5.4 | 4923 | typescript: 4.5.4 |
4919 | vite: 2.7.6 | 4924 | vite: 2.7.6 |