Skip to content

Commit 1e603e0

Browse files
authored
Merge pull request Sofie-Automation#416 from Sofie-Automation/feat/modernise
chore: reconfigure tsc to run at the root, not for each package individually
2 parents dddc23e + 779529a commit 1e603e0

36 files changed

Lines changed: 423 additions & 145 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ packages/*/coverage/
1414
packages/timeline-state-resolver/src/$schemas/generated
1515
packages/timeline-state-resolver/src/translations.json
1616
.npmrc
17+
*.tsbuildinfo
18+
packages/*/tsconfig.build.tsbuildinfo
1719

1820
# Ignore JetBrains IDE specific files
1921
.idea

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,24 @@
1313
},
1414
"scripts": {
1515
"prepare": "husky install",
16-
"build": "run generate-schema-types && lerna run build",
17-
"build:types": "cd packages/timeline-state-resolver-types && yarn build",
18-
"build:main": "cd packages/timeline-state-resolver && yarn build",
16+
"build": "(rimraf packages/*/dist packages/*/*.tsbuildinfo || true) && run build:prepare && run build:main",
17+
"build:prepare": "run generate-schema-types && run translations:bundle",
18+
"build:main": "tsc --build tsconfig.build.json",
1919
"lint": "lerna exec yarn lint -- --",
2020
"test": "lerna exec yarn test",
2121
"test:changed": "lerna run --since origin/master --include-dependents test",
2222
"unit": "lerna exec yarn unit",
2323
"unitci": "lerna exec yarn unitci",
24-
"watch": "lerna run --parallel build:main -- --watch --preserveWatchOutput",
24+
"watch": "run build:main --watch --preserveWatchOutput",
2525
"docs": "typedoc .",
2626
"release:set-version": "lerna version --exact --no-changelog --no-git-tag-version --no-push --yes",
2727
"release:bump-release": "lerna version --exact --conventional-commits --changelog-preset conventionalcommits --conventional-graduate --tag-version-prefix='' --no-push --force-publish='*'",
2828
"release:bump-prerelease": "lerna version --exact --conventional-commits --changelog-preset conventionalcommits --conventional-prerelease --tag-version-prefix='' --no-push --force-publish='*'",
2929
"validate:dependencies": "lerna exec --parallel yarn validate:dependencies",
3030
"validate:dev-dependencies": "lerna exec --parallel yarn validate:dev-dependencies",
31-
"generate-schema-types": "lerna run generate-schema-types --stream",
32-
"translations:extract": "lerna run translations:extract --stream",
31+
"generate-schema-types": "yarn workspace timeline-state-resolver generate-schema-types",
32+
"translations:extract": "yarn workspace timeline-state-resolver translations:extract",
33+
"translations:bundle": "yarn workspace timeline-state-resolver translations:bundle",
3334
"lint-staged": "./node_modules/.bin/lint-staged",
3435
"prettier": "cd $INIT_CWD && \"$PROJECT_CWD/node_modules/.bin/prettier\"",
3536
"eslint": "cd $INIT_CWD && \"$PROJECT_CWD/node_modules/.bin/eslint\""
@@ -38,19 +39,19 @@
3839
"@sofie-automation/code-standard-preset": "~2.5.2",
3940
"@types/debug": "^4.1.12",
4041
"@types/jest": "^30.0.0",
41-
"@types/node": "^20.19.25",
42+
"@types/node": "^20.19.28",
4243
"@types/semver": "^7.7.1",
4344
"@types/sprintf-js": "^1.1.4",
4445
"@types/underscore": "^1.13.0",
4546
"@types/ws": "^8.18.1",
4647
"jest": "^30.2.0",
47-
"lerna": "^9.0.1",
48+
"lerna": "^9.0.3",
4849
"open-cli": "^8.0.0",
4950
"rimraf": "^6.1.2",
5051
"semver": "^7.7.3",
51-
"ts-jest": "^29.4.5",
52+
"ts-jest": "^29.4.6",
5253
"typedoc": "^0.26.11",
53-
"typescript": "~4.9.5"
54+
"typescript": "~5.1"
5455
},
5556
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
5657
"packageManager": "yarn@4.12.0"

packages/quick-tsr/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@
2121
},
2222
"contributors": [],
2323
"scripts": {
24-
"build": "run -T rimraf dist && run build:main",
25-
"buildstart": "run build && run start",
26-
"buildinspect": "run build && run inspect",
27-
"build:main": "run -T tsc -p tsconfig.build.json",
24+
"start": "tsx src/index.ts",
2825
"lint:raw": "run -T eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist",
2926
"lint": "run lint:raw .",
3027
"lint-fix": "run lint --fix",
3128
"inspect": "node --inspect dist/index.js",
32-
"start": "tsx src/index.ts",
3329
"validate:dependencies": "yarn npm audit --environment production && run license-validate",
3430
"validate:dev-dependencies": "yarn npm audit --environment development",
3531
"license-validate": "run -T sofie-licensecheck",
@@ -70,6 +66,6 @@
7066
"underscore": "^1.13.7"
7167
},
7268
"devDependencies": {
73-
"tsx": "^4.20.6"
69+
"tsx": "^4.21.0"
7470
}
7571
}

packages/quick-tsr/tsconfig.build.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
55
"compilerOptions": {
66
"outDir": "./dist",
7+
"rootDir": "./src",
78
"baseUrl": "./",
89
"paths": {
910
"*": ["./node_modules/*"],
1011
"{{PACKAGE-NAME}}": ["./src/index.ts"]
1112
},
1213
"types": ["node"],
13-
"skipLibCheck": true
14-
}
14+
"composite": true,
15+
"skipLibCheck": true,
16+
"declaration": true
17+
},
18+
"references": [{ "path": "../timeline-state-resolver/tsconfig.build.json" }]
1519
}

packages/timeline-state-resolver-api/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
"test": "run lint && run unit",
4545
"unit": "run -T jest",
4646
"unitci": "run -T jest --coverage",
47-
"build": "run -T rimraf dist && run build:main",
48-
"build:main": "run -T tsc -p tsconfig.build.json",
4947
"cov": "run -T jest --coverage && run cov-open",
5048
"cov-open": "run -T open-cli coverage/lcov-report/index.html",
5149
"validate:dependencies": "yarn npm audit --environment production && yarn license-validate",

packages/timeline-state-resolver-api/tsconfig.build.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
55
"compilerOptions": {
66
"outDir": "./dist",
7+
"rootDir": "./src",
78
"baseUrl": "./",
89
"paths": {
910
"*": ["./node_modules/*"],
1011
"{{PACKAGE-NAME}}": ["./src/index.ts"]
1112
},
12-
"types": ["node"]
13-
}
13+
"types": ["node"],
14+
"composite": true
15+
},
16+
"references": [{ "path": "../timeline-state-resolver-types/tsconfig.build.json" }]
1417
}

packages/timeline-state-resolver-tools/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
"production"
8080
],
8181
"dependencies": {
82-
"@apidevtools/json-schema-ref-parser": "^15.1.2",
82+
"@apidevtools/json-schema-ref-parser": "^15.1.3",
8383
"i18next-conv": "^16.0.0",
8484
"i18next-parser": "^9.3.0",
8585
"json-schema-to-typescript": "^15.0.4",

packages/timeline-state-resolver-types/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
"test": "run lint && run unit",
4949
"unit": "run -T jest",
5050
"unitci": "run -T jest --coverage",
51-
"build": "run -T rimraf dist && run build:main",
52-
"build:main": "run -T tsc -p tsconfig.build.json",
5351
"cov": "run -T jest --coverage && run cov-open",
5452
"cov-open": "run -T open-cli coverage/lcov-report/index.html",
5553
"validate:dependencies": "yarn npm audit --environment production && yarn license-validate",

packages/timeline-state-resolver-types/tsconfig.build.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
55
"compilerOptions": {
66
"outDir": "./dist",
7+
"rootDir": "./src",
78
"baseUrl": "./",
89
"paths": {
910
"*": ["./node_modules/*"],
1011
"{{PACKAGE-NAME}}": ["./src/index.ts"]
1112
},
12-
"types": ["node"]
13+
"types": ["node"],
14+
"composite": true
1315
}
1416
}

packages/timeline-state-resolver/package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
],
4949
"scripts": {
5050
"unlink:all": "yarn unlink atem-connection & yarn unlink atem-state & yarn unlink casparcg-connection & yarn unlink casparcg-state & yarn unlink superfly-timeline",
51-
"build": "run -T rimraf dist && run translations:bundle && run build:main",
52-
"build:main": "run -T tsc -p tsconfig.build.json",
5351
"lint:raw": "run -T eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist",
5452
"lint": "run lint:raw .",
5553
"lint-fix": "run lint --fix",
@@ -92,14 +90,13 @@
9290
"dependencies": {
9391
"@tv2media/v-connection": "^7.3.4",
9492
"atem-connection": "3.7.0",
95-
"atem-state": "1.2.0",
93+
"atem-state": "1.2.1",
9694
"cacheable-lookup": "^5.0.4",
9795
"casparcg-connection": "6.3.3",
9896
"casparcg-state": "3.0.4",
9997
"debug": "^4.4.3",
10098
"deepmerge": "^4.3.1",
10199
"emberplus-connection": "^0.3.1",
102-
"eventemitter3": "^4.0.7",
103100
"got": "^11.8.6",
104101
"hpagent": "^1.2.0",
105102
"hyperdeck-connection": "2.0.1",
@@ -118,8 +115,8 @@
118115
"tv-automation-quantel-gateway-client": "^3.1.7",
119116
"type-fest": "^3.13.1",
120117
"underscore": "^1.13.7",
121-
"utf-8-validate": "^6.0.5",
122-
"ws": "^8.18.3",
118+
"utf-8-validate": "^6.0.6",
119+
"ws": "^8.19.0",
123120
"xml-js": "^1.6.11"
124121
},
125122
"publishConfig": {
@@ -134,7 +131,7 @@
134131
]
135132
},
136133
"devDependencies": {
137-
"@types/simple-oauth2": "^5.0.7",
134+
"@types/simple-oauth2": "^5.0.8",
138135
"jest-mock-extended": "^4.0.0",
139136
"json-schema-to-typescript": "^15.0.4",
140137
"timeline-state-resolver-tools": "10.0.0-release53"

0 commit comments

Comments
 (0)