From 72a919dc697a7e3e1063417786d478413f5f1d8c Mon Sep 17 00:00:00 2001 From: Cornelius Roemer Date: Sun, 25 Aug 2024 02:41:58 +0200 Subject: [PATCH] Update tsconfig to work correctly --- app/tsconfig.json | 6 ++++++ package.json | 3 ++- tsconfig.json | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/tsconfig.json b/app/tsconfig.json index 5c7450fd..bf32b9c6 100644 --- a/app/tsconfig.json +++ b/app/tsconfig.json @@ -1,8 +1,10 @@ { "extends": "../tsconfig.base.json", "compilerOptions": { + "declaration": true, "declarationDir": "../dist/tmp/appdts/", "outDir": "../target/", + "composite": true, "noImplicitAny": false }, "include": [ @@ -10,5 +12,9 @@ "./package.json", "../typings/extend-electron.d.ts", "../typings/ext-modules.d.ts" + ], + "exclude": [ + "../dist/**/*", + "../target/**/*" ] } diff --git a/package.json b/package.json index f4d39869..bb0005cf 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "start": "echo 'please run `yarn run dev` in one tab and then `yarn run app` in another one'", "app": "cross-env ELECTRONMON_LOGLEVEL=error electronmon target", "dev": "concurrently -n \"Webpack,TypeScript\" -c \"cyan.bold,blue.bold\" \"webpack -w\" \"tsc --build -v --pretty --watch --preserveWatchOutput\" -k", + "ts": "tsc --build -v --pretty --preserveWatchOutput", "build": "cross-env NODE_ENV=production webpack && tsc -b -v && cross-env BABEL_ENV=production babel target/renderer/bundle.js --out-file target/renderer/bundle.js --no-comments --minified", "lint": "eslint . --ext .js,.jsx,.ts,.tsx,.json", "test": "yarn run lint && yarn run test:unit", @@ -15,7 +16,7 @@ "postinstall": "yarn run v8-snapshot && webpack --config-name hyper-app && electron-builder install-app-deps && yarn run rebuild-node-pty && cpy --cwd=target node_modules \"../../app/\" && husky init && yarn run generate-schema", "rebuild-node-pty": "electron-rebuild -f -o node-pty -m target", "dist": "yarn run build && electron-builder", - "clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/renderer", + "clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/renderer && node ./bin/rimraf-standalone.js ./target && node ./bin/rimraf-standalone.js ./dist", "v8-snapshot": "cross-env npm_config_arch=x64 yarn run v8-snapshot:arch && cross-env npm_config_arch=arm64 yarn run v8-snapshot:arch", "v8-snapshot:arch": "yarn run mk-snapshot && yarn run cp-snapshot", "mk-snapshot": "cross-env ELECTRON_CUSTOM_VERSION=$npm_package_devDependencies_electron node node_modules/electron-mksnapshot/download-mksnapshot.js && node bin/mk-snapshot.js", diff --git a/tsconfig.json b/tsconfig.json index fd6b1813..82e474be 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "./tsconfig.base.json", "compilerOptions": { - "outDir": "./dist/tmp/root/" + "outDir": "./dist/tmp/root/", + "composite": true }, "include": [ "./app/",