eto-dev-cli 1.4.0 → 1.5.1-alpha.0

package/dist/commands/encore-generate-migration.d.ts

@@ -0,0 +1,10 @@
+declare const _default: {
+    command: string;
+    describe: string;
+    builder: {};
+    handler: (argv: {
+        service_name?: string;
+    }) => Promise<never>;
+};
+export default _default;
+//# sourceMappingURL=encore-generate-migration.d.ts.map

package/dist/commands/encore-generate-migration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"encore-generate-migration.d.ts","sourceRoot":"","sources":["../../src/commands/encore-generate-migration.ts"],"names":[],"mappings":";;;;;uBAwQ4D,MAAM;;;AAJlE,wBAgCC"}

package/dist/commands/encore-generate-migration.js

@@ -0,0 +1,220 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const fs_1 = require("fs");
+const glob_1 = require("glob");
+const inquirer_1 = require("inquirer");
+const execa_1 = __importDefault(require("execa"));
+const utils_1 = require("@etohq/utils");
+class EncoreMigrationError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "EncoreMigrationError";
+    }
+}
+const withPromiseHandler = (fn) => {
+    return async (...args) => {
+        try {
+            await fn(...args);
+            process.exit(0);
+        }
+        catch (err) {
+            console.error("Error:", err);
+            process.exit(1);
+        }
+    };
+};
+const findEncoreTsProjectRoot = async (startDir) => {
+    let currentDir = (0, path_1.resolve)(startDir);
+    while (currentDir !== (0, path_1.resolve)(currentDir, "..")) {
+        const encoreAppPath = (0, path_1.join)(currentDir, "encore.app");
+        if ((0, fs_1.existsSync)(encoreAppPath)) {
+            try {
+                const content = (0, fs_1.readFileSync)(encoreAppPath, "utf-8");
+                const encoreApp = JSON.parse(content);
+                if (encoreApp.lang === "typescript") {
+                    return currentDir;
+                }
+            }
+            catch (error) {
+                console.warn(`Warning: Failed to parse encore.app at ${encoreAppPath}:`, error);
+            }
+        }
+        currentDir = (0, path_1.resolve)(currentDir, "..");
+    }
+    return null;
+};
+const findServices = (projectRoot) => {
+    const files = (0, glob_1.globSync)((0, path_1.join)(projectRoot, "**/encore.service.ts"), {
+        ignore: "**/node_modules/**",
+    });
+    return files.map((file) => ({
+        name: (0, path_1.basename)((0, path_1.dirname)(file)),
+        path: (0, path_1.dirname)(file),
+    }));
+};
+const selectService = async (availableServices, serviceName, cwd) => {
+    if (serviceName) {
+        const service = availableServices.find((s) => s.name === serviceName);
+        if (!service) {
+            throw new EncoreMigrationError(`Service '${serviceName}' not found. Available services: ${availableServices
+                .map((s) => s.name)
+                .join(", ")}`);
+        }
+        return service;
+    }
+    const inferredService = cwd && availableServices.find((s) => cwd.startsWith(s.path));
+    if (inferredService) {
+        console.log(`Inferred service: ${inferredService.name}`);
+        return inferredService;
+    }
+    if (availableServices.length === 0) {
+        throw new EncoreMigrationError("No Encore.ts services found in this project.");
+    }
+    const { selectedService } = await (0, inquirer_1.prompt)({
+        type: "list",
+        name: "selectedService",
+        message: "Select a service for the migration:",
+        choices: availableServices
+            .map((s) => ({ name: s.name, value: s.name }))
+            .sort((a, b) => a.name.localeCompare(b.name)),
+    });
+    const service = availableServices.find((s) => s.name === selectedService);
+    if (!service) {
+        throw new EncoreMigrationError("Could not determine target service.");
+    }
+    return service;
+};
+const generateMigrationScript = (targetService, serviceInitPath, projectInfo) => {
+    // "/Users/solarsoft0/workspace/obigtech/shopabox/shopabox-platform-api/ts/services/admin/encore.service.ts"
+    const escapedServiceInitPath = serviceInitPath.replace(/\\/g, "\\\\");
+    const escapedDirectory = projectInfo.directory.replace(/\\/g, "\\\\");
+    return `
+import { EtoError } from "@etohq/framework/utils";
+import { logger } from "@etohq/framework/logger";
+import { Eto, EtoAppLoader, initializeContainer } from "@etohq/framework";
+import { generateModulesDefinition } from '@etohq/framework/modules-sdk'
+
+
+async function ensureDbExists(container: any): Promise<void> {
+  const dbConnection = container.resolve("${utils_1.ContainerRegistrationKeys.PG_CONNECTION}");
+  try {
+    await dbConnection.raw("SELECT 1+1");
+  } catch (error: any) {
+    if (error.code === "3D000") {
+      const dbName = dbConnection.client.config.connection.database;
+      logger.info(\`Database \${dbName} does not exist. Creating...\`);
+      throw new Error("Database creation is not implemented in this script.");
+    } else {
+      throw error;
+    }
+  }
+}
+
+(async () => {
+  try {
+    const { eto } = await import("${escapedServiceInitPath}");
+    const resolvedEto = await eto;
+    const directory = "${escapedDirectory}";
+    const featureFlags = undefined;
+
+    const { modulesDefinitionInput, linkModule, inputConfig } = resolvedEto;
+
+    const defaultModulesDefinition = generateModulesDefinition(
+      ...modulesDefinitionInput
+    )
+
+    inputConfig.projectConfig.serviceMigrationsPath = "${targetService.path}/migrations";
+    const { container, configModule } = await initializeContainer(
+      directory,
+      featureFlags,
+      modulesDefinitionInput,
+      inputConfig
+    );
+
+    await ensureDbExists(container);
+
+    const etoAppLoader = new EtoAppLoader({
+      modulesDefinition: defaultModulesDefinition,
+      linkModule,
+      container,
+    });
+    logger.info("Generating migrations...");
+    await etoAppLoader.runModulesMigrations({
+      action: "generate",
+    });
+
+    console.log("-".repeat(process.stdout.columns));
+    logger.info("Migrations generated");
+    process.exit(0);
+  } catch (error: any) {
+    console.log("-".repeat(process.stdout.columns));
+    if (error.code && error.code === EtoError.Codes.UNKNOWN_MODULES) {
+      logger.error(error.message);
+      const modulesList = error.allModules.map((name: string) => \`          - \${name}\`);
+      logger.error(\`Available modules:\\n\${modulesList.join("\\n")}\`);
+    } else {
+      logger.error(error.message, error);
+    }
+    process.exit(1);
+  }
+})();
+`;
+};
+const executeMigration = async (targetService, projectInfo, originalCwd) => {
+    const migrationsPath = (0, path_1.join)(targetService.path, "migrations");
+    if (!(0, fs_1.existsSync)(migrationsPath)) {
+        console.log(`Creating migrations directory at ${migrationsPath}`);
+        (0, fs_1.mkdirSync)(migrationsPath, { recursive: true });
+    }
+    const serviceInitPath = (0, path_1.join)(targetService.path, "encore.service.ts");
+    if (!(0, fs_1.existsSync)(serviceInitPath)) {
+        throw new EncoreMigrationError(`encore.service.ts not found for service '${targetService.name}' at ${serviceInitPath}`);
+    }
+    try {
+        process.chdir(targetService.path);
+        console.log(`Generating migration for service '${targetService.name}'...`);
+        await (0, execa_1.default)("encore", [
+            "exec",
+            "--",
+            "npx",
+            "tsx",
+            "-e",
+            generateMigrationScript(targetService, serviceInitPath, projectInfo),
+        ], { stdio: "inherit" });
+        console.log(`\nSuccessfully generated migration for service '${targetService.name}'.`);
+        console.log(`\nEncore.ts will automatically apply this migration on the next 'encore run'.`);
+    }
+    catch (error) {
+        throw new EncoreMigrationError(`Error executing migration script: ${error.message}\n${error.stderr || ""}`);
+    }
+    finally {
+        process.chdir(originalCwd);
+    }
+};
+exports.default = {
+    command: "encore:generate:migration [service_name]",
+    describe: "Generate a new Encore.ts compatible database migration",
+    builder: {},
+    handler: withPromiseHandler(async (argv) => {
+        const directory = (0, path_1.resolve)(process.cwd());
+        const projectInfo = {
+            directory,
+            usePnpm: (0, fs_1.existsSync)((0, path_1.join)(directory, "pnpm-lock.yaml")),
+        };
+        if ((0, fs_1.existsSync)((0, path_1.join)(directory, "package.json"))) {
+            projectInfo.sitePackageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(directory, "package.json"), "utf-8"));
+        }
+        const projectRoot = await findEncoreTsProjectRoot(directory);
+        if (!projectRoot) {
+            throw new EncoreMigrationError("Not in an Encore.ts project. Could not find encore.app with lang: 'typescript'.");
+        }
+        const availableServices = findServices(projectRoot);
+        const targetService = await selectService(availableServices, argv.service_name, directory);
+        await executeMigration(targetService, projectInfo, directory);
+    }),
+};
+//# sourceMappingURL=encore-generate-migration.js.map

package/dist/commands/encore-generate-migration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"encore-generate-migration.js","sourceRoot":"","sources":["../../src/commands/encore-generate-migration.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -16,44 +16,57 @@ const glob = require("glob");
 const watch = require(`./watch`);
 const { getVersionInfo } = require(`./utils/version`);
 const { buildFFCli } = require("./feature-flags");
+const yaml = require('js-yaml');
+const { loadPnpmWorkspaceCatalogs } = require(`./utils/catalog-resolver`);
 // Helper function to get workspace packages from a repository
 const getRepoPackages = (repoLocation, repoName) => {
     try {
-        const monoRepoPkg = JSON.parse(fs.readFileSync(path.join(repoLocation, "package.json")));
-        const workspaces = monoRepoPkg.workspaces?.packages || monoRepoPkg.workspaces || ["packages/*"];
-        const patterns = Array.isArray(workspaces) ? workspaces : [workspaces];
-        const monoRepoPackagesDirs = [];
+        let patterns = [];
+        const pnpmWorkspaceYamlPath = path.join(repoLocation, "pnpm-workspace.yaml");
+        const packageJsonPath = path.join(repoLocation, "package.json");
+        if (fs.existsSync(pnpmWorkspaceYamlPath)) {
+            const pnpmWorkspace = yaml.load(fs.readFileSync(pnpmWorkspaceYamlPath, 'utf8'));
+            patterns = pnpmWorkspace.packages || [];
+        }
+        else if (fs.existsSync(packageJsonPath)) {
+            const monoRepoPkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            patterns = monoRepoPkg.workspaces?.packages || monoRepoPkg.workspaces || [];
+        }
+        if (patterns.length === 0) {
+            patterns = ["packages/*"];
+        }
+        const packageNameToPath = new Map();
+        const monoRepoPackages = [];
         for (const workspace of patterns) {
-            if (typeof workspace !== 'string')
-                continue;
-            const workspacePackageDirs = glob.sync(workspace, {
+            const packageJsonFiles = glob.sync(path.join(workspace, '**', 'package.json'), {
                 cwd: repoLocation.toString(),
+                ignore: '**/node_modules/**',
             });
-            monoRepoPackagesDirs.push(...workspacePackageDirs);
-        }
-        const packageNameToPath = new Map();
-        const monoRepoPackages = monoRepoPackagesDirs.map((dirName) => {
-            try {
-                const localPkg = JSON.parse(fs.readFileSync(path.join(repoLocation, dirName, `package.json`)));
-                if (localPkg?.name) {
-                    packageNameToPath.set(localPkg.name, path.join(repoLocation, dirName));
-                    return localPkg.name;
+            for (const packageJsonFile of packageJsonFiles) {
+                try {
+                    const localPkg = JSON.parse(fs.readFileSync(path.join(repoLocation, packageJsonFile), 'utf8'));
+                    if (localPkg?.name) {
+                        packageNameToPath.set(localPkg.name, path.dirname(path.join(repoLocation, packageJsonFile)));
+                        monoRepoPackages.push(localPkg.name);
+                    }
+                    else {
+                        console.warn(`Warning: package.json at ${packageJsonFile} exists but has no 'name' field. Skipping.`);
+                    }
+                }
+                catch (error) {
+                    console.warn(`Warning: Could not parse package.json at ${packageJsonFile}: ${error.message}`);
                 }
             }
-            catch (error) {
-                // fallback to generic one
-            }
-            packageNameToPath.set(dirName, path.join(repoLocation, dirName));
-            return dirName;
-        });
+        }
         return { monoRepoPackages, packageNameToPath };
     }
     catch (err) {
-        console.error(`Unable to read and parse the workspace definition from ${repoName} package.json`);
+        console.error(`Unable to read and parse the workspace definition from ${repoName} package.json`, err);
         return null;
     }
 };
 const cli = yargs();
+cli.command(require('./commands/encore-generate-migration').default);
 cli.command({
     command: `*`,
     description: `Start the Eto dev CLI`,
@@ -119,6 +132,14 @@ Example: eto-dev --with-repo repo1 repo2 repo3`)
             console.error(`Current folder must have a package.json file!`);
             process.exit();
         }
+        // Determine forceInstall based on current working directory
+        const shouldForceInstall = fs.existsSync(path.join(process.cwd(), 'pnpm-workspace.yaml')) && process.env.NODE_ENV !== `test`;
+        if (shouldForceInstall) {
+            console.log(`Running from multi-package pnpm workspace root (${process.cwd()}). Performing force install.`);
+        }
+        // Load pnpm workspace catalogs once from the eto monorepo root
+        const etoMonorepoRoot = conf.get(`eto-location`) || conf.get(`repos.eto`);
+        const pnpmWorkspaceCatalogs = loadPnpmWorkspaceCatalogs(etoMonorepoRoot);
         // Handle multiple repositories
         const repoNames = argv.withRepo || ['eto'];
         const repoConfigs = [];
@@ -188,15 +209,20 @@ eto-dev will pick them up.
         }
         // Start watching all repositories
         for (const config of repoConfigs) {
-            console.log(`\nWatching repository: ${config.name}`);
+            console.log(`
+Watching repository: ${config.name}`);
+            // Get the eto monorepo root path for catalog resolution
+            const etoMonorepoRoot = conf.get(`eto-location`) || conf.get(`repos.eto`);
             watch(config.location, argv.packages, {
                 localPackages,
                 quiet: argv.quiet,
                 scanOnce: argv.scanOnce,
-                forceInstall: argv.forceInstall,
+                forceInstall: shouldForceInstall, // Pass the determined flag
                 monoRepoPackages: config.monoRepoPackages,
                 packageNameToPath: config.packageNameToPath,
                 externalRegistry: argv.externalRegistry,
+                pnpmWorkspaceCatalogs: pnpmWorkspaceCatalogs, // Pass the loaded catalogs
+                targetProjectCwd: process.cwd(), // Pass the current working directory
             });
         }
     },

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"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"}

package/dist/local-npm-registry/index.d.ts

@@ -1,10 +1,10 @@
 export { startServer as startVerdaccio };
-export function publishPackagesLocallyAndInstall({ packagesToPublish, localPackages, packageNameToPath, ignorePackageJSONChanges, yarnWorkspaceRoot, externalRegistry, root, }: {
+export function publishPackagesLocallyAndInstall({ packagesToPublish, localPackages, packageNameToPath, ignorePackageJSONChanges, workspaceRoot, externalRegistry, root, }: {
     packagesToPublish: any;
     localPackages: any;
     packageNameToPath: any;
     ignorePackageJSONChanges: any;
-    yarnWorkspaceRoot: any;
+    workspaceRoot: any;
     externalRegistry: any;
     root: any;
 }): Promise<void>;

package/dist/local-npm-registry/index.js

@@ -25,7 +25,7 @@ const startServer = () => {
     return VerdaccioInitPromise;
 };
 exports.startVerdaccio = startServer;
-exports.publishPackagesLocallyAndInstall = async ({ packagesToPublish, localPackages, packageNameToPath, ignorePackageJSONChanges, yarnWorkspaceRoot, externalRegistry, root, }) => {
+exports.publishPackagesLocallyAndInstall = async ({ packagesToPublish, localPackages, packageNameToPath, ignorePackageJSONChanges, workspaceRoot, externalRegistry, root, }) => {
     await startServer();
     const versionPostFix = Date.now();
     const newlyPublishedPackageVersions = {};
@@ -42,7 +42,7 @@ exports.publishPackagesLocallyAndInstall = async ({ packagesToPublish, localPack
     const packagesToInstall = _.intersection(packagesToPublish, localPackages);
     await installPackages({
         packagesToInstall,
-        yarnWorkspaceRoot,
+        workspaceRoot,
         newlyPublishedPackageVersions,
         externalRegistry,
     });

package/dist/local-npm-registry/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/local-npm-registry/index.js"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAA;AAEnD,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC9B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE3B,IAAI,oBAAoB,GAAG,IAAI,CAAA;AAE/B,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACzD,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACvD,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEzD,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,oBAAoB,CAAA;IAC7B,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;IAE9C,gBAAgB;IAChB,iGAAiG;IACjG,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAEtC,oBAAoB,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7C,cAAc,CACZ,eAAe,EACf,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,OAAO,EACvB,OAAO,EACP,SAAS,EACT,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;YACvC,yBAAyB;YACzB,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;gBACvD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;gBAE7C,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;QACJ,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA;AAED,OAAO,CAAC,cAAc,GAAG,WAAW,CAAA;AAEpC,OAAO,CAAC,gCAAgC,GAAG,KAAK,EAAE,EAChD,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,iBAAiB,EACjB,gBAAgB,EAChB,IAAI,GACL,EAAE,EAAE;IACH,MAAM,WAAW,EAAE,CAAA;IAEnB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAEjC,MAAM,6BAA6B,GAAG,EAAE,CAAA;IAExC,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE,CAAC;QAC5C,6BAA6B,CAAC,WAAW,CAAC,GAAG,MAAM,cAAc,CAAC;YAChE,WAAW;YACX,iBAAiB;YACjB,iBAAiB;YACjB,cAAc;YACd,wBAAwB;YACxB,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;IAE1E,MAAM,eAAe,CAAC;QACpB,iBAAiB;QACjB,iBAAiB;QACjB,6BAA6B;QAC7B,gBAAgB;KACjB,CAAC,CAAA;AACJ,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/local-npm-registry/index.js"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAA;AAEnD,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC9B,MAAM,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE3B,IAAI,oBAAoB,GAAG,IAAI,CAAA;AAE/B,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACzD,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACvD,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEzD,MAAM,WAAW,GAAG,GAAG,EAAE;IACvB,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,oBAAoB,CAAA;IAC7B,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;IAE9C,gBAAgB;IAChB,iGAAiG;IACjG,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAEtC,oBAAoB,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7C,cAAc,CACZ,eAAe,EACf,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,OAAO,EACvB,OAAO,EACP,SAAS,EACT,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE;YACvC,yBAAyB;YACzB,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;gBACvD,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;gBAE7C,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CAAA;QACJ,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA;AAED,OAAO,CAAC,cAAc,GAAG,WAAW,CAAA;AAEpC,OAAO,CAAC,gCAAgC,GAAG,KAAK,EAAE,EAChD,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,EAChB,IAAI,GACL,EAAE,EAAE;IACH,MAAM,WAAW,EAAE,CAAA;IAEnB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAEjC,MAAM,6BAA6B,GAAG,EAAE,CAAA;IAExC,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE,CAAC;QAC5C,6BAA6B,CAAC,WAAW,CAAC,GAAG,MAAM,cAAc,CAAC;YAChE,WAAW;YACX,iBAAiB;YACjB,iBAAiB;YACjB,cAAc;YACd,wBAAwB;YACxB,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;IAE1E,MAAM,eAAe,CAAC;QACpB,iBAAiB;QACjB,aAAa;QACb,6BAA6B;QAC7B,gBAAgB;KACjB,CAAC,CAAA;AACJ,CAAC,CAAA"}

package/dist/local-npm-registry/install-packages.d.ts

@@ -1,6 +1,6 @@
-export function installPackages({ packagesToInstall, yarnWorkspaceRoot, newlyPublishedPackageVersions, externalRegistry, }: {
+export function installPackages({ packagesToInstall, workspaceRoot, newlyPublishedPackageVersions, externalRegistry, }: {
     packagesToInstall: any;
-    yarnWorkspaceRoot: any;
+    workspaceRoot: any;
     newlyPublishedPackageVersions: any;
     externalRegistry: any;
 }): Promise<void>;

package/dist/local-npm-registry/install-packages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-packages.d.ts","sourceRoot":"","sources":["../../src/local-npm-registry/install-packages.js"],"names":[],"mappings":"AAKA;;;;;kBA6OC"}
+{"version":3,"file":"install-packages.d.ts","sourceRoot":"","sources":["../../src/local-npm-registry/install-packages.js"],"names":[],"mappings":"AAKA;;;;;kBAyLC"}

package/dist/local-npm-registry/install-packages.js

@@ -2,7 +2,7 @@ const path = require(`path`);
 const fs = require(`fs-extra`);
 const { promisifiedSpawn } = require(`../utils/promisified-spawn`);
 const { registryUrl } = require(`./verdaccio-config`);
-const installPackages = async ({ packagesToInstall, yarnWorkspaceRoot, newlyPublishedPackageVersions, externalRegistry, }) => {
+const installPackages = async ({ packagesToInstall, workspaceRoot, newlyPublishedPackageVersions, externalRegistry, }) => {
     console.log(`Installing packages from local registry:\n${packagesToInstall
         .map((p) => ` - ${p}`)
         .join(`\n`)}`);
@@ -12,7 +12,7 @@ const installPackages = async ({ packagesToInstall, yarnWorkspaceRoot, newlyPubl
         npm: "package-lock.json",
         pnpm: "pnpm-lock.yaml",
     };
-    const rootDir = yarnWorkspaceRoot || process.cwd();
+    const rootDir = workspaceRoot || process.cwd();
     let packageManager = "yarn";
     if (fs.existsSync(path.join(rootDir, lockFiles.npm)))
         packageManager = "npm";
@@ -31,68 +31,27 @@ const installPackages = async ({ packagesToInstall, yarnWorkspaceRoot, newlyPubl
         console.log("Yarn version:", yarnVersion);
     }
     let installCmd;
-    if (yarnWorkspaceRoot && packageManager !== "npm") {
-        // this is very hacky - given root, we run `yarn workspaces info`
+    if (workspaceRoot && packageManager !== "npm") {
+        // this is very hacky - given root, we run `pnpm workspaces info`
         // to get list of all workspaces and their locations, and manually
         // edit package.json file for packages we want to install
         // to make sure there are no mismatched versions of same package
         // in workspaces which should preserve node_modules structure
         // (packages being mostly hoisted to top-level node_modules)
         // npm doesn't support workspaces
-        const workspaceCommand = packageManager === "yarn"
-            ? isYarn1
-                ? "info"
-                : "list"
-            : "workspaces info";
+        const workspaceCommand = "list"; // pnpm list is equivalent to yarn workspaces info
         const { stdout } = await promisifiedSpawn([
             packageManager,
-            [
-                packageManager === "yarn" ? `workspaces` : `ws`,
-                workspaceCommand,
-                `--json`,
-            ],
+            [`--json`, workspaceCommand],
             { stdio: `pipe` },
         ]);
         let workspacesLayout;
         try {
-            workspacesLayout =
-                packageManager === "yarn" && isYarn1
-                    ? JSON.parse(JSON.parse(stdout).data)
-                    : JSON.parse(stdout);
+            workspacesLayout = JSON.parse(stdout);
         }
         catch (e) {
-            /*
-            Yarn 1.22 doesn't output pure json - it has leading and trailing text:
-            ```
-            $ yarn workspaces info --json
-            yarn workspaces v1.22.0
-            {
-              "z": {
-                "location": "z",
-                "workspaceDependencies": [],
-                "mismatchedWorkspaceDependencies": []
-              },
-              "y": {
-                "location": "y",
-                "workspaceDependencies": [],
-                "mismatchedWorkspaceDependencies": []
-              }
-            }
-            Done in 0.48s.
-            ```
-            So we need to do some sanitization. We find JSON by matching substring
-            that starts with `{` and ends with `}`
-          */
-            const regex = /^[^{]*({.*})[^}]*$/gs;
-            const sanitizedStdOut = regex.exec(stdout);
-            if (sanitizedStdOut?.length >= 2) {
-                try {
-                    workspacesLayout = JSON.parse(sanitizedStdOut[1]);
-                }
-                catch (e) {
-                    console.error(`Failed to parse sanitized workspaces output`);
-                }
-            }
+            console.error(`Failed to parse workspaces output`, stdout);
+            process.exit(1);
         }
         if (!workspacesLayout) {
             console.error(`Couldn't parse workspaces output`, stdout);
@@ -110,9 +69,13 @@ const installPackages = async ({ packagesToInstall, yarnWorkspaceRoot, newlyPubl
             });
             return changed;
         };
-        Object.keys(workspacesLayout).forEach((workspaceName) => {
-            const { location } = workspacesLayout[workspaceName];
-            const pkgJsonPath = path.join(yarnWorkspaceRoot, location, `package.json`);
+        workspacesLayout.forEach((workspace) => {
+            const location = workspace.path;
+            if (typeof location !== 'string') {
+                console.warn(`Path for workspace "${workspace.name}" is undefined or not a string. Skipping.`);
+                return;
+            }
+            const pkgJsonPath = path.join(location, `package.json`);
             if (!fs.existsSync(pkgJsonPath)) {
                 console.warn(`Package.json not found at ${pkgJsonPath}, skipping.`);
                 return;
@@ -130,12 +93,6 @@ const installPackages = async ({ packagesToInstall, yarnWorkspaceRoot, newlyPubl
         // package.json files are changed - so we just want to install
         // using verdaccio registry
         const commands = {
-            yarn: [
-                `install`,
-                ...(packageManager === "yarn" && !isYarn1
-                    ? [`--mode`, `update-lockfile`]
-                    : []),
-            ],
             pnpm: [`install`],
         };
         if (!externalRegistry && registryUrl) {
@@ -167,14 +124,6 @@ const installPackages = async ({ packagesToInstall, yarnWorkspaceRoot, newlyPubl
         })
             .filter(Boolean);
         const commands = {
-            yarn: [
-                `add`,
-                ...packages,
-                `--exact`,
-                ...(packageManager === "yarn" && !isYarn1
-                    ? [`--mode`, `update-lockfile`]
-                    : []),
-            ],
             npm: [`install`, ...packages, `--save-exact`],
             pnpm: [`add`, ...packages, `--save-exact`],
         };

package/dist/local-npm-registry/install-packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"install-packages.js","sourceRoot":"","sources":["../../src/local-npm-registry/install-packages.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"install-packages.js","sourceRoot":"","sources":["../../src/local-npm-registry/install-packages.js"],"names":[],"mappings":"AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAC9B,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AAClE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAErD,MAAM,eAAe,GAAG,KAAK,EAAE,EAC7B,iBAAiB,EACjB,aAAa,EACb,6BAA6B,EAC7B,gBAAgB,GACjB,EAAE,EAAE;IACH,OAAO,CAAC,GAAG,CACT,6CAA6C,iBAAiB;SAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;SACrB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAA;IAED,yBAAyB;IACzB,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,WAAW;QACjB,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,gBAAgB;KACvB,CAAA;IACD,MAAM,OAAO,GAAG,aAAa,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IAC9C,IAAI,cAAc,GAAG,MAAM,CAAA;IAC3B,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QAAE,cAAc,GAAG,KAAK,CAAA;SACvE,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QACxD,cAAc,GAAG,MAAM,CAAA;IAEzB,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,cAAc,CAAC,CAAA;IAExD,qBAAqB;IACrB,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,gBAAgB,CAAC;YACrD,MAAM;YACN,CAAC,WAAW,CAAC;YACb,EAAE,KAAK,EAAE,MAAM,EAAE;SAClB,CAAC,CAAA;QACF,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACrC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;IAC3C,CAAC;IAED,IAAI,UAAU,CAAA;IACd,IAAI,aAAa,IAAI,cAAc,KAAK,KAAK,EAAE,CAAC;QAC9C,iEAAiE;QACjE,kEAAkE;QAClE,yDAAyD;QACzD,gEAAgE;QAChE,6DAA6D;QAC7D,4DAA4D;QAE5D,iCAAiC;QACjC,MAAM,gBAAgB,GAAG,MAAM,CAAA,CAAC,kDAAkD;QAClF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC;YACxC,cAAc;YACd,CAAC,QAAQ,EAAE,gBAAgB,CAAC;YAC5B,EAAE,KAAK,EAAE,MAAM,EAAE;SAClB,CAAC,CAAA;QAEF,IAAI,gBAAgB,CAAA;QACpB,IAAI,CAAC;YACH,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,MAAM,CAAC,CAAA;YAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;QAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAA;YACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,EAAE;YAC1B,IAAI,CAAC,IAAI;gBAAE,OAAO,KAAK,CAAA;YACvB,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;oBACzB,OAAO,GAAG,IAAI,CAAA;gBAChB,CAAC;YACH,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA;QAED,gBAAgB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACrC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAA;YAC/B,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,uBAAuB,SAAS,CAAC,IAAI,2CAA2C,CAAC,CAAA;gBAC9F,OAAM;YACR,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;YACvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,IAAI,CAAC,6BAA6B,WAAW,aAAa,CAAC,CAAA;gBACnE,OAAM;YACR,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAA;YAE5D,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACvC,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YAC1C,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;YAE3C,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,GAAG,CAAC,4BAA4B,WAAW,kBAAkB,CAAC,CAAA;gBACtE,EAAE,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAA;YACpD,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,8DAA8D;QAC9D,2BAA2B;QAC3B,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,CAAC,SAAS,CAAC;SAClB,CAAA;QAED,IAAI,CAAC,gBAAgB,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC9B,IAAI,OAAO;oBAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;;oBAExD,MAAM,gBAAgB,CAAC;wBACrB,MAAM;wBACN,CAAC,QAAQ,EAAE,KAAK,EAAE,mBAAmB,EAAE,WAAW,CAAC;wBACnD,EAAE,KAAK,EAAE,MAAM,EAAE;qBAClB,CAAC,CAAA;YACN,CAAC;iBAAM,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBACrC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;QAED,UAAU,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAA;IACzD,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,iBAAiB;aAC/B,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;YACnB,MAAM,cAAc,GAAG,6BAA6B,CAAC,WAAW,CAAC,CAAA;YACjE,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC,YAAY,WAAW,wBAAwB,CAAC,CAAA;gBAC7D,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,GAAG,WAAW,IAAI,cAAc,EAAE,CAAA;QAC3C,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAC,CAAA;QAElB,MAAM,QAAQ,GAAG;YACf,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,QAAQ,EAAE,cAAc,CAAC;YAC7C,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,QAAQ,EAAE,cAAc,CAAC;SAC3C,CAAA;QAED,IAAI,CAAC,gBAAgB,IAAI,WAAW,EAAE,CAAC;YACrC,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC9B,IAAI,OAAO;oBAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;;oBAExD,MAAM,gBAAgB,CAAC;wBACrB,MAAM;wBACN,CAAC,QAAQ,EAAE,KAAK,EAAE,mBAAmB,EAAE,WAAW,CAAC;wBACnD,EAAE,KAAK,EAAE,MAAM,EAAE;qBAClB,CAAC,CAAA;YACN,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,cAAc,WAAW,EAAE,CAAC,CAAA;YAC5D,CAAC;QACH,CAAC;QAED,UAAU,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACpE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE;YACpC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,6BAA6B;IAC7B,IACE,CAAC,gBAAgB;QACjB,WAAW;QACX,cAAc,KAAK,MAAM;QACzB,CAAC,OAAO,EACR,CAAC;QACD,MAAM,gBAAgB,CAAC;YACrB,MAAM;YACN,CAAC,QAAQ,EAAE,KAAK,EAAE,mBAAmB,EAAE,8BAA8B,CAAC;YACtE,EAAE,KAAK,EAAE,MAAM,EAAE;SAClB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA;AAED,OAAO,CAAC,eAAe,GAAG,eAAe,CAAA"}

package/dist/local-npm-registry/publish-package.js

@@ -76,10 +76,10 @@ const publishPackage = async ({ packageName, packagesToPublish, versionPostFix,
     });
     const pathToPackage = path.dirname(monoRepoPackageJsonPath);
     const uncreateTemporaryNPMRC = createTemporaryNPMRC({ pathToPackage, root });
-    // npm publish
+    // pnpm publish
     const publishCmd = [
-        `npm`,
-        [`publish`, `--tag`, `eto-dev`, `--registry=${registryUrl}`],
+        `pnpm`,
+        [`publish`, `--tag`, `eto-dev`, `--registry=${registryUrl}`, `--no-git-checks`],
         {
             cwd: pathToPackage,
         },

package/dist/local-npm-registry/publish-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish-package.js","sourceRoot":"","sources":["../../src/local-npm-registry/publish-package.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"publish-package.js","sourceRoot":"","sources":["../../src/local-npm-registry/publish-package.js"],"names":[],"mappings":"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"}

package/dist/utils/catalog-resolver.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Loads pnpm workspace catalog definitions from pnpm-workspace.yaml.
+ * @param {string} monorepoRootPath The absolute path to the monorepo root where pnpm-workspace.yaml resides.
+ * @returns {object} An object containing catalog definitions, keyed by catalog name (e.g., { default: { ... }, react18: { ... } }).
+ */
+export function loadPnpmWorkspaceCatalogs(monorepoRootPath: string): object;
+/**
+ * Resolves 'catalog:' dependencies in a package.json dependency object.
+ * @param {object} deps The dependencies object (e.g., pkg.dependencies).
+ * @param {object} pnpmWorkspaceCatalogs The loaded catalog definitions.
+ * @param {Map<string, string>} packageNameToPath A map from package name to its absolute path in the monorepo.
+ */
+export function resolveCatalogDependencies(deps: object, pnpmWorkspaceCatalogs: object, packageNameToPath: Map<string, string>): void;
+//# sourceMappingURL=catalog-resolver.d.ts.map

package/dist/utils/catalog-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-resolver.d.ts","sourceRoot":"","sources":["../../src/utils/catalog-resolver.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,4DAHW,MAAM,GACJ,MAAM,CAoBlB;AAED;;;;;GAKG;AACH,iDAJW,MAAM,yBACN,MAAM,qBACN,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,QA2C7B"}

package/dist/utils/catalog-resolver.js

@@ -0,0 +1,84 @@
+const fs = require(`fs-extra`);
+const path = require(`path`);
+const yaml = require(`js-yaml`);
+/**
+ * Loads pnpm workspace catalog definitions from pnpm-workspace.yaml.
+ * @param {string} monorepoRootPath The absolute path to the monorepo root where pnpm-workspace.yaml resides.
+ * @returns {object} An object containing catalog definitions, keyed by catalog name (e.g., { default: { ... }, react18: { ... } }).
+ */
+const loadPnpmWorkspaceCatalogs = (monorepoRootPath) => {
+    let pnpmWorkspaceCatalogs = {};
+    const pnpmWorkspaceYamlPath = path.join(monorepoRootPath, 'pnpm-workspace.yaml');
+    if (fs.existsSync(pnpmWorkspaceYamlPath)) {
+        try {
+            const pnpmWorkspace = yaml.load(fs.readFileSync(pnpmWorkspaceYamlPath, 'utf8'));
+            if (pnpmWorkspace.catalog) {
+                pnpmWorkspaceCatalogs.default = pnpmWorkspace.catalog;
+            }
+            if (pnpmWorkspace.catalogs) {
+                pnpmWorkspaceCatalogs = { ...pnpmWorkspaceCatalogs, ...pnpmWorkspace.catalogs };
+            }
+        }
+        catch (e) {
+            console.warn(`Warning: Could not parse pnpm-workspace.yaml for catalogs at ${monorepoRootPath}: ${e.message}`);
+        }
+    }
+    return pnpmWorkspaceCatalogs;
+};
+/**
+ * Resolves 'catalog:' dependencies in a package.json dependency object.
+ * @param {object} deps The dependencies object (e.g., pkg.dependencies).
+ * @param {object} pnpmWorkspaceCatalogs The loaded catalog definitions.
+ * @param {Map<string, string>} packageNameToPath A map from package name to its absolute path in the monorepo.
+ */
+const resolveCatalogDependencies = (deps, pnpmWorkspaceCatalogs, packageNameToPath) => {
+    if (!deps)
+        return;
+    for (const depName in deps) {
+        const depVersion = deps[depName];
+        if (typeof depVersion === 'string' && depVersion.startsWith('catalog:')) {
+            const catalogParts = depVersion.split(':');
+            let catalogName = 'default'; // Default catalog
+            let catalogDepName = depName;
+            if (catalogParts.length === 2 && catalogParts[1] !== '') {
+                // e.g., catalog:react18
+                catalogName = catalogParts[1];
+            }
+            else if (catalogParts.length === 1) {
+                // e.g., catalog: (shorthand for catalog:default)
+                catalogName = 'default';
+            }
+            else {
+                console.warn(`Warning: Malformed catalog dependency ${depVersion} for ${depName}. Skipping resolution.`);
+                continue;
+            }
+            const catalog = pnpmWorkspaceCatalogs[catalogName];
+            if (catalog && catalog[catalogDepName]) {
+                deps[depName] = catalog[catalogDepName];
+            }
+            else if (depVersion === 'catalog:' && packageNameToPath.has(depName)) {
+                // Special handling for 'catalog:' without a name, if it refers to a local package
+                // This is a fallback, as pnpm usually resolves this on publish.
+                const localPackageJsonPath = getMonorepoPackageJsonPath({
+                    packageName: depName,
+                    packageNameToPath,
+                });
+                if (fs.existsSync(localPackageJsonPath)) {
+                    const localPkg = JSON.parse(fs.readFileSync(localPackageJsonPath, 'utf8'));
+                    deps[depName] = localPkg.version;
+                }
+                else {
+                    console.warn(`Warning: Catalog dependency ${depVersion} for ${depName} not found in pnpm-workspace.yaml or as a local package. Skipping resolution.`);
+                }
+            }
+            else {
+                console.warn(`Warning: Catalog dependency ${depVersion} for ${depName} not found in pnpm-workspace.yaml. Skipping resolution.`);
+            }
+        }
+    }
+};
+module.exports = {
+    loadPnpmWorkspaceCatalogs,
+    resolveCatalogDependencies,
+};
+//# sourceMappingURL=catalog-resolver.js.map

package/dist/utils/catalog-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-resolver.js","sourceRoot":"","sources":["../../src/utils/catalog-resolver.js"],"names":[],"mappings":"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"}

package/dist/utils/check-deps-changes.d.ts

@@ -1,10 +1,11 @@
-export function checkDepsChanges({ newPath, packageName, monoRepoPackages, isInitialScan, ignoredPackageJSON, packageNameToPath, }: {
+export function checkDepsChanges({ newPath, packageName, monoRepoPackages, isInitialScan, ignoredPackageJSON, packageNameToPath, pnpmWorkspaceCatalogs, }: {
     newPath: any;
     packageName: any;
     monoRepoPackages: any;
     isInitialScan: any;
     ignoredPackageJSON: any;
     packageNameToPath: any;
+    pnpmWorkspaceCatalogs: any;
 }): Promise<{
     didDepsChanged: boolean;
     packageNotInstalled: boolean;

package/dist/utils/check-deps-changes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-deps-changes.d.ts","sourceRoot":"","sources":["../../src/utils/check-deps-changes.js"],"names":[],"mappings":"AA6B2B;;;;;;;;;;GA0J1B"}
+{"version":3,"file":"check-deps-changes.d.ts","sourceRoot":"","sources":["../../src/utils/check-deps-changes.js"],"names":[],"mappings":"AA8B2B;;;;;;;;;;;GAgK1B"}

package/dist/utils/check-deps-changes.js

@@ -1,6 +1,7 @@
 const fs = require(`fs-extra`);
 const _ = require(`lodash`);
 const { getMonorepoPackageJsonPath, } = require(`./get-monorepo-package-json-path`);
+const { resolveCatalogDependencies } = require(`./catalog-resolver`);
 const got = require(`got`);
 function difference(object, base) {
     function changes(object, base) {
@@ -23,7 +24,7 @@ function difference(object, base) {
  * This allow eto-dev to skip publishing unnecesairly and
  * let install packages from public npm repository if nothing changed.
  */
-exports.checkDepsChanges = async ({ newPath, packageName, monoRepoPackages, isInitialScan, ignoredPackageJSON, packageNameToPath, }) => {
+exports.checkDepsChanges = async ({ newPath, packageName, monoRepoPackages, isInitialScan, ignoredPackageJSON, packageNameToPath, pnpmWorkspaceCatalogs, }) => {
     let localPKGjson;
     let packageNotInstalled = false;
     try {
@@ -68,6 +69,9 @@ exports.checkDepsChanges = async ({ newPath, packageName, monoRepoPackages, isIn
     });
     const monorepoPKGjsonString = fs.readFileSync(monoRepoPackageJsonPath, `utf-8`);
     const monorepoPKGjson = JSON.parse(monorepoPKGjsonString);
+    // Resolve catalog dependencies in monorepoPKGjson for comparison
+    const resolvedMonorepoDependencies = { ...monorepoPKGjson.dependencies };
+    resolveCatalogDependencies(resolvedMonorepoDependencies, pnpmWorkspaceCatalogs, packageNameToPath);
     if (ignoredPackageJSON.has(packageName)) {
         if (ignoredPackageJSON.get(packageName).includes(monorepoPKGjsonString)) {
             // we are in middle of publishing and content of package.json is one set during publish process,
@@ -78,19 +82,19 @@ exports.checkDepsChanges = async ({ newPath, packageName, monoRepoPackages, isIn
             };
         }
     }
-    if (!monorepoPKGjson.dependencies)
-        monorepoPKGjson.dependencies = {};
+    if (!resolvedMonorepoDependencies)
+        resolvedMonorepoDependencies = {};
     if (!localPKGjson.dependencies)
         localPKGjson.dependencies = {};
-    const areDepsEqual = _.isEqual(monorepoPKGjson.dependencies, localPKGjson.dependencies);
+    const areDepsEqual = _.isEqual(resolvedMonorepoDependencies, localPKGjson.dependencies);
     if (!areDepsEqual) {
-        const diff = difference(monorepoPKGjson.dependencies, localPKGjson.dependencies);
-        const diff2 = difference(localPKGjson.dependencies, monorepoPKGjson.dependencies);
+        const diff = difference(resolvedMonorepoDependencies, localPKGjson.dependencies);
+        const diff2 = difference(localPKGjson.dependencies, resolvedMonorerepoDependencies);
         let needPublishing = false;
         let isPublishing = false;
         const depChangeLog = _.uniq(Object.keys({ ...diff, ...diff2 }))
             .reduce((acc, key) => {
-            if (monorepoPKGjson.dependencies[key] === `eto-dev`) {
+            if (resolvedMonorepoDependencies[key] === `eto-dev`) {
                 // if we are in middle of publishing to local repository - ignore
                 isPublishing = true;
                 return acc;
@@ -102,19 +106,19 @@ exports.checkDepsChanges = async ({ newPath, packageName, monoRepoPackages, isIn
                 return acc;
             }
             if (localPKGjson.dependencies[key] &&
-                monorepoPKGjson.dependencies[key]) {
+                resolvedMonorepoDependencies[key]) {
                 // Check only for version changes in packages
                 // that are not from gatsby repo.
                 // Changes in gatsby packages will be copied over
                 // from monorepo - and if those contain other dependency
                 // changes - they will be covered
                 if (!monoRepoPackages.includes(key)) {
-                    acc.push(` - '${key}' changed version from ${localPKGjson.dependencies[key]} to ${monorepoPKGjson.dependencies[key]}`);
+                    acc.push(` - '${key}' changed version from ${localPKGjson.dependencies[key]} to ${resolvedMonorepoDependencies[key]}`);
                     needPublishing = true;
                 }
             }
-            else if (monorepoPKGjson.dependencies[key]) {
-                acc.push(` - '${key}@${monorepoPKGjson.dependencies[key]}' was added`);
+            else if (resolvedMonorepoDependencies[key]) {
+                acc.push(` - '${key}@${resolvedMonorepoDependencies[key]}' was added`);
                 needPublishing = true;
             }
             else {

package/dist/utils/check-deps-changes.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-deps-changes.js","sourceRoot":"","sources":["../../src/utils/check-deps-changes.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"check-deps-changes.js","sourceRoot":"","sources":["../../src/utils/check-deps-changes.js"],"names":[],"mappings":"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"}

package/dist/watch.d.ts

@@ -1,5 +1,5 @@
 export = watch;
-declare function watch(root: any, packages: any, { scanOnce, quiet, forceInstall, monoRepoPackages, localPackages, packageNameToPath, externalRegistry, }: {
+declare function watch(repoLocation: any, packages: any, { scanOnce, quiet, forceInstall, monoRepoPackages, localPackages, packageNameToPath, externalRegistry, pnpmWorkspaceCatalogs, targetProjectCwd, }: {
     scanOnce: any;
     quiet: any;
     forceInstall: any;
@@ -7,5 +7,7 @@ declare function watch(root: any, packages: any, { scanOnce, quiet, forceInstall
     localPackages: any;
     packageNameToPath: any;
     externalRegistry: any;
+    pnpmWorkspaceCatalogs: any;
+    targetProjectCwd: any;
 }): Promise<void>;
 //# sourceMappingURL=watch.d.ts.map

package/dist/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../src/watch.js"],"names":[],"mappings":";AA+BA;;;;;;;;kBAoVC"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../src/watch.js"],"names":[],"mappings":";AAiCA;;;;;;;;;;kBA4VC"}

package/dist/watch.js

@@ -3,12 +3,14 @@ const _ = require(`lodash`);
 const del = require(`del`);
 const fs = require(`fs-extra`);
 const path = require(`path`);
-const findWorkspaceRoot = require(`find-yarn-workspace-root`);
+const { findWorkspaceDir } = require(`@pnpm/find-workspace-dir`);
 const { publishPackagesLocallyAndInstall } = require(`./local-npm-registry`);
 const { checkDepsChanges } = require(`./utils/check-deps-changes`);
 const { getDependantPackages } = require(`./utils/get-dependant-packages`);
 const { setDefaultSpawnStdio, promisifiedSpawn, } = require(`./utils/promisified-spawn`);
 const { traversePackagesDeps } = require(`./utils/traverse-package-deps`);
+const { getMonorepoPackageJsonPath } = require(`./utils/get-monorepo-package-json-path`);
+const { loadPnpmWorkspaceCatalogs, resolveCatalogDependencies } = require(`./utils/catalog-resolver`);
 let numCopied = 0;
 // todo support pnpm. loook into https://github.com/ZenFlux/zenflux/blob/main/packages/zenflux-cli/src/modules/npm/package.ts#L55
 const quit = () => {
@@ -17,18 +19,14 @@ const quit = () => {
 };
 const MAX_COPY_RETRIES = 3;
 /*
- * non-existent packages break on('ready')
+ * non-existent packages break on("ready")
  * See: https://github.com/paulmillr/chokidar/issues/449
  */
-async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPackages, localPackages, packageNameToPath, externalRegistry, }) {
+async function watch(repoLocation, // The root of the repository being watched (e.g., eto, eto-commerce)
+packages, { scanOnce, quiet, forceInstall, // This will now be passed in from index.js
+monoRepoPackages, localPackages, packageNameToPath, externalRegistry, pnpmWorkspaceCatalogs, targetProjectCwd, }) {
     setDefaultSpawnStdio(quiet ? `ignore` : `inherit`);
-    // determine if in yarn workspace - if in workspace, force using verdaccio
-    // as current logic of copying files will not work correctly.
-    const yarnWorkspaceRoot = findWorkspaceRoot();
-    if (yarnWorkspaceRoot && process.env.NODE_ENV !== `test`) {
-        console.log(`Yarn workspace found.`);
-        forceInstall = true;
-    }
+    // forceInstall is now determined externally and passed in.
     let afterPackageInstallation = false;
     let queuedCopies = [];
     const realCopyPath = (arg) => {
@@ -46,8 +44,8 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
                 }
             }
             // When the eto binary is copied over, it is not setup with the executable
-            // permissions that it is given when installed via yarn.
-            // This fixes the issue where after running eto-dev, running `yarn eto develop`
+            // permissions that it is given when installed via pnpm.
+            // This fixes the issue where after running eto-dev, running `pnpm eto develop`
             // fails with a permission issue.
             // @fixes https://github.com/etohq/eto/issues/18809
             // Binary files we target:
@@ -94,7 +92,7 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
     // check packages deps and if they depend on other packages from monorepo
     // add them to packages list
     const { seenPackages, depTree } = traversePackagesDeps({
-        root,
+        root: repoLocation,
         packages: _.uniq(localPackages),
         monoRepoPackages,
         packageNameToPath,
@@ -113,20 +111,20 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
         try {
             if (allPackagesToWatch.length > 0) {
                 await publishPackagesLocallyAndInstall({
-                    packagesToPublish: allPackagesToWatch,
+                    packagesToPublish: Array.from(allPackagesToWatch),
                     packageNameToPath,
                     localPackages,
                     ignorePackageJSONChanges,
-                    yarnWorkspaceRoot,
+                    workspaceRoot: targetProjectCwd,
                     externalRegistry,
-                    root,
+                    root: repoLocation,
                 });
             }
             else {
-                // run `yarn`
-                const yarnInstallCmd = [`yarn`];
+                // run `pnpm install`
+                const pnpmInstallCmd = [`pnpm`, `install`];
                 console.log(`Installing packages from public NPM registry`);
-                await promisifiedSpawn(yarnInstallCmd);
+                await promisifiedSpawn(pnpmInstallCmd);
                 console.log(`Installation complete`);
             }
         }
@@ -147,7 +145,7 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
         /[/\\]__tests__[/\\]/i,
         /[/\\]__mocks__[/\\]/i,
         /\.npmrc/i,
-    ].concat(allPackagesIgnoringThemesToWatch.map((p) => new RegExp(`${p}[\\/\\\\]src[\\/\\\\]`, `i`)));
+    ].concat(allPackagesIgnoringThemesToWatch.map((p) => new RegExp(`${_.escapeRegExp(p)}[\\/\]src[\\/\]`, `i`)));
     const watchers = _.uniq(allPackagesToWatch
         .map((p) => path.join(packageNameToPath.get(p)))
         .filter((p) => fs.existsSync(p)));
@@ -161,7 +159,7 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
     const packagePathMatchingEntries = Array.from(packageNameToPath.entries());
     chokidar
         .watch(watchers, {
-        ignored: [(filePath) => _.some(ignored, (reg) => reg.test(filePath))],
+        ignored: [(filePath) => _.some(ignored, (reg) => reg.test(filePath))]
     })
         .on(`all`, async (event, filePath) => {
         if (!watchEvents.includes(event)) {
@@ -193,6 +191,13 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
             if (isPublishing) {
                 return;
             }
+            const originalPkgJsonString = fs.readFileSync(filePath, `utf8`);
+            const pkg = JSON.parse(originalPkgJsonString);
+            resolveCatalogDependencies(pkg.dependencies, pnpmWorkspaceCatalogs, packageNameToPath);
+            resolveCatalogDependencies(pkg.devDependencies, pnpmWorkspaceCatalogs, packageNameToPath);
+            resolveCatalogDependencies(pkg.peerDependencies, pnpmWorkspaceCatalogs, packageNameToPath);
+            // Write the modified package.json to the target location
+            fs.outputFileSync(newPath, JSON.stringify(pkg, null, 2));
             // Compare dependencies with local version
             const didDepsChangedPromise = checkDepsChanges({
                 newPath,
@@ -201,6 +206,7 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
                 packageNameToPath,
                 isInitialScan,
                 ignoredPackageJSON,
+                pnpmWorkspaceCatalogs,
             });
             if (isInitialScan) {
                 // normally checkDepsChanges would be sync,
@@ -262,8 +268,9 @@ async function watch(root, packages, { scanOnce, quiet, forceInstall, monoRepoPa
                     packageNameToPath,
                     localPackages,
                     ignorePackageJSONChanges,
+                    workspaceRoot,
                     externalRegistry,
-                    root,
+                    root: repoLocation,
                 });
                 packagesToPublish.clear();
                 isPublishing = false;

package/dist/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sourceRoot":"","sources":["../src/watch.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../src/watch.js"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eto-dev-cli",
   "description": "CLI helpers for contributors working on Eto",
-  "version": "1.4.0",
+  "version": "1.5.1-alpha.0",
   "author": "Emmanuel Okanlawon <okanlawon@obig.tech>",
   "bin": {
     "eto-dev": "./dist/index.js"
@@ -10,6 +10,8 @@
     "dist"
   ],
   "dependencies": {
+    "@mikro-orm/core": "6.4.3",
+    "@mikro-orm/postgresql": "6.4.3",
     "chokidar": "3.5.3",
     "configstore": "5.0.1",
     "del": "6.0.0",
@@ -18,10 +20,17 @@
     "fs-extra": "10.0.0",
     "glob": "11.0.0",
     "got": "11.8.6",
+    "inquirer": "8.0.0",
     "lodash": "4.17.21",
     "signal-exit": "3.0.7",
     "verdaccio": "4.10.0",
-    "yargs": "15.4.1"
+    "yargs": "15.4.1",
+    "@pnpm/find-workspace-dir": "1000.1.0",
+    "js-yaml": "4.1.0",
+    "@etohq/eto": "1.5.1-alpha.0",
+    "@etohq/modules-sdk": "1.5.1-alpha.0",
+    "@etohq/utils": "1.5.1-alpha.0",
+    "@etohq/types": "1.5.1-alpha.0"
   },
   "devDependencies": {
     "@swc/core": "1.7.28",