Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,5 @@ jobs:
- name: Lint
run: pnpm run lint

# install again for internal dependencies
- name: Install internal dependencies
run: pnpm install --frozen-lockfile

- name: Test
run: pnpm run test
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"description": "ZenStack",
"packageManager": "pnpm@10.12.1",
"scripts": {
"build": "pnpm -r build",
"watch": "pnpm -r --parallel watch",
"lint": "pnpm -r lint",
"test": "pnpm vitest",
"build": "turbo run build",
"watch": "turbo run watch build",
"lint": "turbo run lint",
"test": "turbo run test",
"publish-all": "pnpm --filter \"./packages/**\" -r publish --tag next",
"publish-preview": "pnpm --filter \"./packages/**\" -r publish --tag next --force --registry https://preview.registry.zenstack.dev/",
"unpublish-preview": "pnpm --filter \"./packages/**\" -r --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ \"\\$PNPM_PACKAGE_NAME\""
Expand All @@ -16,16 +16,17 @@
"author": "",
"license": "MIT",
"devDependencies": {
"@swc/core": "^1.10.15",
"@swc/core": "^1.12.5",
"@types/node": "^20.17.24",
"@typescript-eslint/eslint-plugin": "~7.3.1",
"@typescript-eslint/parser": "~7.3.1",
"eslint": "~8.57.1",
"npm-run-all": "^4.1.5",
"tsup": "^8.3.5",
"tsx": "^4.19.2",
"turbo": "^2.3.3",
"typescript": "~5.7.3",
"vitest": "^3.1.1"
"tsup": "^8.5.0",
"tsx": "^4.20.3",
"turbo": "^2.5.4",
"typescript": "catalog:",
"vitest": "^3.2.4"
},
"pnpm": {
"onlyBuiltDependencies": [
Expand Down
12 changes: 5 additions & 7 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,24 @@
},
"scripts": {
"build": "tsup-node",
"watch": "tsup-node --watch",
"lint": "eslint src --ext ts",
"test": "vitest",
"test": "vitest run",
"pack": "pnpm pack"
},
"dependencies": {
"@types/node": "^20.0.0",
"@zenstackhq/language": "workspace:*",
"@zenstackhq/sdk": "workspace:*",
"async-exit-hook": "^2.0.1",
"colors": "1.4.0",
"commander": "^8.3.0",
"langium": "~3.3.0",
"langium": "catalog:",
"ora": "^5.4.1",
"package-manager-detector": "^1.3.0",
"tiny-invariant": "^1.3.3",
"ts-pattern": "^4.3.0"
"ts-pattern": "catalog:"
},
"peerDependencies": {
"prisma": "^6.0.0",
"typescript": "^5.0.0"
"prisma": "catalog:"
},
"devDependencies": {
"@types/async-exit-hook": "^2.0.0",
Expand All @@ -51,6 +48,7 @@
"@types/tmp": "^0.2.6",
"@zenstackhq/runtime": "workspace:*",
"@zenstackhq/testtools": "workspace:*",
"@zenstackhq/typescript-config": "workspace:*",
"better-sqlite3": "^11.8.1",
"tmp": "^0.2.3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "@zenstackhq/typescript-config/base.json",
"compilerOptions": {
"outDir": "dist"
},
Expand Down
4 changes: 1 addition & 3 deletions packages/create-zenstack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"type": "module",
"scripts": {
"build": "tsup-node",
"watch": "tsup-node --watch",
"lint": "eslint src --ext ts",
"pack": "pnpm pack"
},
Expand Down Expand Up @@ -36,7 +35,6 @@
"ora": "^5.4.1"
},
"devDependencies": {
"@types/colors": "^1.2.4",
"@types/node": "^20.0.0"
"@zenstackhq/typescript-config": "workspace:*"
}
}
2 changes: 1 addition & 1 deletion packages/create-zenstack/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "@zenstackhq/typescript-config/base.json",
"compilerOptions": {
"outDir": "dist"
},
Expand Down
8 changes: 3 additions & 5 deletions packages/ide/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
},
"scripts": {
"build": "tsc --noEmit && tsup",
"watch": "run-p watch:*",
"watch:tsc": "tsc --watch --noEmit",
"watch:tsup": "tsup --watch",
"lint": "eslint src --ext ts",
"vscode:publish": "pnpm build && vsce publish --no-dependencies --pre-release --follow-symlinks",
"vscode:package": "pnpm build && vsce package --no-dependencies"
Expand All @@ -33,13 +30,14 @@
"license": "MIT",
"packageManager": "pnpm@10.12.1",
"dependencies": {
"langium": "~3.3.0",
"langium": "catalog:",
"vscode-languageclient": "^9.0.1",
"vscode-languageserver": "^9.0.1",
"@zenstackhq/language": "workspace:*"
},
"devDependencies": {
"@types/vscode": "^1.63.0"
"@types/vscode": "^1.63.0",
"@zenstackhq/typescript-config": "workspace:*"
},
"files": [
"dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/ide/vscode/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.json",
"extends": "@zenstackhq/typescript-config/base.json",
"compilerOptions": {
"outDir": "dist"
},
Expand Down
10 changes: 3 additions & 7 deletions packages/language/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
"type": "module",
"scripts": {
"build": "pnpm langium:generate && tsup-node",
"watch": "run-p watch:*",
"watch:ts": "tsup-node --watch",
"watch:langium": "langium generate --watch",
"lint": "eslint src --ext ts",
"langium:generate": "langium generate",
"langium:generate:production": "langium generate --mode=production",
Expand Down Expand Up @@ -46,15 +43,14 @@
}
},
"dependencies": {
"langium": "~3.3.0",
"langium": "catalog:",
"pluralize": "^8.0.0",
"ts-pattern": "^5.6.0"
"ts-pattern": "catalog:"
},
"devDependencies": {
"@types/node": "^20.0.0",
"@types/pluralize": "^0.0.33",
"langium-cli": "~3.3.0",
"typescript": "~5.1.6"
"@zenstackhq/typescript-config": "workspace:*"
},
"volta": {
"node": "18.19.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/language/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "@zenstackhq/typescript-config/base.json",
"compilerOptions": {
"outDir": "dist"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
"type": "module",
"scripts": {
"build": "tsup-node",
"watch": "tsup-node --watch",
"lint": "eslint src --ext ts",
"test": "vitest && pnpm test:generate && pnpm test:typecheck",
"test": "vitest run && pnpm test:generate && pnpm test:typecheck",
"test:generate": "tsx test/typing/generate.ts",
"test:typecheck": "tsc --project tsconfig.test.json",
"pack": "pnpm pack"
Expand Down Expand Up @@ -69,18 +68,18 @@
"decimal.js": "^10.4.3",
"is-plain-object": "^5.0.0",
"json-stable-stringify": "^1.3.0",
"kysely": "^0.27.5",
"kysely": "catalog:",
"nanoid": "^5.0.9",
"tiny-invariant": "^1.3.3",
"ts-pattern": "^5.6.0",
"ts-pattern": "catalog:",
"ulid": "^3.0.0",
"utility-types": "^3.11.0",
"uuid": "^11.0.5"
},
"peerDependencies": {
"better-sqlite3": "^11.8.1",
"pg": "^8.13.1",
"zod": "^3.0.0"
"zod": "catalog:"
},
"peerDependenciesMeta": {
"better-sqlite3": {
Expand All @@ -97,6 +96,7 @@
"@zenstackhq/language": "workspace:*",
"@zenstackhq/sdk": "workspace:*",
"@zenstackhq/testtools": "workspace:*",
"@zenstackhq/typescript-config": "workspace:*",
"tmp": "^0.2.3",
"tsx": "^4.19.2"
}
Expand Down
Loading