From 5d7c0b889c02da2de7a0a94186974da160ea5bb1 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Thu, 14 May 2026 01:53:40 -0400 Subject: [PATCH] chore: fix knip and sherif usage --- apps/website/package.json | 4 +- knip.json | 3 +- nx.json | 68 +++++++++++++++++++++++--- package.json | 8 ++- packages/compiler/package.json | 5 +- packages/language-server/package.json | 6 +-- packages/language-service/package.json | 1 - packages/vscode/package.json | 6 +-- pnpm-lock.yaml | 34 +------------ tools/workspace/project.json | 21 ++++++++ 10 files changed, 98 insertions(+), 58 deletions(-) create mode 100644 tools/workspace/project.json diff --git a/apps/website/package.json b/apps/website/package.json index 9760776..d9158fa 100644 --- a/apps/website/package.json +++ b/apps/website/package.json @@ -21,15 +21,13 @@ "sharp": "^0.34.5", "shiki": "^4.0.2", "tempblot-language-service": "workspace:*", - "tempblot-parser": "workspace:*", "tm-grammars": "^1.31.15", "tm-themes": "^1.12.2", "typescript": "^6.0.3", "volar-service-typescript": "^0.0.71", "vscode-languageserver-protocol": "^3.17.5", "vscode-oniguruma": "^2.0.1", - "vscode-textmate": "^9.3.2", - "vscode-uri": "^3.1.0" + "vscode-textmate": "^9.3.2" }, "devDependencies": { "@types/node": "^24.5.2", diff --git a/knip.json b/knip.json index 06e485b..e229b4a 100644 --- a/knip.json +++ b/knip.json @@ -6,5 +6,6 @@ "ignoreDependencies": ["tempblot-language-server"] } }, - "ignoreDependencies": ["uuid"] + "ignoreDependencies": ["sherif", "uuid"], + "ignoreFiles": ["sample/index.ts"] } diff --git a/nx.json b/nx.json index 59d4d83..c855fb6 100644 --- a/nx.json +++ b/nx.json @@ -2,21 +2,73 @@ "$schema": "./node_modules/nx/schemas/nx-schema.json", "targetDefaults": { "build": { - "dependsOn": ["^build"], - "inputs": ["default", "^default"], - "outputs": ["{projectRoot}/dist", "{projectRoot}/lib", "{projectRoot}/out"] + "dependsOn": [ + "^build" + ], + "inputs": [ + "default", + "^default" + ], + "outputs": [ + "{projectRoot}/dist", + "{projectRoot}/lib", + "{projectRoot}/out" + ] + }, + "test": { + "dependsOn": [ + "build" + ], + "inputs": [ + "default", + "^default" + ] + }, + "test:lib": { + "dependsOn": [ + "^build" + ], + "inputs": [ + "default", + "^default" + ] + }, + "test:types": { + "dependsOn": [ + "^build" + ], + "inputs": [ + "default", + "^default" + ] + }, + "test:build": { + "dependsOn": [ + "build" + ], + "inputs": [ + "default", + "^default" + ] }, "watch": { - "dependsOn": ["^build"], + "dependsOn": [ + "^build" + ], "cache": false }, "pack": { - "dependsOn": ["^build"], + "dependsOn": [ + "^build" + ], "cache": false }, "release": { - "dependsOn": ["^build"], + "dependsOn": [ + "^build" + ], "cache": false } - } -} + }, + "analytics": false +} \ No newline at end of file diff --git a/package.json b/package.json index 4793864..3771c11 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,12 @@ "pack": "nx run tempblot-vscode:pack", "release": "nx run tempblot-vscode:release", "format": "prettier --write .", - "test:sherif": "sherif", - "test:knip": "knip" + "test": "nx run-many -t test:lib --projects=tempblot-parser,prettier-plugin-tempblot,tempblot && nx run-many -t test:types --projects=tempblot-parser,tempblot && nx run-many -t test:build --projects=tempblot && nx run tempblot-workspace:sherif && nx run tempblot-workspace:knip", + "test:lib": "nx run-many -t test:lib --projects=tempblot-parser,prettier-plugin-tempblot,tempblot", + "test:types": "nx run-many -t test:types --projects=tempblot-parser,tempblot", + "test:build": "nx run-many -t test:build --projects=tempblot", + "test:sherif": "nx run tempblot-workspace:sherif", + "test:knip": "nx run tempblot-workspace:knip" }, "devDependencies": { "@types/node": "^24.5.2", diff --git a/packages/compiler/package.json b/packages/compiler/package.json index c1c69fb..ecb30d7 100644 --- a/packages/compiler/package.json +++ b/packages/compiler/package.json @@ -17,9 +17,8 @@ "scripts": { "build": "vite build", "test:lib": "vitest", - "test:build": "publint", - "test:types": "tsc --noEmit", - "test:attw": "attw --profile esm-only --pack ." + "test:build": "publint && attw --profile esm-only --pack .", + "test:types": "tsc --noEmit" }, "keywords": [], "dependencies": { diff --git a/packages/language-server/package.json b/packages/language-server/package.json index b9800e6..08f907a 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -28,12 +28,10 @@ ], "scripts": { "build": "tsc --build", - "prepack": "tsc --build --clean && tsc --build", - "test-api": "node --test", - "test": "npm run test-api" + "prepack": "tsc --build --clean && tsc --build" }, "dependencies": { - "@volar/language-server": "~2.4.23", + "@volar/language-server": "~2.4.28", "tempblot-language-service": "workspace:*" }, "devDependencies": { diff --git a/packages/language-service/package.json b/packages/language-service/package.json index 7e7db36..89f7285 100644 --- a/packages/language-service/package.json +++ b/packages/language-service/package.json @@ -27,7 +27,6 @@ "@volar/language-service": "~2.4.23", "@volar/typescript": "~2.4.23", "tempblot-parser": "workspace:*", - "vscode-html-languageservice": "^5.5.1", "vscode-uri": "^3.1.0" }, "devDependencies": { diff --git a/packages/vscode/package.json b/packages/vscode/package.json index e22e15c..0ed8ace 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -106,11 +106,9 @@ "release": "npm run build && vsce publish --pre-release" }, "dependencies": { - "@volar/language-server": "~2.4.23", + "@volar/language-server": "~2.4.28", "@volar/vscode": "~2.4.23", - "tempblot-language-server": "workspace:*", - "tempblot-language-service": "workspace:*", - "tempblot-typescript-plugin": "workspace:*" + "tempblot-language-server": "workspace:*" }, "devDependencies": { "@types/vscode": "^1.104.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7954f0b..cdcb465 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,9 +65,6 @@ importers: tempblot-language-service: specifier: workspace:* version: link:../../packages/language-service - tempblot-parser: - specifier: workspace:* - version: link:../../packages/parser tm-grammars: specifier: ^1.31.15 version: 1.31.15 @@ -89,9 +86,6 @@ importers: vscode-textmate: specifier: ^9.3.2 version: 9.3.2 - vscode-uri: - specifier: ^3.1.0 - version: 3.1.0 devDependencies: '@types/node': specifier: ^24.5.2 @@ -134,7 +128,7 @@ importers: packages/language-server: dependencies: '@volar/language-server': - specifier: ~2.4.23 + specifier: ~2.4.28 version: 2.4.28 tempblot-language-service: specifier: workspace:* @@ -161,9 +155,6 @@ importers: tempblot-parser: specifier: workspace:* version: link:../parser - vscode-html-languageservice: - specifier: ^5.5.1 - version: 5.6.2 vscode-uri: specifier: ^3.1.0 version: 3.1.0 @@ -228,7 +219,7 @@ importers: packages/vscode: dependencies: '@volar/language-server': - specifier: ~2.4.23 + specifier: ~2.4.28 version: 2.4.28 '@volar/vscode': specifier: ~2.4.23 @@ -236,12 +227,6 @@ importers: tempblot-language-server: specifier: workspace:* version: link:../language-server - tempblot-language-service: - specifier: workspace:* - version: link:../language-service - tempblot-typescript-plugin: - specifier: workspace:* - version: link:../typescript-plugin devDependencies: '@types/vscode': specifier: ^1.104.0 @@ -1719,9 +1704,6 @@ packages: '@volar/vscode@2.4.28': resolution: {integrity: sha512-+08veB0c0l3Tp4afvVniQQSImVu4BgcojrBYYrKuR58ycch9raFfsS5NZBLFIlLes1XsggNOntyy7WpYW5AKnA==} - '@vscode/l10n@0.0.18': - resolution: {integrity: sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==} - '@yarnpkg/lockfile@1.1.0': resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} @@ -4072,9 +4054,6 @@ packages: deprecated: vsce has been renamed to @vscode/vsce. Install using @vscode/vsce instead. hasBin: true - vscode-html-languageservice@5.6.2: - resolution: {integrity: sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==} - vscode-jsonrpc@8.2.0: resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==} engines: {node: '>=14.0.0'} @@ -5440,8 +5419,6 @@ snapshots: vscode-languageclient: 9.0.1 vscode-nls: 5.2.0 - '@vscode/l10n@0.0.18': {} - '@yarnpkg/lockfile@1.1.0': {} '@zkochan/js-yaml@0.0.7': @@ -8448,13 +8425,6 @@ snapshots: yauzl: 2.10.0 yazl: 2.5.1 - vscode-html-languageservice@5.6.2: - dependencies: - '@vscode/l10n': 0.0.18 - vscode-languageserver-textdocument: 1.0.12 - vscode-languageserver-types: 3.17.5 - vscode-uri: 3.1.0 - vscode-jsonrpc@8.2.0: {} vscode-languageclient@9.0.1: diff --git a/tools/workspace/project.json b/tools/workspace/project.json new file mode 100644 index 0000000..2c16a3c --- /dev/null +++ b/tools/workspace/project.json @@ -0,0 +1,21 @@ +{ + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "name": "tempblot-workspace", + "root": "tools/workspace", + "targets": { + "sherif": { + "executor": "nx:run-commands", + "options": { + "command": "sherif", + "cwd": "." + } + }, + "knip": { + "executor": "nx:run-commands", + "options": { + "command": "knip", + "cwd": "." + } + } + } +} -- 2.51.2