diff options
-rw-r--r-- | .electron-builder.config.js | 6 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | packages/main/package.json | 2 | ||||
-rw-r--r-- | packages/main/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/preload/package.json | 2 | ||||
-rw-r--r-- | packages/preload/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/renderer/package.json | 2 | ||||
-rw-r--r-- | packages/renderer/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/service-inject/package.json | 2 | ||||
-rw-r--r-- | packages/service-inject/tsconfig.json | 5 | ||||
-rw-r--r-- | packages/service-preload/package.json | 2 | ||||
-rw-r--r-- | packages/service-preload/tsconfig.json | 10 | ||||
-rw-r--r-- | packages/service-shared/package.json | 5 | ||||
-rw-r--r-- | packages/service-shared/tsconfig.json | 2 | ||||
-rw-r--r-- | packages/service-shared/vite.config.js | 1 | ||||
-rw-r--r-- | packages/shared/package.json | 5 | ||||
-rw-r--r-- | packages/shared/tsconfig.json | 2 | ||||
-rw-r--r-- | packages/shared/vite.config.js | 1 |
19 files changed, 31 insertions, 34 deletions
diff --git a/.electron-builder.config.js b/.electron-builder.config.js index 4ff94d7..3fa9ab5 100644 --- a/.electron-builder.config.js +++ b/.electron-builder.config.js | |||
@@ -19,7 +19,11 @@ const config = { | |||
19 | buildResources: 'buildResources', | 19 | buildResources: 'buildResources', |
20 | }, | 20 | }, |
21 | files: [ | 21 | files: [ |
22 | 'packages/**/dist/**', | 22 | 'packages/main/dist/**', |
23 | 'packages/preload/dist/**', | ||
24 | 'packages/renderer/dist/**', | ||
25 | 'packages/service-inject/dist/**', | ||
26 | 'packages/service-preload/dist/**', | ||
23 | ], | 27 | ], |
24 | extraMetadata: { | 28 | extraMetadata: { |
25 | version: process.env.VITE_APP_VERSION, | 29 | version: process.env.VITE_APP_VERSION, |
@@ -7,5 +7,4 @@ | |||
7 | !.yarn/releases | 7 | !.yarn/releases |
8 | !.yarn/versions | 8 | !.yarn/versions |
9 | dist/ | 9 | dist/ |
10 | dist-types/ | ||
11 | *.tsbuildinfo | 10 | *.tsbuildinfo |
diff --git a/package.json b/package.json index f9225db..5494b2a 100644 --- a/package.json +++ b/package.json | |||
@@ -16,7 +16,7 @@ | |||
16 | "main": "packages/main/dist/index.cjs", | 16 | "main": "packages/main/dist/index.cjs", |
17 | "scripts": { | 17 | "scripts": { |
18 | "clean": "rimraf dist .log && yarn workspaces foreach run clean", | 18 | "clean": "rimraf dist .log && yarn workspaces foreach run clean", |
19 | "pretest": "yarn workspaces foreach -vpt --include '@sophie/*shared' run build", | 19 | "pretest": "yarn workspaces foreach -vpt run pretest", |
20 | "test": "yarn pretest && yarn workspaces foreach -vpt run test", | 20 | "test": "yarn pretest && yarn workspaces foreach -vpt run test", |
21 | "build": "yarn workspaces foreach -vpt run build", | 21 | "build": "yarn workspaces foreach -vpt run build", |
22 | "precompile": "cross-env MODE=production yarn run build", | 22 | "precompile": "cross-env MODE=production yarn run build", |
diff --git a/packages/main/package.json b/packages/main/package.json index 48268fb..b93dec0 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -5,7 +5,7 @@ | |||
5 | "main": "dist/index.cjs", | 5 | "main": "dist/index.cjs", |
6 | "types": "dist-types/index.d.ts", | 6 | "types": "dist-types/index.d.ts", |
7 | "scripts": { | 7 | "scripts": { |
8 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | 8 | "clean": "rimraf dist tsconfig.tsbuildinfo", |
9 | "build": "vite build", | 9 | "build": "vite build", |
10 | "typecheck": "tsc" | 10 | "typecheck": "tsc" |
11 | }, | 11 | }, |
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json index 2529709..6387562 100644 --- a/packages/main/tsconfig.json +++ b/packages/main/tsconfig.json | |||
@@ -1,10 +1,7 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "noEmit": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "rootDir": "src", | ||
8 | "types": [ | 5 | "types": [ |
9 | "node", | 6 | "node", |
10 | "vite/client" | 7 | "vite/client" |
diff --git a/packages/preload/package.json b/packages/preload/package.json index f7baa37..f804be0 100644 --- a/packages/preload/package.json +++ b/packages/preload/package.json | |||
@@ -6,7 +6,7 @@ | |||
6 | "main": "dist/index.cjs", | 6 | "main": "dist/index.cjs", |
7 | "types": "dist-types/index.d.ts", | 7 | "types": "dist-types/index.d.ts", |
8 | "scripts": { | 8 | "scripts": { |
9 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | 9 | "clean": "rimraf dist tsconfig.tsbuildinfo", |
10 | "test": "jest", | 10 | "test": "jest", |
11 | "build": "vite build", | 11 | "build": "vite build", |
12 | "typecheck": "tsc" | 12 | "typecheck": "tsc" |
diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json index 49f223a..af0fd5f 100644 --- a/packages/preload/tsconfig.json +++ b/packages/preload/tsconfig.json | |||
@@ -1,10 +1,7 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "noEmit": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "rootDir": "src", | ||
8 | "lib": [ | 5 | "lib": [ |
9 | "dom", | 6 | "dom", |
10 | "dom.iterable", | 7 | "dom.iterable", |
diff --git a/packages/renderer/package.json b/packages/renderer/package.json index 9f4605d..e9bb4c6 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json | |||
@@ -5,7 +5,7 @@ | |||
5 | "main": "dist/index.html", | 5 | "main": "dist/index.html", |
6 | "types": "dist-types/index.d.ts", | 6 | "types": "dist-types/index.d.ts", |
7 | "scripts": { | 7 | "scripts": { |
8 | "clean": "rimraf dist dist-types node_modules tsconfig.tsbuildinfo", | 8 | "clean": "rimraf dist node_modules tsconfig.tsbuildinfo", |
9 | "build": "vite build", | 9 | "build": "vite build", |
10 | "typecheck": "tsc" | 10 | "typecheck": "tsc" |
11 | }, | 11 | }, |
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json index 998ed07..8746462 100644 --- a/packages/renderer/tsconfig.json +++ b/packages/renderer/tsconfig.json | |||
@@ -1,11 +1,8 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "noEmit": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "jsx": "react", | 5 | "jsx": "react", |
8 | "rootDir": "src", | ||
9 | "lib": [ | 6 | "lib": [ |
10 | "dom", | 7 | "dom", |
11 | "dom.iterable", | 8 | "dom.iterable", |
diff --git a/packages/service-inject/package.json b/packages/service-inject/package.json index 8298d20..7065cf0 100644 --- a/packages/service-inject/package.json +++ b/packages/service-inject/package.json | |||
@@ -6,7 +6,7 @@ | |||
6 | "main": "dist/index.cjs", | 6 | "main": "dist/index.cjs", |
7 | "types": "dist-types/index.d.ts", | 7 | "types": "dist-types/index.d.ts", |
8 | "scripts": { | 8 | "scripts": { |
9 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | 9 | "clean": "rimraf dist tsconfig.tsbuildinfo", |
10 | "build": "vite build", | 10 | "build": "vite build", |
11 | "typecheck": "tsc" | 11 | "typecheck": "tsc" |
12 | }, | 12 | }, |
diff --git a/packages/service-inject/tsconfig.json b/packages/service-inject/tsconfig.json index 4007f60..638690b 100644 --- a/packages/service-inject/tsconfig.json +++ b/packages/service-inject/tsconfig.json | |||
@@ -1,10 +1,7 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "noEmit": true, |
5 | "declarationDir": "dist-types", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "rootDir": "src", | ||
8 | "lib": [ | 5 | "lib": [ |
9 | "dom", | 6 | "dom", |
10 | "dom.iterable", | 7 | "dom.iterable", |
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json index 40b6837..714ae50 100644 --- a/packages/service-preload/package.json +++ b/packages/service-preload/package.json | |||
@@ -5,7 +5,7 @@ | |||
5 | "main": "dist/index.cjs", | 5 | "main": "dist/index.cjs", |
6 | "types": "dist-types/index.d.ts", | 6 | "types": "dist-types/index.d.ts", |
7 | "scripts": { | 7 | "scripts": { |
8 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | 8 | "clean": "rimraf dist tsconfig.tsbuildinfo", |
9 | "build": "vite build", | 9 | "build": "vite build", |
10 | "typecheck": "tsc" | 10 | "typecheck": "tsc" |
11 | }, | 11 | }, |
diff --git a/packages/service-preload/tsconfig.json b/packages/service-preload/tsconfig.json index e5b8ccb..638690b 100644 --- a/packages/service-preload/tsconfig.json +++ b/packages/service-preload/tsconfig.json | |||
@@ -1,10 +1,12 @@ | |||
1 | { | 1 | { |
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "noEmit": true, |
5 | "declarationDir": "dist-types", | 5 | "lib": [ |
6 | "emitDeclarationOnly": true, | 6 | "dom", |
7 | "rootDir": "src" | 7 | "dom.iterable", |
8 | "esnext" | ||
9 | ] | ||
8 | }, | 10 | }, |
9 | "references": [ | 11 | "references": [ |
10 | { | 12 | { |
diff --git a/packages/service-shared/package.json b/packages/service-shared/package.json index 1511906..a176def 100644 --- a/packages/service-shared/package.json +++ b/packages/service-shared/package.json | |||
@@ -4,9 +4,10 @@ | |||
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 | "types": "dist/index.d.ts", |
8 | "scripts": { | 8 | "scripts": { |
9 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | 9 | "clean": "rimraf dist tsconfig.tsbuildinfo", |
10 | "pretest": "yarn typecheck && yarn build", | ||
10 | "build": "vite build", | 11 | "build": "vite build", |
11 | "typecheck": "tsc" | 12 | "typecheck": "tsc" |
12 | }, | 13 | }, |
diff --git a/packages/service-shared/tsconfig.json b/packages/service-shared/tsconfig.json index de75833..ff5a29b 100644 --- a/packages/service-shared/tsconfig.json +++ b/packages/service-shared/tsconfig.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "composite": true, |
5 | "declarationDir": "dist-types", | 5 | "declarationDir": "dist", |
6 | "emitDeclarationOnly": true, | 6 | "emitDeclarationOnly": true, |
7 | "rootDir": "src" | 7 | "rootDir": "src" |
8 | }, | 8 | }, |
diff --git a/packages/service-shared/vite.config.js b/packages/service-shared/vite.config.js index 6f4959f..2391810 100644 --- a/packages/service-shared/vite.config.js +++ b/packages/service-shared/vite.config.js | |||
@@ -28,6 +28,7 @@ const config = makeConfig({ | |||
28 | ...builtinModules, | 28 | ...builtinModules, |
29 | ], | 29 | ], |
30 | }, | 30 | }, |
31 | emptyOutDir: false, // Do not remove .d.ts files. | ||
31 | }, | 32 | }, |
32 | }); | 33 | }); |
33 | 34 | ||
diff --git a/packages/shared/package.json b/packages/shared/package.json index 7f8830d..6406035 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json | |||
@@ -5,9 +5,10 @@ | |||
5 | "sideEffects": false, | 5 | "sideEffects": false, |
6 | "main": "dist/index.cjs", | 6 | "main": "dist/index.cjs", |
7 | "module": "dist/index.es.js", | 7 | "module": "dist/index.es.js", |
8 | "types": "dist-types/index.d.ts", | 8 | "types": "dist/index.d.ts", |
9 | "scripts": { | 9 | "scripts": { |
10 | "clean": "rimraf dist dist-types tsconfig.tsbuildinfo", | 10 | "clean": "rimraf dist tsconfig.tsbuildinfo", |
11 | "pretest": "yarn typecheck && yarn build", | ||
11 | "build": "vite build", | 12 | "build": "vite build", |
12 | "typecheck": "tsc" | 13 | "typecheck": "tsc" |
13 | }, | 14 | }, |
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index de75833..ff5a29b 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "extends": "../../tsconfig.json", | 2 | "extends": "../../tsconfig.json", |
3 | "compilerOptions": { | 3 | "compilerOptions": { |
4 | "composite": true, | 4 | "composite": true, |
5 | "declarationDir": "dist-types", | 5 | "declarationDir": "dist", |
6 | "emitDeclarationOnly": true, | 6 | "emitDeclarationOnly": true, |
7 | "rootDir": "src" | 7 | "rootDir": "src" |
8 | }, | 8 | }, |
diff --git a/packages/shared/vite.config.js b/packages/shared/vite.config.js index 718695a..5fb1ceb 100644 --- a/packages/shared/vite.config.js +++ b/packages/shared/vite.config.js | |||
@@ -33,6 +33,7 @@ const config = makeConfig({ | |||
33 | ...builtinModules, | 33 | ...builtinModules, |
34 | ], | 34 | ], |
35 | }, | 35 | }, |
36 | emptyOutDir: false, // Do not remove .d.ts files. | ||
36 | }, | 37 | }, |
37 | }); | 38 | }); |
38 | 39 | ||