@openscout/scout 0.2.95 → 0.2.97

package/dist/runtime/broker-process-manager.mjs

@@ -2271,11 +2271,32 @@ function resolveBundledRuntimeDirFromModuleDir(moduleDir) {
     resolve2(moduleDir, "..", "..")
   ];
   for (const candidate of candidates) {
-    if (isInstalledRuntimePackageDir(candidate))
-      return candidate;
+    if (!isInstalledRuntimePackageDir(candidate))
+      continue;
+    const sourceWorkspaceRuntime = resolveSourceWorkspaceRuntimeDir(candidate);
+    if (sourceWorkspaceRuntime)
+      return sourceWorkspaceRuntime;
+    return candidate;
   }
   return null;
 }
+function resolveSourceWorkspaceRuntimeDir(bundledPackageDir) {
+  const packagesDir = dirname3(bundledPackageDir);
+  if (resolve2(packagesDir, "cli") !== resolve2(bundledPackageDir))
+    return null;
+  const runtimeDir = join5(packagesDir, "runtime");
+  if (!existsSync5(join5(runtimeDir, "src")))
+    return null;
+  if (!isInstalledRuntimePackageDir(runtimeDir))
+    return null;
+  try {
+    const cliPackage = JSON.parse(readFileSync4(join5(bundledPackageDir, "package.json"), "utf8"));
+    const runtimePackage = JSON.parse(readFileSync4(join5(runtimeDir, "package.json"), "utf8"));
+    return cliPackage.name === "@openscout/scout" && runtimePackage.name === "@openscout/runtime" ? runtimeDir : null;
+  } catch {
+    return null;
+  }
+}
 function findWorkspaceRuntimeDir(startDir) {
   let current = resolve2(startDir);
   while (true) {

package/dist/runtime/mesh-discover.mjs

@@ -2202,11 +2202,32 @@ function resolveBundledRuntimeDirFromModuleDir(moduleDir) {
     resolve2(moduleDir, "..", "..")
   ];
   for (const candidate of candidates) {
-    if (isInstalledRuntimePackageDir(candidate))
-      return candidate;
+    if (!isInstalledRuntimePackageDir(candidate))
+      continue;
+    const sourceWorkspaceRuntime = resolveSourceWorkspaceRuntimeDir(candidate);
+    if (sourceWorkspaceRuntime)
+      return sourceWorkspaceRuntime;
+    return candidate;
   }
   return null;
 }
+function resolveSourceWorkspaceRuntimeDir(bundledPackageDir) {
+  const packagesDir = dirname3(bundledPackageDir);
+  if (resolve2(packagesDir, "cli") !== resolve2(bundledPackageDir))
+    return null;
+  const runtimeDir = join5(packagesDir, "runtime");
+  if (!existsSync5(join5(runtimeDir, "src")))
+    return null;
+  if (!isInstalledRuntimePackageDir(runtimeDir))
+    return null;
+  try {
+    const cliPackage = JSON.parse(readFileSync4(join5(bundledPackageDir, "package.json"), "utf8"));
+    const runtimePackage = JSON.parse(readFileSync4(join5(runtimeDir, "package.json"), "utf8"));
+    return cliPackage.name === "@openscout/scout" && runtimePackage.name === "@openscout/runtime" ? runtimeDir : null;
+  } catch {
+    return null;
+  }
+}
 function findWorkspaceRuntimeDir(startDir) {
   let current = resolve2(startDir);
   while (true) {