Skip to content

Commit 3a84a35

Browse files
authored
chore: set up turborepo (#35)
* chore: set up turborepo * fix build * fix * update lock file
1 parent cfa33af commit 3a84a35

File tree

29 files changed

+965
-1192
lines changed

29 files changed

+965
-1192
lines changed

.github/workflows/build-test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,5 @@ jobs:
6969
- name: Lint
7070
run: pnpm run lint
7171

72-
# install again for internal dependencies
73-
- name: Install internal dependencies
74-
run: pnpm install --frozen-lockfile
75-
7672
- name: Test
7773
run: pnpm run test

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"description": "ZenStack",
55
"packageManager": "[email protected]",
66
"scripts": {
7-
"build": "pnpm -r build",
8-
"watch": "pnpm -r --parallel watch",
9-
"lint": "pnpm -r lint",
10-
"test": "pnpm vitest",
7+
"build": "turbo run build",
8+
"watch": "turbo run watch build",
9+
"lint": "turbo run lint",
10+
"test": "turbo run test",
1111
"publish-all": "pnpm --filter \"./packages/**\" -r publish --tag next",
1212
"publish-preview": "pnpm --filter \"./packages/**\" -r publish --tag next --force --registry https://preview.registry.zenstack.dev/",
1313
"unpublish-preview": "pnpm --filter \"./packages/**\" -r --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ \"\\$PNPM_PACKAGE_NAME\""
@@ -16,16 +16,17 @@
1616
"author": "",
1717
"license": "MIT",
1818
"devDependencies": {
19-
"@swc/core": "^1.10.15",
19+
"@swc/core": "^1.12.5",
20+
"@types/node": "^20.17.24",
2021
"@typescript-eslint/eslint-plugin": "~7.3.1",
2122
"@typescript-eslint/parser": "~7.3.1",
2223
"eslint": "~8.57.1",
2324
"npm-run-all": "^4.1.5",
24-
"tsup": "^8.3.5",
25-
"tsx": "^4.19.2",
26-
"turbo": "^2.3.3",
27-
"typescript": "~5.7.3",
28-
"vitest": "^3.1.1"
25+
"tsup": "^8.5.0",
26+
"tsx": "^4.20.3",
27+
"turbo": "^2.5.4",
28+
"typescript": "catalog:",
29+
"vitest": "^3.2.4"
2930
},
3031
"pnpm": {
3132
"onlyBuiltDependencies": [

packages/cli/package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,24 @@
2222
},
2323
"scripts": {
2424
"build": "tsup-node",
25-
"watch": "tsup-node --watch",
2625
"lint": "eslint src --ext ts",
27-
"test": "vitest",
26+
"test": "vitest run",
2827
"pack": "pnpm pack"
2928
},
3029
"dependencies": {
31-
"@types/node": "^20.0.0",
3230
"@zenstackhq/language": "workspace:*",
3331
"@zenstackhq/sdk": "workspace:*",
3432
"async-exit-hook": "^2.0.1",
3533
"colors": "1.4.0",
3634
"commander": "^8.3.0",
37-
"langium": "~3.3.0",
35+
"langium": "catalog:",
3836
"ora": "^5.4.1",
3937
"package-manager-detector": "^1.3.0",
4038
"tiny-invariant": "^1.3.3",
41-
"ts-pattern": "^4.3.0"
39+
"ts-pattern": "catalog:"
4240
},
4341
"peerDependencies": {
44-
"prisma": "^6.0.0",
45-
"typescript": "^5.0.0"
42+
"prisma": "catalog:"
4643
},
4744
"devDependencies": {
4845
"@types/async-exit-hook": "^2.0.0",
@@ -51,6 +48,7 @@
5148
"@types/tmp": "^0.2.6",
5249
"@zenstackhq/runtime": "workspace:*",
5350
"@zenstackhq/testtools": "workspace:*",
51+
"@zenstackhq/typescript-config": "workspace:*",
5452
"better-sqlite3": "^11.8.1",
5553
"tmp": "^0.2.3"
5654
}

packages/cli/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "@zenstackhq/typescript-config/base.json",
33
"compilerOptions": {
44
"outDir": "dist"
55
},

packages/create-zenstack/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"type": "module",
66
"scripts": {
77
"build": "tsup-node",
8-
"watch": "tsup-node --watch",
98
"lint": "eslint src --ext ts",
109
"pack": "pnpm pack"
1110
},
@@ -36,7 +35,6 @@
3635
"ora": "^5.4.1"
3736
},
3837
"devDependencies": {
39-
"@types/colors": "^1.2.4",
40-
"@types/node": "^20.0.0"
38+
"@zenstackhq/typescript-config": "workspace:*"
4139
}
4240
}

packages/create-zenstack/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "@zenstackhq/typescript-config/base.json",
33
"compilerOptions": {
44
"outDir": "dist"
55
},

packages/ide/vscode/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
},
1212
"scripts": {
1313
"build": "tsc --noEmit && tsup",
14-
"watch": "run-p watch:*",
15-
"watch:tsc": "tsc --watch --noEmit",
16-
"watch:tsup": "tsup --watch",
1714
"lint": "eslint src --ext ts",
1815
"vscode:publish": "pnpm build && vsce publish --no-dependencies --pre-release --follow-symlinks",
1916
"vscode:package": "pnpm build && vsce package --no-dependencies"
@@ -33,13 +30,14 @@
3330
"license": "MIT",
3431
"packageManager": "[email protected]",
3532
"dependencies": {
36-
"langium": "~3.3.0",
33+
"langium": "catalog:",
3734
"vscode-languageclient": "^9.0.1",
3835
"vscode-languageserver": "^9.0.1",
3936
"@zenstackhq/language": "workspace:*"
4037
},
4138
"devDependencies": {
42-
"@types/vscode": "^1.63.0"
39+
"@types/vscode": "^1.63.0",
40+
"@zenstackhq/typescript-config": "workspace:*"
4341
},
4442
"files": [
4543
"dist",

packages/ide/vscode/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../../tsconfig.json",
2+
"extends": "@zenstackhq/typescript-config/base.json",
33
"compilerOptions": {
44
"outDir": "dist"
55
},

packages/language/package.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
"type": "module",
1212
"scripts": {
1313
"build": "pnpm langium:generate && tsup-node",
14-
"watch": "run-p watch:*",
15-
"watch:ts": "tsup-node --watch",
16-
"watch:langium": "langium generate --watch",
1714
"lint": "eslint src --ext ts",
1815
"langium:generate": "langium generate",
1916
"langium:generate:production": "langium generate --mode=production",
@@ -46,15 +43,14 @@
4643
}
4744
},
4845
"dependencies": {
49-
"langium": "~3.3.0",
46+
"langium": "catalog:",
5047
"pluralize": "^8.0.0",
51-
"ts-pattern": "^5.6.0"
48+
"ts-pattern": "catalog:"
5249
},
5350
"devDependencies": {
54-
"@types/node": "^20.0.0",
5551
"@types/pluralize": "^0.0.33",
5652
"langium-cli": "~3.3.0",
57-
"typescript": "~5.1.6"
53+
"@zenstackhq/typescript-config": "workspace:*"
5854
},
5955
"volta": {
6056
"node": "18.19.1",

packages/language/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "@zenstackhq/typescript-config/base.json",
33
"compilerOptions": {
44
"outDir": "dist"
55
},

0 commit comments

Comments
 (0)