@reticlehq/vite-plugin 3.7.0 → 3.8.1

package/dist/index.js

@@ -2,11 +2,11 @@ import { existsSync, readFileSync } from 'node:fs';
 import { missingTokenWarning } from './token/missing-token.js';
 import { ensurePairingToken } from './token/ensure-token.js';
 import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { RETICLE_RENDER_PREHOOK, ReticleDir, ReticleEnv, RETICLE_ROOT_GLOBAL, RETICLE_SDK_VERSION_GLOBAL, } from '@reticlehq/core';
+import { isAbsolute, join, resolve, sep } from 'node:path';
+import { RETICLE_RENDER_PREHOOK, ReticleDir, ReticleEnv, RETICLE_ROOT_GLOBAL, RETICLE_SDK_VERSION_GLOBAL, resolveStateDir, } from '@reticlehq/core';
 import { readConfiguredTestIdAttribute, resolveProjectId } from './project-id.js';
 import { resolveDaemonPort } from './discover-port.js';
-import { announceDevServer } from './announce.js';
+import { announceDevServer, announcedUrl } from './announce.js';
 import { stampSvelte } from './svelte-source.js';
 import { NODE_MODULES, ignoredFileNotice, optsOutOfStamping, shouldStamp, shouldStampSvelte, stamp, } from './stamping.js';
 import { resolvableChain, sdkPackageVersion, sdkBuildFingerprint, viteMajor, optimizerOptionsKey, optimizerOptions, } from './installed.js';
@@ -135,8 +135,17 @@ function isHtmlEntry(id, specifier, root) {
  * undefined if the daemon hasn't started yet (the page reloads once it has). Exported for testing.
  */
 export function readPairingToken() {
-    const override = process.env[ReticleEnv.PAIRING_TOKEN_DIR];
-    const dir = override !== undefined && override.length > 0 ? override : join(homedir(), ReticleDir.ROOT);
+    let dir;
+    try {
+        // The daemon's rule: a relative folder is resolved against the working folder, and a Windows
+        // path on POSIX is not used. Both warn, so the two sides agree on one token file.
+        dir = resolveStateDir(process.env[ReticleEnv.PAIRING_TOKEN_DIR], join(homedir(), ReticleDir.ROOT), { isAbsolute, resolve, sep }, (warning) => console.warn(`[reticle] ${warning}`));
+    }
+    catch (error) {
+        // Only a home folder that is not absolute gets here. The dev server still starts.
+        console.warn(`[reticle] ${error instanceof Error ? error.message : String(error)}`);
+        return undefined;
+    }
     // Read-or-CREATE, matching the daemon. Reading alone meant a dev server started before the daemon
     // baked in an empty token and every page it served was refused — with the SDK loading and the
     // socket opening, so nothing looked broken. See ensure-token for the bisect.
@@ -568,7 +577,7 @@ export function reticle(options = {}) {
                     port,
                     pid: process.pid,
                     root: opts.root ?? process.cwd(),
-                    url: server.resolvedUrls?.local[0] ?? `http://localhost:${String(port)}/`,
+                    url: announcedUrl(process.env, server.resolvedUrls?.local[0], port),
                     ...(opts.sdkVersion === undefined || 0 === opts.sdkVersion.length
                         ? {}
                         : { sdkVersion: opts.sdkVersion }),

package/dist/project-id.js

@@ -9,7 +9,7 @@
 import { createHash } from 'node:crypto';
 import { dirname, join } from 'node:path';
 import { readFileSync } from 'node:fs';
-import { PROJECT_ID_HASH_LENGTH, TESTID_ATTR_PATTERN, projectIdFrom } from '@reticlehq/core';
+import { PROJECT_ID_HASH_LENGTH, TESTID_ATTR_PATTERN, mainCheckoutTwin, projectIdFrom, } from '@reticlehq/core';
 /** The project config `reticle init` writes, and the id of record it carries. */
 const RETICLE_CONFIG_BASENAME = '.reticle.json';
 export { slugifyPackageName } from '@reticlehq/core';
@@ -76,6 +76,27 @@ function readNearestField(startDir, basename, field, readFile, maxDepth, accept)
     }
     return undefined;
 }
+/**
+ * A field of the nearest `.reticle.json`, else of the main checkout's when `startDir` is in a git
+ * worktree that has none (it is git-ignored, or not committed yet). Every worktree of a project is
+ * the same project: one id, one daemon port.
+ */
+function readConfigField(startDir, field, readFile, accept) {
+    const own = readNearestField(startDir, RETICLE_CONFIG_BASENAME, field, readFile, MAX_CONFIG_SEARCH_DEPTH, accept);
+    if (own !== undefined)
+        return own;
+    const twin = mainCheckoutTwin(startDir, (path) => {
+        try {
+            return readFile(path);
+        }
+        catch {
+            return undefined;
+        }
+    });
+    return twin === undefined
+        ? undefined
+        : readNearestField(twin, RETICLE_CONFIG_BASENAME, field, readFile, MAX_CONFIG_SEARCH_DEPTH, accept);
+}
 /** Read the `name` from the nearest package.json at or above `startDir`, or undefined if none. */
 function readNearestPackageName(startDir, readFile = readFileOrThrow) {
     return readNearestField(startDir, 'package.json', 'name', readFile, MAX_PACKAGE_SEARCH_DEPTH, nonEmptyString);
@@ -87,7 +108,7 @@ function readNearestPackageName(startDir, readFile = readFileOrThrow) {
  * through `init` — it is not a second opinion, and where the two disagree the config wins.
  */
 export function readConfiguredProjectId(startDir, readFile = readFileOrThrow) {
-    return readNearestField(startDir, RETICLE_CONFIG_BASENAME, 'projectId', readFile, MAX_CONFIG_SEARCH_DEPTH, nonEmptyString);
+    return readConfigField(startDir, 'projectId', readFile, nonEmptyString);
 }
 /**
  * Read the daemon port `reticle init --port` recorded in the nearest `.reticle.json`, or undefined.
@@ -97,7 +118,7 @@ export function readConfiguredProjectId(startDir, readFile = readFileOrThrow) {
  * project's daemon — and the bridge refused it.
  */
 export function readConfiguredPort(startDir, readFile = readFileOrThrow) {
-    return readNearestField(startDir, RETICLE_CONFIG_BASENAME, 'port', readFile, MAX_CONFIG_SEARCH_DEPTH, tcpPort);
+    return readConfigField(startDir, 'port', readFile, tcpPort);
 }
 /**
  * Read `testIdAttribute` from the nearest `.reticle.json`, or undefined: the attribute this project
@@ -106,7 +127,7 @@ export function readConfiguredPort(startDir, readFile = readFileOrThrow) {
  * already agree on, so the plugin forwards it to `connect()` rather than asking for it twice.
  */
 export function readConfiguredTestIdAttribute(startDir, readFile = readFileOrThrow) {
-    return readNearestField(startDir, RETICLE_CONFIG_BASENAME, 'testIdAttribute', readFile, MAX_CONFIG_SEARCH_DEPTH, (value) => ('string' === typeof value && TESTID_ATTR_PATTERN.test(value) ? value : undefined));
+    return readConfigField(startDir, 'testIdAttribute', readFile, (value) => 'string' === typeof value && TESTID_ATTR_PATTERN.test(value) ? value : undefined);
 }
 /**
  * Resolve the projectId for a plugin instance, most-local statement of intent first: an explicit

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reticlehq/vite-plugin",
-  "version": "3.7.0",
+  "version": "3.8.1",
   "description": "Vite plugin for Reticle: dev-only source-map stamping plus auto-injected reticle.connect(). apply:'serve' guarantees it never ships to production.",
   "type": "module",
   "license": "Apache-2.0",
@@ -41,15 +41,15 @@
   ],
   "dependencies": {
     "@babel/core": "^7.26.0",
-    "@reticlehq/babel-plugin": "3.7.0",
-    "@reticlehq/core": "3.7.0"
+    "@reticlehq/babel-plugin": "3.8.1",
+    "@reticlehq/core": "3.8.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
     "esbuild": "^0.28.2",
     "svelte": "^5.57.1",
     "vite": "^8",
-    "@reticlehq/react": "3.7.0"
+    "@reticlehq/react": "3.8.1"
   },
   "peerDependencies": {
     "vite": ">=4"