Skip to content

Commit 0b1a951

Browse files
committed
chore: check meteor ts with packages
1 parent 3a5ae8d commit 0b1a951

7 files changed

Lines changed: 20 additions & 19 deletions

File tree

meteor/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"unit": "jest",
1515
"unitci": "jest --maxWorkers 2 --coverage",
1616
"unitcov": "jest --coverage",
17-
"test": "yarn check-types && yarn unit",
17+
"test": "yarn unit",
1818
"watch": "jest --watch",
1919
"update-snapshots": "jest --updateSnapshot",
20-
"ci:lint": "yarn check-types && yarn lint",
20+
"ci:lint": "yarn lint",
2121
"cov-open": "open-cli coverage/lcov-report/index.html",
2222
"cov": "yarn unitcov && yarn cov-open",
2323
"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 @@
3232
"prepareChangelog": "run release --prerelease --release-as patch",
3333
"validate:all-dependencies": "run validate:prod-dependencies && run validate:dev-dependencies && run license-validate",
3434
"validate:prod-dependencies": "yarn npm audit --environment production",
35-
"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate",
36-
"check-types": "tsc --noEmit -p tsconfig.json",
37-
"watch-types": "run check-types --watch"
35+
"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate"
3836
},
3937
"dependencies": {
4038
"@babel/runtime": "^7.26.7",

meteor/tsconfig-base.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,16 @@
1414
// "./node_modules/@types/meteor/*",
1515
"./.meteor/local/types/packages.d.ts"
1616
]
17-
}
17+
},
18+
"noEmit": true
1819
},
1920
"include": ["client/**/*", "server/**/*", "lib/**/*", "__mocks__/**/*", "tslint-rules/**/*"],
20-
"exclude": ["node_modules", "**/.coverage/**/*"]
21+
"exclude": ["node_modules", "**/.coverage/**/*"],
22+
"references": [
23+
{ "path": "../shared-lib" },
24+
{ "path": "../blueprints-integration" },
25+
{ "path": "../corelib" },
26+
{ "path": "../meteor-lib" },
27+
{ "path": "../job-worker" }
28+
]
2129
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"test:packages": "cd packages && run test",
2020
"lint:packages": "cd packages && run lint",
2121
"unit:packages": "cd packages && run unit",
22-
"check-types:meteor": "cd meteor && run check-types",
22+
"check-types": "cd packages && run build",
2323
"test:meteor": "cd meteor && run test",
2424
"lint:meteor": "cd meteor && yarn lint",
2525
"unit:meteor": "cd meteor && yarn unit",
@@ -33,7 +33,7 @@
3333
"meteor": "cd meteor && meteor",
3434
"docs:serve": "cd packages && run docs:serve",
3535
"reset": "node scripts/reset.mjs",
36-
"test-all": "yarn install && run install-and-build && run check-types:meteor && run lint:packages && run lint:meteor && run test:packages && run test:meteor"
36+
"test-all": "yarn install && run install-and-build && run check-types && run lint:packages && run lint:meteor && run test:packages && run test:meteor"
3737
},
3838
"devDependencies": {
3939
"concurrently": "^9.1.2",

packages/tsconfig.build.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// { "path": "./openapi/tsconfig.build.json" },
1212
{ "path": "./live-status-gateway/tsconfig.build.json" },
1313
{ "path": "./meteor-lib/tsconfig.build.json" },
14-
{ "path": "./webui/tsconfig.app.json" }
14+
{ "path": "./webui/tsconfig.app.json" },
15+
{ "path": "../meteor/tsconfig.json" }
1516
]
1617
}

packages/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
{ "path": "./openapi/tsconfig.json" },
1212
{ "path": "./live-status-gateway/tsconfig.json" },
1313
{ "path": "./meteor-lib/tsconfig.json" },
14-
{ "path": "./webui/tsconfig.json" }
14+
{ "path": "./webui/tsconfig.json" },
15+
{ "path": "../meteor/tsconfig.json" }
1516
]
1617
}

packages/webui/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"dev": "vite --port=3005 --force",
1818
"build": "tsc -b && vite build",
1919
"check-types": "tsc -p tsconfig.app.json --noEmit",
20-
"watch-types": "run check-types --watch",
2120
"preview": "vite preview",
2221
"lint:raw": "run -T eslint",
2322
"lint": "run lint:raw .",

scripts/run.mjs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function watchPackages() {
1212
{
1313
command: 'yarn watch --preserveWatchOutput',
1414
cwd: "packages",
15-
name: "PACKAGES-TSC",
15+
name: "TSC",
1616
prefixColor: "red",
1717
},
1818
];
@@ -41,12 +41,6 @@ function watchMeteor() {
4141
const rootUrl = process.env.ROOT_URL ? new URL(process.env.ROOT_URL) : null
4242

4343
return [
44-
{
45-
command: "yarn watch-types --preserveWatchOutput",
46-
cwd: "meteor",
47-
name: "METEOR-TSC",
48-
prefixColor: "blue",
49-
},
5044
{
5145
command: joinCommand(
5246
'yarn debug',

0 commit comments

Comments
 (0)