chore: unify tsc for packages and meteor

Author: Julusian

.github/workflows/node.yaml

@@ -37,16 +37,16 @@ jobs:
 
           yarn config set cacheFolder /home/runner/lint-core-cache
           yarn
+
+          # setup zodern:types. No linters are setup, so this simply installs the packages
+          yarn meteor lint
+
           yarn build:packages
         env:
           CI: true
       - name: Run typecheck and linter
         run: |
           cd meteor
-
-          # setup zodern:types. No linters are setup, so this simply installs the packages
-          meteor lint
-
           yarn ci:lint
         env:
           CI: true
@@ -78,16 +78,16 @@ jobs:
 
           yarn config set cacheFolder /home/runner/test-core-cache
           yarn
+
+          # setup zodern:types. No linters are setup, so this simply installs the packages
+          yarn meteor lint
+
           yarn build:packages
         env:
           CI: true
       - name: Run Tests
         run: |
           cd meteor
-
-          # setup zodern:types. No linters are setup, so this simply installs the packages
-          meteor lint
-
           NODE_OPTIONS="--max-old-space-size=6144" yarn unitci --force-exit
         env:
           CI: true
@@ -357,7 +357,7 @@ jobs:
 
           cd packages
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.gateway-name }} --include-dependencies --stream build
+          yarn build:single ${{ matrix.gateway-name }}/tsconfig.build.json
           yarn run pinst --disable
           yarn workspaces focus ${{ matrix.gateway-name }} --production
       - name: Set up Docker Buildx
@@ -425,7 +425,7 @@ jobs:
           echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
 
   lint-packages:
-    name: Lint Package
+    name: Lint Package ${{ matrix.package-name }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
@@ -443,8 +443,10 @@ jobs:
           - job-worker
           - openapi
           - live-status-gateway
-          - webui
           - live-status-gateway-api
+        include:
+          - package-name: webui
+            tsconfig-name: tsconfig.json
 
     steps:
       - uses: actions/checkout@v6
@@ -467,7 +469,12 @@ jobs:
           cd packages
           yarn config set cacheFolder /home/runner/${{ matrix.package-name }}-cache
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
+
+          if [ "${{ matrix.package-name }}" = "openapi" ]; then
+            yarn workspace @sofie-automation/openapi run build
+          else
+            yarn build:single ${{ matrix.package-name }}/${{ matrix.tsconfig-name || 'tsconfig.build.json' }}
+          fi
         env:
           CI: true
       - name: Run typecheck and linter
@@ -478,7 +485,7 @@ jobs:
           CI: true
 
   test-packages:
-    name: Test Package (main)
+    name: Test Package ${{ matrix.package-name }} (Node ${{ matrix.node-version }})
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
@@ -513,6 +520,7 @@ jobs:
           - node-version: 22.x
             package-name: webui
             send-coverage: true
+            tsconfig-name: tsconfig.json
           # manual meteor-lib as it only needs a couple of versions
           - node-version: 22.x
             package-name: meteor-lib
@@ -539,7 +547,12 @@ jobs:
           cd packages
           yarn config set cacheFolder /home/runner/test-packages-cache
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
+
+          if [ "${{ matrix.package-name }}" = "openapi" ]; then
+            yarn workspace @sofie-automation/openapi run build
+          else
+            yarn build:single ${{ matrix.package-name }}/${{ matrix.tsconfig-name || 'tsconfig.build.json' }}
+          fi
         env:
           CI: true
       - name: Run tests
@@ -631,6 +644,7 @@ jobs:
         uses: actions/setup-node@v6
         with:
           node-version-file: ".node-version"
+      - uses: ./.github/actions/setup-meteor
       - name: restore node_modules
         uses: actions/cache@v4
         with:
@@ -641,9 +655,13 @@ jobs:
         run: |
           corepack enable
 
-          cd packages
           yarn config set cacheFolder /home/runner/publish-docs-cache
           yarn install
+
+          # setup zodern:types. No linters are setup, so this simply installs the packages
+          yarn meteor lint
+
+          cd packages
           yarn build:all
         env:
           CI: true

.github/workflows/publish-libs.yml

@@ -68,14 +68,14 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version-file: '.node-version'
+          node-version-file: ".node-version"
       - name: Prepare Environment
         run: |
           corepack enable
 
           cd packages
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
+          yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
         env:
           CI: true
       - name: Run typecheck and linter
@@ -119,7 +119,7 @@ jobs:
 
           cd packages
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
+          yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
         env:
           CI: true
       - name: Run tests
@@ -145,7 +145,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version-file: '.node-version'
+          node-version-file: ".node-version"
       - name: Prepare Environment
         run: |
           corepack enable
@@ -222,7 +222,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version-file: '.node-version'
+          node-version-file: ".node-version"
 
       - name: Download release artifact
         uses: actions/download-artifact@v6

.gitignore

@@ -15,6 +15,8 @@ meteor-settings.json
 .github/workflows/forkSync.yml
 .github/workflows/forkSynk.yml
 
+**/*.tsbuildinfo
+
 .pnp.*
 .yarn/*
 !.yarn/patches

meteor/package.json

@@ -14,10 +14,10 @@
 		"unit": "jest",
 		"unitci": "jest --maxWorkers 2 --coverage",
 		"unitcov": "jest --coverage",
-		"test": "yarn check-types && yarn unit",
+		"test": "yarn unit",
 		"watch": "jest --watch",
 		"update-snapshots": "jest --updateSnapshot",
-		"ci:lint": "yarn check-types && yarn lint",
+		"ci:lint": "yarn lint",
 		"cov-open": "open-cli coverage/lcov-report/index.html",
 		"cov": "yarn unitcov && yarn cov-open",
 		"license-validate": "node ../scripts/checkLicenses.js --allowed=\"MIT,BSD,ISC,Apache,Unlicense,CC0,LGPL,CC BY 3.0,CC BY 4.0,MPL 2.0,Python 2.0\" --excludePackages=timecode,rxjs/ajax,rxjs/fetch,rxjs/internal-compatibility,nw-pre-gyp-module-test,rxjs/operators,rxjs/testing,rxjs/webSocket,undefined,i18next-conv,@fortawesome/fontawesome-common-types,argv,indexof,custom-license,private,public-domain-module,@sofie-automation/corelib,@sofie-automation/shared-lib,@sofie-automation/job-worker",
@@ -32,9 +32,7 @@
 		"prepareChangelog": "run release --prerelease --release-as patch",
 		"validate:all-dependencies": "run validate:prod-dependencies && run validate:dev-dependencies && run license-validate",
 		"validate:prod-dependencies": "yarn npm audit --environment production",
-		"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate",
-		"check-types": "tsc --noEmit -p tsconfig.json",
-		"watch-types": "run check-types --watch"
+		"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate"
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.26.7",

meteor/tsconfig-base.json

@@ -14,8 +14,16 @@
 				//   "./node_modules/@types/meteor/*",
 				"./.meteor/local/types/packages.d.ts"
 			]
-		}
+		},
+		"noEmit": true
 	},
 	"include": ["client/**/*", "server/**/*", "lib/**/*", "__mocks__/**/*", "tslint-rules/**/*"],
-	"exclude": ["node_modules", "**/.coverage/**/*"]
+	"exclude": ["node_modules", "**/.coverage/**/*"],
+	"references": [
+		{ "path": "../shared-lib/tsconfig.build.json" },
+		{ "path": "../blueprints-integration/tsconfig.build.json" },
+		{ "path": "../corelib/tsconfig.build.json" },
+		{ "path": "../meteor-lib/tsconfig.build.json" },
+		{ "path": "../job-worker/tsconfig.build.json" }
+	]
 }

package.json

@@ -19,7 +19,7 @@
 		"test:packages": "cd packages && run test",
 		"lint:packages": "cd packages && run lint",
 		"unit:packages": "cd packages && run unit",
-		"check-types:meteor": "cd meteor && run check-types",
+		"check-types": "cd packages && run build",
 		"test:meteor": "cd meteor && run test",
 		"lint:meteor": "cd meteor && yarn lint",
 		"unit:meteor": "cd meteor && yarn unit",
@@ -33,7 +33,7 @@
 		"meteor": "cd meteor && meteor",
 		"docs:serve": "cd packages && run docs:serve",
 		"reset": "node scripts/reset.mjs",
-		"test-all": "yarn install && run install-and-build && run check-types:meteor && run lint:packages && run lint:meteor && run test:packages && run test:meteor"
+		"test-all": "yarn install && run install-and-build && run check-types && run lint:packages && run lint:meteor && run test:packages && run test:meteor"
 	},
 	"devDependencies": {
 		"concurrently": "^9.1.2",

packages/blueprints-integration/package.json

@@ -15,8 +15,6 @@
 	},
 	"homepage": "https://github.com/Sofie-Automation/sofie-core/blob/main/packages/blueprints-integration#readme",
 	"scripts": {
-		"build": "run -T rimraf dist && run build:main",
-		"build:main": "run -T tsc -p tsconfig.build.json",
 		"lint:raw": "run -T eslint",
 		"lint": "run lint:raw .",
 		"unit": "run -T jest",

packages/blueprints-integration/tsconfig.build.json

@@ -1,15 +1,22 @@
 {
 	"extends": "@sofie-automation/code-standard-preset/ts/tsconfig.lib",
 	"include": ["src/**/*.ts"],
-	"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
+	"exclude": ["node_modules/**", "**/*spec.ts", "**/__tests__/*", "**/__mocks__/*"],
 	"compilerOptions": {
 		"outDir": "./dist",
+		"rootDir": "./src",
 		"baseUrl": "./",
 		"paths": {
 			"*": ["./node_modules/*"],
 			"@sofie-automation/blueprints-integration": ["./src/index.ts"]
 		},
 		"resolveJsonModule": true,
-		"types": ["node"]
-	}
+		"types": ["node"],
+		"composite": true
+	},
+	"references": [
+		{
+			"path": "../shared-lib"
+		}
+	]
 }

packages/corelib/package.json

@@ -16,8 +16,6 @@
 	},
 	"homepage": "https://github.com/Sofie-Automation/sofie-core/blob/main/packages/corelib#readme",
 	"scripts": {
-		"build": "run -T rimraf dist && run build:main",
-		"build:main": "run -T tsc -p tsconfig.build.json",
 		"lint:raw": "run -T eslint",
 		"lint": "run lint:raw .",
 		"unit": "run -T jest",

packages/corelib/tsconfig.build.json

@@ -1,9 +1,10 @@
 {
 	"extends": "@sofie-automation/code-standard-preset/ts/tsconfig.lib",
 	"include": ["src/**/*.ts"],
-	"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
+	"exclude": ["node_modules/**", "**/*spec.ts", "**/__tests__/*", "**/__mocks__/*"],
 	"compilerOptions": {
 		"target": "es2019",
+		"rootDir": "./src",
 		"outDir": "./dist",
 		"baseUrl": "./",
 		"paths": {
@@ -12,6 +13,15 @@
 		},
 		"resolveJsonModule": true,
 		"types": ["node"],
-		"esModuleInterop": true
-	}
+		"esModuleInterop": true,
+		"composite": true
+	},
+	"references": [
+		{
+			"path": "../shared-lib"
+		},
+		{
+			"path": "../blueprints-integration"
+		}
+	]
 }