diff --git a/docs/.gitignore b/docs/.gitignore index 6c8b93f94..c8c0a4182 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,10 +1,10 @@ api -.vitepress/public/api.json .vitepress/cache .vitepress/dist public/api.json public/reference-sidebar.json public/ai/** +.temp # Yarn .pnp.* .yarn/* diff --git a/docs/public/.gitignore b/docs/public/.gitignore deleted file mode 100644 index 4017a088e..000000000 --- a/docs/public/.gitignore +++ /dev/null @@ -1 +0,0 @@ -api.json \ No newline at end of file diff --git a/docs/yarn.lock b/docs/yarn.lock index 28cdcdeba..19209d78c 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -1347,12 +1347,12 @@ __metadata: languageName: node linkType: hard -"brace-expansion@npm:^2.0.1": - version: 2.0.1 - resolution: "brace-expansion@npm:2.0.1" +"brace-expansion@npm:^2.0.2": + version: 2.0.2 + resolution: "brace-expansion@npm:2.0.2" dependencies: balanced-match: "npm:^1.0.0" - checksum: 10/a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1 + checksum: 10/01dff195e3646bc4b0d27b63d9bab84d2ebc06121ff5013ad6e5356daa5a9d6b60fa26cf73c74797f2dc3fbec112af13578d51f75228c1112b26c790a87b0488 languageName: node linkType: hard @@ -2632,11 +2632,11 @@ __metadata: linkType: hard "minimatch@npm:^9.0.4": - version: 9.0.5 - resolution: "minimatch@npm:9.0.5" + version: 9.0.9 + resolution: "minimatch@npm:9.0.9" dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 10/dd6a8927b063aca6d910b119e1f2df6d2ce7d36eab91de83167dd136bb85e1ebff97b0d3de1cb08bd1f7e018ca170b4962479fefab5b2a69e2ae12cb2edc8348 + brace-expansion: "npm:^2.0.2" + checksum: 10/b91fad937deaffb68a45a2cb731ff3cff1c3baf9b6469c879477ed16f15c8f4ce39d63a3f75c2455107c2fdff0f3ab597d97dc09e2e93b883aafcf926ef0c8f9 languageName: node linkType: hard diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 2a1a13d16..a6c482652 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -55,6 +55,7 @@ "rxjs": "^7.8.1", "semver": "^7.6.3", "split": "^1.0.1", + "ts-morph": "^27.0.2", "tslib": "^2.7.0", "tunnel": "^0.0.6", "update-notifier": "^7.3.1", diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index ffba41fbf..7ea63df94 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -97,7 +97,11 @@ export class CliService { $ctx.set("data", data); - return tasksRunner(tasks, data); + const result = await tasksRunner(tasks, data); + + $ctx.set("data", data); + + return result; } } diff --git a/packages/cli-mcp/package.json b/packages/cli-mcp/package.json index c9bd9c970..67b814dba 100644 --- a/packages/cli-mcp/package.json +++ b/packages/cli-mcp/package.json @@ -68,7 +68,7 @@ "read-pkg-up": "^11.0.0", "rxjs": "^7.8.1", "semver": "^7.6.3", - "ts-morph": "27.0.0", + "ts-morph": "^27.0.2", "tslib": "^2.7.0", "zod": "4.3.6" }, diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 2cdcf9968..34794795a 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -33,6 +33,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", + "ts-morph": "^27.0.2", "typescript": "5.6.2", "vitest": "3.2.4" }, diff --git a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts index 8d802445c..2b456672d 100644 --- a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts +++ b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts @@ -2,12 +2,10 @@ import "./templates/index.template.js"; import type {RenderDataContext} from "@tsed/cli"; import {Module, ProjectPackageJson} from "@tsed/cli-core"; +import {injectable} from "@tsed/di"; import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook.js"; -@Module({ - imports: [OidcProviderInitHook] -}) export class CliPluginOidcProviderModule { $alterPackageJson(packageJson: ProjectPackageJson, data: RenderDataContext) { if (data.oidc) { @@ -26,3 +24,5 @@ export class CliPluginOidcProviderModule { return packageJson; } } + +injectable(CliPluginOidcProviderModule).imports([OidcProviderInitHook]); diff --git a/packages/cli/package.json b/packages/cli/package.json index 01c2c4196..ea4e8cbb8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -72,7 +72,7 @@ "read-pkg-up": "^11.0.0", "rxjs": "^7.8.1", "semver": "^7.6.3", - "ts-morph": "27.0.0", + "ts-morph": "^27.0.2", "tslib": "^2.7.0", "zod": "3.25.76" }, diff --git a/packages/cli/src/services/CliStats.ts b/packages/cli/src/services/CliStats.ts index 876684020..ac1708a5c 100644 --- a/packages/cli/src/services/CliStats.ts +++ b/packages/cli/src/services/CliStats.ts @@ -53,7 +53,7 @@ export class CliStats extends CliHttpClient { return this.post("/rest/cli/stats", { data - }).catch(() => { + }).catch((er) => { return null; }); } diff --git a/yarn.lock b/yarn.lock index cb29e8f61..3388dbaa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2786,7 +2786,7 @@ __metadata: languageName: node linkType: hard -"@ts-morph/common@npm:0.28.0, @ts-morph/common@npm:~0.28.0": +"@ts-morph/common@npm:0.28.0": version: 0.28.0 resolution: "@ts-morph/common@npm:0.28.0" dependencies: @@ -2797,6 +2797,17 @@ __metadata: languageName: node linkType: hard +"@ts-morph/common@npm:~0.28.1": + version: 0.28.1 + resolution: "@ts-morph/common@npm:0.28.1" + dependencies: + minimatch: "npm:^10.0.1" + path-browserify: "npm:^1.0.1" + tinyglobby: "npm:^0.2.14" + checksum: 10/d5c6ed11cf046c186c7263c28c7e9b5fbefb61c65b99f66cfe6a3b249f70f3fbf116b5aace2980602a7ceabecdc399065d5a7f14aabe5475eb43fd573a3cc665 + languageName: node + linkType: hard + "@tsconfig/node10@npm:^1.0.7": version: 1.0.11 resolution: "@tsconfig/node10@npm:1.0.11" @@ -2875,6 +2886,7 @@ __metadata: rxjs: "npm:^7.8.1" semver: "npm:^7.6.3" split: "npm:^1.0.1" + ts-morph: "npm:^27.0.2" tslib: "npm:^2.7.0" tunnel: "npm:^0.0.6" typescript: "npm:5.6.2" @@ -2975,7 +2987,7 @@ __metadata: read-pkg-up: "npm:^11.0.0" rxjs: "npm:^7.8.1" semver: "npm:^7.6.3" - ts-morph: "npm:27.0.0" + ts-morph: "npm:^27.0.2" tslib: "npm:^2.7.0" typescript: "npm:5.6.2" vitest: "npm:3.2.4" @@ -3061,6 +3073,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" + ts-morph: "npm:^27.0.2" tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:3.2.4" @@ -3288,7 +3301,7 @@ __metadata: read-pkg-up: "npm:^11.0.0" rxjs: "npm:^7.8.1" semver: "npm:^7.6.3" - ts-morph: "npm:27.0.0" + ts-morph: "npm:^27.0.2" tslib: "npm:^2.7.0" typescript: "npm:5.6.2" vitest: "npm:3.2.4" @@ -16291,13 +16304,13 @@ __metadata: languageName: node linkType: hard -"ts-morph@npm:27.0.0": - version: 27.0.0 - resolution: "ts-morph@npm:27.0.0" +"ts-morph@npm:^27.0.2": + version: 27.0.2 + resolution: "ts-morph@npm:27.0.2" dependencies: - "@ts-morph/common": "npm:~0.28.0" + "@ts-morph/common": "npm:~0.28.1" code-block-writer: "npm:^13.0.3" - checksum: 10/69da50b6aa2c548a52d74b2b2a80796babd22146ad883a152625faeb778f61e0f9711b889cdfe37eb87b9fd14ec19e43bc1f101d7239e56c97704ba7a749c4df + checksum: 10/b9bd8ed86d4b76ca23446d3f808787cfe95a3bcb2316769a2f3fa262ea9ab4043bb76bf8aef677f9be0d758576f074df2926e701a535f84fd21946fdbf465148 languageName: node linkType: hard