@uibro/cli 0.1.1 → 0.1.2

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@uibro/cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "bin": {
     "uibro": "bin/uibro.js"
   },
   "files": ["bin", "src"],
   "dependencies": {
-    "@uibro/bridge": "0.1.0"
+    "@uibro/bridge": "0.1.1"
   },
   "engines": {
     "node": ">=22"

package/src/host-controller.js

@@ -1,12 +1,7 @@
 import { projectIdentity } from "./identity.js";
 
 async function loadBridgeRuntime() {
-  try {
-    return (await import("@uibro/bridge/src/bridge-runtime.js")).createBridgeRuntime;
-  } catch (error) {
-    if (error?.code !== "ERR_MODULE_NOT_FOUND") throw error;
-    return (await import("../../../apps/bridge/src/bridge-runtime.js")).createBridgeRuntime;
-  }
+  return (await import("@uibro/bridge/runtime")).createBridgeRuntime;
 }
 
 export class HostController {

package/src/project-install.js

@@ -1,5 +1,5 @@
 import { spawn } from "node:child_process";
-import { access, readFile, realpath } from "node:fs/promises";
+import { readFile, realpath } from "node:fs/promises";
 import { dirname, join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -33,23 +33,28 @@ function isInside(workspace, path) {
   return child === "" || (!child.startsWith("..") && !child.startsWith("/"));
 }
 
+async function installedHostPath(workspace, expectedVersion) {
+  const root = join(workspace, "node_modules", "@uibro", "cli");
+  const pkg = JSON.parse(await readFile(join(root, "package.json"), "utf8"));
+  if (pkg.version !== expectedVersion) throw new Error("Installed CLI version is stale.");
+  const path = await realpath(join(root, "bin", "uibro-project-host.js"));
+  if (!isInside(workspace, path)) throw new Error("Installed project host escaped the workspace.");
+  return path;
+}
+
 export async function ensureProjectHostBinary(workspace, { install = runNpmInstall } = {}) {
   const target = await realpath(workspace);
-  const installed = join(target, "node_modules", "@uibro", "cli", "bin", "uibro-project-host.js");
+  const version = await packageVersion();
   try {
-    await access(installed);
-    const path = await realpath(installed);
-    if (isInside(target, path)) return path;
+    return await installedHostPath(target, version);
   } catch {}
   if (isInside(target, sourcePackageRoot)) {
     return realpath(join(sourcePackageRoot, "bin", "uibro-project-host.js"));
   }
-  const spec = `@uibro/cli@${await packageVersion()}`;
+  const spec = `@uibro/cli@${version}`;
   await install(target, spec);
   try {
-    const path = await realpath(installed);
-    if (!isInside(target, path)) throw new Error("Installed project host escaped the workspace.");
-    return path;
+    return await installedHostPath(target, version);
   } catch (error) {
     throw new Error("@uibro/cli was not installed inside the target project.", { cause: error });
   }