Skip to content

chore: reconfigure typescript to be invoked once at the root level #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Julusian merged 1 commit into from
May 6, 2025
Merged

chore: reconfigure typescript to be invoked once at the root level #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dist
.env.development.local
.env.test.local
.env.production.local
*.tsbuildinfo

npm-debug.log*
yarn-debug.log*
Expand Down
2 changes: 1 addition & 1 deletion apps/app/nodemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"watch": ["src/**/*"],
"ignore": ["*.test.ts", "src/react/*", "README"],
"exec": "run -B -T tsc -p tsconfig.electron.json && electron ./dist/main.mjs --inspect=9229",
"exec": "electron ./dist/main.mjs --inspect=9229",
"ext": "ts"
}
3 changes: 1 addition & 2 deletions apps/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"node": "20"
},
"scripts": {
"build": "run -B -T rimraf ./dist && run -B -T tsc -p tsconfig.build.json && vite build",
"build:electron": "run -B -T tsc -p tsconfig.build.json",
"build": "vite build",
"build:binary": "electron-builder",
"start": "run build && electron dist/main.mjs",
"react:dev": "vite",
Expand Down
12 changes: 10 additions & 2 deletions apps/app/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist",
Expand All @@ -8,5 +8,13 @@
"baseUrl": "./"
},
"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.mts"],
"exclude": ["src/**/__tests__/**/*", "dist/**/*"]
"exclude": ["src/**/__tests__/**/*", "dist/**/*"],
"references": [
//
{ "path": "../../shared/packages/api" },
{ "path": "../../shared/packages/lib" },
{ "path": "../../shared/packages/models" },
{ "path": "../../shared/packages/peripherals" },
{ "path": "../../shared/packages/tsr-bridge" }
]
}
9 changes: 0 additions & 9 deletions apps/app/tsconfig.electron.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
"compilerOptions": {
"types": ["node", "jest"]
},
"include": ["src/**/*"],
"exclude": ["dist"]
}
2 changes: 1 addition & 1 deletion apps/tsr-bridge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"node": "20"
},
"scripts": {
"build": "run -B -T rimraf ./dist && run -B -T tsc && vite build",
"build": "vite build",
"build:binary": "electron-builder",
"start": "yarn build && electron dist/main.mjs",
"react:dev": "vite",
Expand Down
12 changes: 10 additions & 2 deletions apps/tsr-bridge/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist",
Expand All @@ -8,5 +8,13 @@
"baseUrl": "./"
},
"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.mts"],
"exclude": ["src/**/__tests__/**/*", "dist/**/*"]
"exclude": ["src/**/__tests__/**/*", "dist/**/*"],
"references": [
//
{ "path": "../../shared/packages/api" },
{ "path": "../../shared/packages/lib" },
{ "path": "../../shared/packages/models" },
{ "path": "../../shared/packages/peripherals" },
{ "path": "../../shared/packages/tsr-bridge" }
]
}
17 changes: 9 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,21 @@
"lint:raw": "eslint",
"lint": "run lint:raw .",
"lintfix": "run lint --fix",
"build": "lerna run build",
"build": "run build:ts && lerna run build",
"build:ts": "(rimraf apps/*/dist || true) && (rimraf shared/packages/*/dist || true) && (rimraf apps/*/*.tsbuildinfo || true) && (rimraf shared/packages/*/*.tsbuildinfo || true) && tsc -b tsconfig.build.json",
"build:binary": "lerna run build:binary",
"build:shared": "lerna run build --stream --scope=@shared/\\*",
"build:shared:changed": "lerna run build --stream --scope=@shared/\\* --since head --exclude-dependents --stream",
"start": "yarn && run build:shared && run dev:electron",
"start:all": "run build:shared && lerna run dev --stream",
"start:bridge": "run build:shared && run dev:bridge",
"start": "yarn && run build:ts && run dev:electron",
"start:all": "run build:ts && lerna run dev --stream",
"start:bridge": "run build:ts && run dev:bridge",
"dev:electron": "lerna run dev --stream --scope=superconductor",
"dev:bridge": "lerna run dev --stream --scope=tsr-bridge",
"test": "lerna run test",
"license-validate": "node scripts/license-check.mjs",
"release:bump": "lerna version --force-publish --no-push",
"release:prerelease": "lerna version prerelease --force-publish --no-push",
"release:preminor": "lerna version preminor --force-publish --no-push"
"release:preminor": "lerna version preminor --force-publish --no-push",
"check-types": "tsc -b --noEmit",
"watch-types": "tsc -b --noEmit --watch"
},
"resolutions": {
"app-builder-bin": "npm:@julusian/app-builder-bin@4.0.1",
Expand Down Expand Up @@ -78,5 +79,5 @@
"yarn lint:raw --fix"
]
},
"packageManager": "yarn@4.5.0"
"packageManager": "yarn@4.9.1"
}
4 changes: 0 additions & 4 deletions shared/packages/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"type": "git",
"url": "git+https://github.com/SuperFlyTV/SuperConductor.git"
},
"scripts": {
"build": "run -B -T rimraf dist && yarn build:main",
"build:main": "run -B -T tsc -p tsconfig.json"
},
"bugs": {
"url": "https://github.com/SuperFlyTV/SuperConductor/issues"
},
Expand Down
8 changes: 6 additions & 2 deletions shared/packages/api/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"include": ["src/**/*.ts"],
"exclude": ["src/**/__tests__/**/*"]
"exclude": ["src/**/__tests__/**/*"],
"references": [
//
{ "path": "../models" }
]
}
4 changes: 0 additions & 4 deletions shared/packages/lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"type": "git",
"url": "git+https://github.com/SuperFlyTV/SuperConductor.git"
},
"scripts": {
"build": "run -B -T rimraf dist && yarn build:main",
"build:main": "run -B -T tsc -p tsconfig.json"
},
"bugs": {
"url": "https://github.com/SuperFlyTV/SuperConductor/issues"
},
Expand Down
9 changes: 7 additions & 2 deletions shared/packages/lib/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"include": ["src/**/*.ts"]
"include": ["src/**/*.ts"],
"references": [
//
{ "path": "../api" },
{ "path": "../models" }
]
}
4 changes: 0 additions & 4 deletions shared/packages/models/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"type": "git",
"url": "git+https://github.com/SuperFlyTV/SuperConductor.git"
},
"scripts": {
"build": "run -B -T rimraf dist && yarn build:main",
"build:main": "run -B -T tsc -p tsconfig.json"
},
"dependencies": {
"graphics-data-definition": "^1.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion shared/packages/models/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
4 changes: 0 additions & 4 deletions shared/packages/peripherals/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"type": "git",
"url": "git+https://github.com/SuperFlyTV/SuperConductor.git"
},
"scripts": {
"build": "run -B -T rimraf dist && yarn build:main",
"build:main": "run -B -T tsc -p tsconfig.json"
},
"bugs": {
"url": "https://github.com/SuperFlyTV/SuperConductor/issues"
},
Expand Down
10 changes: 8 additions & 2 deletions shared/packages/peripherals/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"include": ["src/**/*.ts"]
"include": ["src/**/*.ts"],
"references": [
//
{ "path": "../api" },
{ "path": "../lib" },
{ "path": "../models" }
]
}
4 changes: 0 additions & 4 deletions shared/packages/server-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"type": "git",
"url": "git+https://github.com/SuperFlyTV/SuperConductor.git"
},
"scripts": {
"build": "run -B -T rimraf dist && yarn build:main",
"build:main": "run -B -T tsc -p tsconfig.json"
},
"bugs": {
"url": "https://github.com/SuperFlyTV/SuperConductor/issues"
},
Expand Down
9 changes: 7 additions & 2 deletions shared/packages/server-lib/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"include": ["src/**/*.ts"],
"exclude": ["src/**/__tests__/**/*"]
"exclude": ["src/**/__tests__/**/*"],
"references": [
//
{ "path": "../api" },
{ "path": "../models" }
]
}
4 changes: 0 additions & 4 deletions shared/packages/tsr-bridge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
"type": "git",
"url": "git+https://github.com/SuperFlyTV/SuperConductor.git"
},
"scripts": {
"build": "run -B -T rimraf dist && yarn build:main",
"build:main": "run -B -T tsc -p tsconfig.json"
},
"bugs": {
"url": "https://github.com/SuperFlyTV/SuperConductor/issues"
},
Expand Down
11 changes: 9 additions & 2 deletions shared/packages/tsr-bridge/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{
"extends": "../../../tsconfig.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"include": ["src/**/*.ts"],
"exclude": ["src/**/__tests__/**/*"]
"exclude": ["src/**/__tests__/**/*"],
"references": [
//
{ "path": "../api" },
{ "path": "../lib" },
{ "path": "../models" },
{ "path": "../peripherals" }
]
}
18 changes: 18 additions & 0 deletions tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"extends": "@tsconfig/node20/tsconfig.json",
"exclude": ["node_modules/**", "src/**/__tests__/*", "dist/**/*"],
"compilerOptions": {
"experimentalDecorators": true /* Enable experimental support for TC39 stage 2 draft decorators. */,
"types": ["node"],
"resolveJsonModule": true /* Enable importing .json files */,
"declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
"declarationMap": true /* Create sourcemaps for d.ts files. */,
"sourceMap": true /* Create source map files for emitted JavaScript files. */,
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
"skipLibCheck": true /* Skip type checking all .d.ts files. */,
"allowSyntheticDefaultImports": true,
"composite": true /* Enable project compilation */,
"isolatedModules": true
}
}
25 changes: 11 additions & 14 deletions tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"extends": "@tsconfig/node20/tsconfig.json",
"exclude": ["node_modules/**", "src/**/__tests__/*", "dist/**/*"],
"compilerOptions": {
"experimentalDecorators": true /* Enable experimental support for TC39 stage 2 draft decorators. */,
"types": ["node"],
"resolveJsonModule": true /* Enable importing .json files */,
"declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
"declarationMap": true /* Create sourcemaps for d.ts files. */,
"sourceMap": true /* Create source map files for emitted JavaScript files. */,
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
"skipLibCheck": true /* Skip type checking all .d.ts files. */,
"allowSyntheticDefaultImports": true
}
"files": [],
"references": [
{ "path": "./shared/packages/api/tsconfig.json" },
{ "path": "./shared/packages/lib/tsconfig.json" },
{ "path": "./shared/packages/models/tsconfig.json" },
{ "path": "./shared/packages/peripherals/tsconfig.json" },
{ "path": "./shared/packages/server-lib/tsconfig.json" },
{ "path": "./shared/packages/tsr-bridge/tsconfig.json" },
{ "path": "./apps/tsr-bridge/tsconfig.json" },
{ "path": "./apps/app/tsconfig.build.json" }
]
}
16 changes: 13 additions & 3 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
{
"extends": "./tsconfig.build.json"
}
{
"files": [],
"references": [
{ "path": "./shared/packages/api/tsconfig.json" },
{ "path": "./shared/packages/lib/tsconfig.json" },
{ "path": "./shared/packages/models/tsconfig.json" },
{ "path": "./shared/packages/peripherals/tsconfig.json" },
{ "path": "./shared/packages/server-lib/tsconfig.json" },
{ "path": "./shared/packages/tsr-bridge/tsconfig.json" },
{ "path": "./apps/app/tsconfig.json" },
{ "path": "./apps/tsr-bridge/tsconfig.json" }
]
}
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5877,7 +5877,7 @@ asn1@evs-broadcast/node-asn1:
languageName: node
linkType: hard

"csstype@npm:^3.0.2, csstype@npm:^3.1.3":
"csstype@npm:^3.0.10, csstype@npm:^3.0.2, csstype@npm:^3.1.3":
version: 3.1.3
resolution: "csstype@npm:3.1.3"
checksum: 10c0/80c089d6f7e0c5b2bd83cf0539ab41474198579584fa10d86d0cafe0642202343cbc119e076a0b1aece191989477081415d66c9fefbf3c957fc2fc4b7009f248
Expand Down Expand Up @@ -15549,11 +15549,11 @@ asn1@evs-broadcast/node-asn1:

"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.3.3#optional!builtin<compat/typescript>":
version: 5.8.2
resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=8c6c40"
resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/8a6cd29dfb59bd5a978407b93ae0edb530ee9376a5b95a42ad057a6f80ffb0c410489ccd6fe48d1d0dfad6e8adf5d62d3874bbd251f488ae30e11a1ce6dabd28
checksum: 10c0/5448a08e595cc558ab321e49d4cac64fb43d1fa106584f6ff9a8d8e592111b373a995a1d5c7f3046211c8a37201eb6d0f1566f15cdb7a62a5e3be01d087848e2
languageName: node
linkType: hard

Expand Down
Loading