@valbuild/cli 0.149.1 → 0.149.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @valbuild/cli
 
+## 0.149.3
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @valbuild/server@0.149.3
+  - @valbuild/language-server@0.149.3
+
+## 0.149.2
+
+### Patch Changes
+
+- [#917](https://github.com/valbuild/val/pull/917) [`48ca810`](https://github.com/valbuild/val/commit/48ca810a985af2a0af845c779d39c3da7f7fb0fc) Thanks [@freekh](https://github.com/freekh)! - `val publish` now declares `@valbuild/ui` at the version your project actually runs. A project that does not declare `@valbuild/ui` gets it added when it is wired for the platform, because the Studio's bundle lives there. It used to be added at `@valbuild/core`'s version, which can be an older release than the `@valbuild/ui` your `@valbuild/tanstack` uses. The two are no longer always released together, and the mismatch could install a second, older Studio. It now takes the version installed beside `@valbuild/tanstack`, and if no installed copy can be found it says so in a warning. A project that declares `@valbuild/ui` itself is left unchanged.
+- Updated dependencies [[`48ca810`](https://github.com/valbuild/val/commit/48ca810a985af2a0af845c779d39c3da7f7fb0fc)]:
+  - @valbuild/tanstack-build@0.149.2
+
 ## 0.149.1
 
 ### Patch Changes

package/cli/dist/valbuild-cli-cli.cjs.dev.js

@@ -2517,6 +2517,45 @@ async function loadBuilder() {
   }
 }
 
+/**
+ * The `@valbuild/ui` this checkout runs: the one its `@valbuild/tanstack`
+ * resolves, which is a transitive dependency pnpm does not hoist -- so it is
+ * looked for FROM that package, and only then from the project itself. `null`
+ * when neither has one installed.
+ *
+ * Handed to `wireUp`, which declares `@valbuild/ui` for a project that does
+ * not and can only see source files.
+ */
+function installedStudioVersion(root) {
+  const tanstack = installedPackageDir(root, "@valbuild/tanstack");
+  const ui = (tanstack ? installedPackageDir(tanstack, "@valbuild/ui") : null) ?? installedPackageDir(root, "@valbuild/ui");
+  if (ui === null) return null;
+  try {
+    const manifest = JSON.parse(fs__default$1["default"].readFileSync(path__default["default"].join(ui, "package.json"), "utf8"));
+    return typeof manifest === "object" && manifest !== null && "version" in manifest && typeof manifest.version === "string" ? manifest.version : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Where `name` is installed as Node would find it from `from`: in the nearest
+ * `node_modules` upward, through pnpm's symlinks. Walked by hand rather than
+ * with `require.resolve`, which a test runner replaces with its own resolver.
+ */
+function installedPackageDir(from, name) {
+  let dir = path__default["default"].resolve(from);
+  for (;;) {
+    const candidate = path__default["default"].join(dir, "node_modules", name);
+    if (fs__default$1["default"].existsSync(path__default["default"].join(candidate, "package.json"))) {
+      return fs__default$1["default"].realpathSync(candidate);
+    }
+    const parent = path__default["default"].dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
 /**
  * Never the project's own files, at any depth: installed packages. Dot
  * directories (`.git`, `.tanstack`, `.val`, `.output`) are tooling too.
@@ -2686,11 +2725,15 @@ async function buildArtifacts(options) {
       sources: onDisk,
       assets
     } = readProjectFiles(root, builder.isAsset);
+    const studioVersion = installedStudioVersion(root);
     const wiring = builder.isValProject(onDisk) && !builder.isWired(onDisk) ? builder.wireUp(onDisk, {
       project: options.project,
       loader: options.contentHost,
       ...(options.git ? {
         git: options.git
+      } : {}),
+      ...(studioVersion ? {
+        studioVersion
       } : {})
     }) : null;
     // Less the one about the layer, which is the thing this goes on to build.

package/cli/dist/valbuild-cli-cli.cjs.prod.js

@@ -2517,6 +2517,45 @@ async function loadBuilder() {
   }
 }
 
+/**
+ * The `@valbuild/ui` this checkout runs: the one its `@valbuild/tanstack`
+ * resolves, which is a transitive dependency pnpm does not hoist -- so it is
+ * looked for FROM that package, and only then from the project itself. `null`
+ * when neither has one installed.
+ *
+ * Handed to `wireUp`, which declares `@valbuild/ui` for a project that does
+ * not and can only see source files.
+ */
+function installedStudioVersion(root) {
+  const tanstack = installedPackageDir(root, "@valbuild/tanstack");
+  const ui = (tanstack ? installedPackageDir(tanstack, "@valbuild/ui") : null) ?? installedPackageDir(root, "@valbuild/ui");
+  if (ui === null) return null;
+  try {
+    const manifest = JSON.parse(fs__default$1["default"].readFileSync(path__default["default"].join(ui, "package.json"), "utf8"));
+    return typeof manifest === "object" && manifest !== null && "version" in manifest && typeof manifest.version === "string" ? manifest.version : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Where `name` is installed as Node would find it from `from`: in the nearest
+ * `node_modules` upward, through pnpm's symlinks. Walked by hand rather than
+ * with `require.resolve`, which a test runner replaces with its own resolver.
+ */
+function installedPackageDir(from, name) {
+  let dir = path__default["default"].resolve(from);
+  for (;;) {
+    const candidate = path__default["default"].join(dir, "node_modules", name);
+    if (fs__default$1["default"].existsSync(path__default["default"].join(candidate, "package.json"))) {
+      return fs__default$1["default"].realpathSync(candidate);
+    }
+    const parent = path__default["default"].dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
 /**
  * Never the project's own files, at any depth: installed packages. Dot
  * directories (`.git`, `.tanstack`, `.val`, `.output`) are tooling too.
@@ -2686,11 +2725,15 @@ async function buildArtifacts(options) {
       sources: onDisk,
       assets
     } = readProjectFiles(root, builder.isAsset);
+    const studioVersion = installedStudioVersion(root);
     const wiring = builder.isValProject(onDisk) && !builder.isWired(onDisk) ? builder.wireUp(onDisk, {
       project: options.project,
       loader: options.contentHost,
       ...(options.git ? {
         git: options.git
+      } : {}),
+      ...(studioVersion ? {
+        studioVersion
       } : {})
     }) : null;
     // Less the one about the layer, which is the thing this goes on to build.

package/cli/dist/valbuild-cli-cli.esm.js

@@ -2482,6 +2482,45 @@ async function loadBuilder() {
   }
 }
 
+/**
+ * The `@valbuild/ui` this checkout runs: the one its `@valbuild/tanstack`
+ * resolves, which is a transitive dependency pnpm does not hoist -- so it is
+ * looked for FROM that package, and only then from the project itself. `null`
+ * when neither has one installed.
+ *
+ * Handed to `wireUp`, which declares `@valbuild/ui` for a project that does
+ * not and can only see source files.
+ */
+function installedStudioVersion(root) {
+  const tanstack = installedPackageDir(root, "@valbuild/tanstack");
+  const ui = (tanstack ? installedPackageDir(tanstack, "@valbuild/ui") : null) ?? installedPackageDir(root, "@valbuild/ui");
+  if (ui === null) return null;
+  try {
+    const manifest = JSON.parse(fs$1.readFileSync(path.join(ui, "package.json"), "utf8"));
+    return typeof manifest === "object" && manifest !== null && "version" in manifest && typeof manifest.version === "string" ? manifest.version : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Where `name` is installed as Node would find it from `from`: in the nearest
+ * `node_modules` upward, through pnpm's symlinks. Walked by hand rather than
+ * with `require.resolve`, which a test runner replaces with its own resolver.
+ */
+function installedPackageDir(from, name) {
+  let dir = path.resolve(from);
+  for (;;) {
+    const candidate = path.join(dir, "node_modules", name);
+    if (fs$1.existsSync(path.join(candidate, "package.json"))) {
+      return fs$1.realpathSync(candidate);
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
 /**
  * Never the project's own files, at any depth: installed packages. Dot
  * directories (`.git`, `.tanstack`, `.val`, `.output`) are tooling too.
@@ -2651,11 +2690,15 @@ async function buildArtifacts(options) {
       sources: onDisk,
       assets
     } = readProjectFiles(root, builder.isAsset);
+    const studioVersion = installedStudioVersion(root);
     const wiring = builder.isValProject(onDisk) && !builder.isWired(onDisk) ? builder.wireUp(onDisk, {
       project: options.project,
       loader: options.contentHost,
       ...(options.git ? {
         git: options.git
+      } : {}),
+      ...(studioVersion ? {
+        studioVersion
       } : {})
     }) : null;
     // Less the one about the layer, which is the thing this goes on to build.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@valbuild/cli",
   "private": false,
-  "version": "0.149.1",
+  "version": "0.149.3",
   "description": "Val CLI tools",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "picocolors": "^1.1.1",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.148.7",
     "@valbuild/eslint-plugin": "0.125.0",
-    "@valbuild/language-server": "0.149.1",
-    "@valbuild/server": "0.149.1",
+    "@valbuild/language-server": "0.149.3",
+    "@valbuild/core": "0.148.7",
+    "@valbuild/server": "0.149.3",
     "@valbuild/shared": "0.148.7"
   },
   "peerDependencies": {
@@ -38,7 +38,7 @@
     "rolldown": ">=1.2.5",
     "@tanstack/router-generator": ">=1.167.0",
     "@tanstack/router-plugin": ">=1.168.0",
-    "@valbuild/tanstack-build": "^0.148.5"
+    "@valbuild/tanstack-build": "^0.149.2"
   },
   "peerDependenciesMeta": {
     "@valbuild/tanstack-build": {
@@ -70,7 +70,7 @@
     "prettier": "~3.8.5",
     "rolldown": "^1.2.5",
     "tsx": "^4.23.12",
-    "@valbuild/tanstack-build": "0.148.5"
+    "@valbuild/tanstack-build": "0.149.2"
   },
   "scripts": {
     "start": "tsx src/cli.ts --",

package/src/publish/buildArtifacts.ts

@@ -74,6 +74,54 @@ async function loadBuilder(): Promise<
   }
 }
 
+/**
+ * The `@valbuild/ui` this checkout runs: the one its `@valbuild/tanstack`
+ * resolves, which is a transitive dependency pnpm does not hoist -- so it is
+ * looked for FROM that package, and only then from the project itself. `null`
+ * when neither has one installed.
+ *
+ * Handed to `wireUp`, which declares `@valbuild/ui` for a project that does
+ * not and can only see source files.
+ */
+export function installedStudioVersion(root: string): string | null {
+  const tanstack = installedPackageDir(root, "@valbuild/tanstack");
+  const ui =
+    (tanstack ? installedPackageDir(tanstack, "@valbuild/ui") : null) ??
+    installedPackageDir(root, "@valbuild/ui");
+  if (ui === null) return null;
+  try {
+    const manifest: unknown = JSON.parse(
+      fs.readFileSync(path.join(ui, "package.json"), "utf8"),
+    );
+    return typeof manifest === "object" &&
+      manifest !== null &&
+      "version" in manifest &&
+      typeof manifest.version === "string"
+      ? manifest.version
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Where `name` is installed as Node would find it from `from`: in the nearest
+ * `node_modules` upward, through pnpm's symlinks. Walked by hand rather than
+ * with `require.resolve`, which a test runner replaces with its own resolver.
+ */
+function installedPackageDir(from: string, name: string): string | null {
+  let dir = path.resolve(from);
+  for (;;) {
+    const candidate = path.join(dir, "node_modules", name);
+    if (fs.existsSync(path.join(candidate, "package.json"))) {
+      return fs.realpathSync(candidate);
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
 /**
  * Never the project's own files, at any depth: installed packages. Dot
  * directories (`.git`, `.tanstack`, `.val`, `.output`) are tooling too.
@@ -254,12 +302,14 @@ export async function buildArtifacts(options: {
      * same thing for a record that is already wired.
      */
     const { sources: onDisk, assets } = readProjectFiles(root, builder.isAsset);
+    const studioVersion = installedStudioVersion(root);
     const wiring =
       builder.isValProject(onDisk) && !builder.isWired(onDisk)
         ? builder.wireUp(onDisk, {
             project: options.project,
             loader: options.contentHost,
             ...(options.git ? { git: options.git } : {}),
+            ...(studioVersion ? { studioVersion } : {}),
           })
         : null;
     // Less the one about the layer, which is the thing this goes on to build.

package/src/publish/installedStudioVersion.test.ts

@@ -0,0 +1,59 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { installedStudioVersion } from "./buildArtifacts";
+
+/**
+ * The `@valbuild/ui` a checkout runs is the one its `@valbuild/tanstack`
+ * resolves. pnpm does not hoist a transitive dependency, so it sits beside
+ * tanstack rather than at the project's root -- and a root copy, where there
+ * is one, is not necessarily the Studio that runs.
+ */
+
+let root: string;
+
+function writePackage(dir: string, name: string, version: string) {
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(
+    path.join(dir, "package.json"),
+    JSON.stringify({ name, version }),
+  );
+}
+
+beforeEach(() => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), "val-studio-version-"));
+  writePackage(root, "a-site", "0.0.0");
+});
+
+afterEach(() => {
+  fs.rmSync(root, { recursive: true, force: true });
+});
+
+test("is the @valbuild/ui that @valbuild/tanstack resolves", () => {
+  const tanstack = path.join(root, "node_modules", "@valbuild", "tanstack");
+  writePackage(tanstack, "@valbuild/tanstack", "0.149.1");
+  writePackage(
+    path.join(tanstack, "node_modules", "@valbuild", "ui"),
+    "@valbuild/ui",
+    "0.149.1",
+  );
+  writePackage(
+    path.join(root, "node_modules", "@valbuild", "ui"),
+    "@valbuild/ui",
+    "0.148.7",
+  );
+  expect(installedStudioVersion(root)).toBe("0.149.1");
+});
+
+test("is the project's own @valbuild/ui without @valbuild/tanstack", () => {
+  writePackage(
+    path.join(root, "node_modules", "@valbuild", "ui"),
+    "@valbuild/ui",
+    "0.149.1",
+  );
+  expect(installedStudioVersion(root)).toBe("0.149.1");
+});
+
+test("is null when nothing is installed", () => {
+  expect(installedStudioVersion(root)).toBeNull();
+});