@tsed/cli-core 7.0.0-beta.7 → 7.0.0-beta.9

package/lib/esm/packageManagers/supports/YarnBerryManager.js

@@ -29,7 +29,10 @@ let YarnBerryManager = class YarnBerryManager extends BaseManager {
             nodeLinker: "node-modules"
         });
         // then switch to berry
-        this.cliExeca.runSync(this.cmd, ["set", "version", "berry"]);
+        try {
+            this.cliExeca.runSync(this.cmd, ["set", "version", "berry"]);
+        }
+        catch (er) { }
     }
     add(deps, options) {
         return this.run("add", [...deps], options);

package/lib/esm/services/CliFs.js

@@ -51,7 +51,9 @@ export class CliFs extends RealFileSystemHost {
         return this.raw.ensureDirSync(path, options);
     }
     findUpFile(root, file) {
-        return [join(root, file), join(root, "..", file), join(root, "..", "..", file), join(root, "..", "..", "..", file)].find((path) => this.fileExistsSync(path));
+        return [join(root, file), join(root, "..", file), join(root, "..", "..", file), join(root, "..", "..", "..", file)].find((path) => {
+            return this.fileExistsSync(path) || this.raw.existsSync(path);
+        });
     }
     async importModule(mod, root = process.cwd()) {
         try {

package/lib/esm/services/CliPlugins.js

@@ -19,7 +19,6 @@ export class CliPlugins {
         this.name = constant("name", "");
         this.loadPlugins = loadPlugins;
         this.npmRegistryClient = inject(NpmRegistryClient);
-        this.cliHooks = inject(CliHooks);
         this.packageJson = inject(ProjectPackageJson);
         this.packageManagers = inject(PackageManagersModule);
     }

package/lib/esm/utils/loadPlugins.js

@@ -1,4 +1,4 @@
-import { GlobalProviders, injector, logger } from "@tsed/di";
+import { injector, lazyInject, logger } from "@tsed/di";
 import chalk from "chalk";
 import figures from "figures";
 import { CliFs } from "../services/CliFs.js";
@@ -7,33 +7,20 @@ const all = (promises) => Promise.all(promises);
 export async function loadPlugins() {
     const $inj = injector();
     const name = $inj.settings.get("name");
-    const rootDir = $inj.settings.get("project.rootDir");
     const projectPackageJson = $inj.invoke(ProjectPackageJson);
     const fs = $inj.invoke(CliFs);
     const promises = Object.keys(projectPackageJson.allDependencies)
         .filter((mod) => mod.startsWith(`@${name}/cli-plugin`) || mod.includes(`${name}-cli-plugin`))
         .map(async (mod) => {
         try {
-            const { default: plugin } = await fs.importModule(mod, rootDir);
-            if (!$inj.has(plugin)) {
-                const provider = GlobalProviders.get(plugin)?.clone();
-                if (provider?.imports.length) {
-                    await all(provider.imports.map(async (token) => {
-                        $inj.add(token, GlobalProviders.get(token)?.clone());
-                        if ($inj.settings.get("loaded")) {
-                            await $inj.invoke(token);
-                        }
-                    }));
-                }
-                $inj.add(plugin, provider);
-                if ($inj.settings.get("loaded")) {
-                    await $inj.invoke(plugin);
-                }
+            if ($inj.settings.get("loaded")) {
+                logger().info("Try to load ", mod);
+                await lazyInject(() => fs.importModule(mod, projectPackageJson.cwd));
             }
             logger().info(chalk.green(figures.tick), mod, "module loaded");
         }
         catch (er) {
-            logger().warn(chalk.red(figures.cross), "Fail to load plugin", mod);
+            logger().warn(chalk.red(figures.cross), "Fail to load plugin", mod, er.message);
         }
     });
     await all(promises);

package/lib/types/services/CliPlugins.d.ts

@@ -4,7 +4,6 @@ export declare class CliPlugins {
     name: string;
     readonly loadPlugins: typeof loadPlugins;
     private npmRegistryClient;
-    private cliHooks;
     private packageJson;
     private packageManagers;
     searchPlugins(keyword?: string, options?: any): Promise<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-core",
   "description": "Build your CLI with TypeScript and Decorators",
-  "version": "7.0.0-beta.7",
+  "version": "7.0.0-beta.9",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -65,7 +65,7 @@
     "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "7.0.0-beta.7",
+    "@tsed/typescript": "7.0.0-beta.9",
     "@types/commander": "2.12.2",
     "@types/figures": "3.0.1",
     "@types/fs-extra": "^11.0.4",