@multiplatform.one/utils 6.6.0 → 7.0.0

package/lib/dev.cjs

@@ -30,6 +30,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 let node_child_process = require("node:child_process");
 let node_fs = require("node:fs");
 node_fs = __toESM(node_fs, 1);
+let node_module = require("node:module");
 let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
 let axios = require("axios");
@@ -22674,21 +22675,62 @@ function workspaceSourceAliases(workspaceRoot) {
 	return sorted;
 }
 /**
+* Locate the installed `one` package directory without assuming the npm/yarn
+* hoisted layout (`<root>/node_modules/one`). Under pnpm's default isolated
+* layout `one` lives in the importing package's own node_modules (e.g.
+* `apps/<app>/node_modules/one`), so resolve like node would from the build
+* cwd and the workspace root, fall back to this package's own resolution
+* (covers pnpm's `.pnpm/node_modules` fallback), then scan upward for a
+* physical `node_modules/one`.
+*/
+function resolveOnePackageDir(root) {
+	for (const base of [node_path.default.join(process.cwd(), "package.json"), node_path.default.join(root, "package.json")]) try {
+		return node_path.default.dirname((0, node_module.createRequire)(base).resolve("one/package.json"));
+	} catch {}
+	try {
+		return node_path.default.dirname((0, node_module.createRequire)(require("url").pathToFileURL(__filename).href).resolve("one/package.json"));
+	} catch {}
+	let dir = root;
+	while (true) {
+		const candidate = node_path.default.join(dir, "node_modules/one");
+		if (node_fs.default.existsSync(node_path.default.join(candidate, "package.json"))) return candidate;
+		const parent = node_path.default.dirname(dir);
+		if (parent === dir) return void 0;
+		dir = parent;
+	}
+}
+/**
 * one's client code imports ./vite/one-server-only.mjs, which pulls
 * node:async_hooks and can't bundle for the browser. Declaring it rollup-
 * `external` ships a literal node_modules import that can't resolve inside a
 * packaged extension (this exact failure made the webext popup load blank).
 * One publishes a no-op browser/native variant of the same module; redirect
 * to it instead of externalizing.
+*
+* When `one` is not installed at all, the redirect is skipped (with a one-line
+* warning) so normal resolution proceeds instead of rewriting matching ids to
+* a path that does not exist — which surfaced as a bare "No such file or
+* directory" naming the consumer's own import. The redirect also only applies
+* to imports made FROM one's own files (every real one-server-only import
+* site lives in one/dist); a consumer module whose id merely contains the
+* substring resolves normally.
 */
 function oneServerOnlyBrowserStub(workspaceRoot) {
 	const root = workspaceRoot ?? lookupProjectRoot();
-	const stub = node_path.default.join(root, "node_modules/one/dist/esm/vite/one-server-only.native.js");
+	const oneDir = resolveOnePackageDir(root);
+	if (!oneDir) {
+		logger.warn(`[one-server-only-browser-stub] cannot resolve the "one" package from ${root} — skipping the one-server-only browser redirect (normal resolution proceeds)`);
+		return { name: "one-server-only-browser-stub" };
+	}
+	const stub = node_path.default.join(oneDir, "dist/esm/vite/one-server-only.native.js");
 	return {
 		name: "one-server-only-browser-stub",
 		enforce: "pre",
-		resolveId(id) {
-			if (id.includes("one-server-only")) return stub;
+		resolveId(id, importer) {
+			if (!id.includes("one-server-only")) return;
+			if (!importer || !(importer.includes("/node_modules/one/") || importer.startsWith(`${oneDir}/`))) return;
+			if (!node_fs.default.existsSync(stub)) throw new Error(`[one-server-only-browser-stub] "${id}" matched the one-server-only browser redirect, but the stub target does not exist: ${stub}. The installed "one" package has an unexpected layout — reinstall one, or pass a workspaceRoot whose node_modules contains one/dist/esm/vite/one-server-only.native.js.`);
+			return stub;
 		}
 	};
 }

package/lib/dev.mjs

@@ -22647,21 +22647,62 @@ function workspaceSourceAliases(workspaceRoot) {
 	return sorted;
 }
 /**
+* Locate the installed `one` package directory without assuming the npm/yarn
+* hoisted layout (`<root>/node_modules/one`). Under pnpm's default isolated
+* layout `one` lives in the importing package's own node_modules (e.g.
+* `apps/<app>/node_modules/one`), so resolve like node would from the build
+* cwd and the workspace root, fall back to this package's own resolution
+* (covers pnpm's `.pnpm/node_modules` fallback), then scan upward for a
+* physical `node_modules/one`.
+*/
+function resolveOnePackageDir(root) {
+	for (const base of [path.join(process.cwd(), "package.json"), path.join(root, "package.json")]) try {
+		return path.dirname(createRequire(base).resolve("one/package.json"));
+	} catch {}
+	try {
+		return path.dirname(createRequire(import.meta.url).resolve("one/package.json"));
+	} catch {}
+	let dir = root;
+	while (true) {
+		const candidate = path.join(dir, "node_modules/one");
+		if (fs.existsSync(path.join(candidate, "package.json"))) return candidate;
+		const parent = path.dirname(dir);
+		if (parent === dir) return void 0;
+		dir = parent;
+	}
+}
+/**
 * one's client code imports ./vite/one-server-only.mjs, which pulls
 * node:async_hooks and can't bundle for the browser. Declaring it rollup-
 * `external` ships a literal node_modules import that can't resolve inside a
 * packaged extension (this exact failure made the webext popup load blank).
 * One publishes a no-op browser/native variant of the same module; redirect
 * to it instead of externalizing.
+*
+* When `one` is not installed at all, the redirect is skipped (with a one-line
+* warning) so normal resolution proceeds instead of rewriting matching ids to
+* a path that does not exist — which surfaced as a bare "No such file or
+* directory" naming the consumer's own import. The redirect also only applies
+* to imports made FROM one's own files (every real one-server-only import
+* site lives in one/dist); a consumer module whose id merely contains the
+* substring resolves normally.
 */
 function oneServerOnlyBrowserStub(workspaceRoot) {
 	const root = workspaceRoot ?? lookupProjectRoot();
-	const stub = path.join(root, "node_modules/one/dist/esm/vite/one-server-only.native.js");
+	const oneDir = resolveOnePackageDir(root);
+	if (!oneDir) {
+		logger.warn(`[one-server-only-browser-stub] cannot resolve the "one" package from ${root} — skipping the one-server-only browser redirect (normal resolution proceeds)`);
+		return { name: "one-server-only-browser-stub" };
+	}
+	const stub = path.join(oneDir, "dist/esm/vite/one-server-only.native.js");
 	return {
 		name: "one-server-only-browser-stub",
 		enforce: "pre",
-		resolveId(id) {
-			if (id.includes("one-server-only")) return stub;
+		resolveId(id, importer) {
+			if (!id.includes("one-server-only")) return;
+			if (!importer || !(importer.includes("/node_modules/one/") || importer.startsWith(`${oneDir}/`))) return;
+			if (!fs.existsSync(stub)) throw new Error(`[one-server-only-browser-stub] "${id}" matched the one-server-only browser redirect, but the stub target does not exist: ${stub}. The installed "one" package has an unexpected layout — reinstall one, or pass a workspaceRoot whose node_modules contains one/dist/esm/vite/one-server-only.native.js.`);
+			return stub;
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/utils",
-  "version": "6.6.0",
+  "version": "7.0.0",
   "description": "utilities for multiplatform.one",
   "keywords": [
     "multiplatform.one",
@@ -65,7 +65,7 @@
     "node": ">=6.0.0"
   },
   "scripts": {
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsgo --noEmit",
     "build": "rm -rf lib types 2>/dev/null && tsc -p tsconfig.build.json && tsdown",
     "test": "vitest run --coverage --coverage.provider=v8 --coverage.reporter=text --coverage.reporter=lcov --coverage.reporter=html"
   }

package/src/dev.ts

@@ -1,5 +1,6 @@
 import { spawnSync } from "node:child_process";
 import fs from "node:fs";
+import { createRequire } from "node:module";
 import path from "node:path";
 import type { Plugin } from "vite";
 
@@ -155,6 +156,34 @@ export function workspaceSourceAliases(workspaceRoot?: string): Record<string, s
   return sorted;
 }
 
+/**
+ * Locate the installed `one` package directory without assuming the npm/yarn
+ * hoisted layout (`<root>/node_modules/one`). Under pnpm's default isolated
+ * layout `one` lives in the importing package's own node_modules (e.g.
+ * `apps/<app>/node_modules/one`), so resolve like node would from the build
+ * cwd and the workspace root, fall back to this package's own resolution
+ * (covers pnpm's `.pnpm/node_modules` fallback), then scan upward for a
+ * physical `node_modules/one`.
+ */
+function resolveOnePackageDir(root: string): string | undefined {
+  for (const base of [path.join(process.cwd(), "package.json"), path.join(root, "package.json")]) {
+    try {
+      return path.dirname(createRequire(base).resolve("one/package.json"));
+    } catch {}
+  }
+  try {
+    return path.dirname(createRequire(import.meta.url).resolve("one/package.json"));
+  } catch {}
+  let dir = root;
+  while (true) {
+    const candidate = path.join(dir, "node_modules/one");
+    if (fs.existsSync(path.join(candidate, "package.json"))) return candidate;
+    const parent = path.dirname(dir);
+    if (parent === dir) return undefined;
+    dir = parent;
+  }
+}
+
 /**
  * one's client code imports ./vite/one-server-only.mjs, which pulls
  * node:async_hooks and can't bundle for the browser. Declaring it rollup-
@@ -162,15 +191,46 @@ export function workspaceSourceAliases(workspaceRoot?: string): Record<string, s
  * packaged extension (this exact failure made the webext popup load blank).
  * One publishes a no-op browser/native variant of the same module; redirect
  * to it instead of externalizing.
+ *
+ * When `one` is not installed at all, the redirect is skipped (with a one-line
+ * warning) so normal resolution proceeds instead of rewriting matching ids to
+ * a path that does not exist — which surfaced as a bare "No such file or
+ * directory" naming the consumer's own import. The redirect also only applies
+ * to imports made FROM one's own files (every real one-server-only import
+ * site lives in one/dist); a consumer module whose id merely contains the
+ * substring resolves normally.
  */
 export function oneServerOnlyBrowserStub(workspaceRoot?: string): Plugin {
   const root = workspaceRoot ?? lookupProjectRoot();
-  const stub = path.join(root, "node_modules/one/dist/esm/vite/one-server-only.native.js");
+  const oneDir = resolveOnePackageDir(root);
+  if (!oneDir) {
+    logger.warn(
+      `[one-server-only-browser-stub] cannot resolve the "one" package from ${root} — ` +
+        "skipping the one-server-only browser redirect (normal resolution proceeds)",
+    );
+    return { name: "one-server-only-browser-stub" };
+  }
+  const stub = path.join(oneDir, "dist/esm/vite/one-server-only.native.js");
   return {
     name: "one-server-only-browser-stub",
     enforce: "pre",
-    resolveId(id: string) {
-      if (id.includes("one-server-only")) return stub;
+    resolveId(id: string, importer?: string) {
+      if (!id.includes("one-server-only")) return;
+      if (
+        !importer ||
+        !(importer.includes("/node_modules/one/") || importer.startsWith(`${oneDir}/`))
+      ) {
+        return;
+      }
+      if (!fs.existsSync(stub)) {
+        throw new Error(
+          `[one-server-only-browser-stub] "${id}" matched the one-server-only browser ` +
+            `redirect, but the stub target does not exist: ${stub}. The installed "one" ` +
+            "package has an unexpected layout — reinstall one, or pass a workspaceRoot " +
+            "whose node_modules contains one/dist/esm/vite/one-server-only.native.js.",
+        );
+      }
+      return stub;
     },
   };
 }

package/types/dev.d.ts

@@ -25,6 +25,14 @@ export declare function workspaceSourceAliases(workspaceRoot?: string): Record<s
  * packaged extension (this exact failure made the webext popup load blank).
  * One publishes a no-op browser/native variant of the same module; redirect
  * to it instead of externalizing.
+ *
+ * When `one` is not installed at all, the redirect is skipped (with a one-line
+ * warning) so normal resolution proceeds instead of rewriting matching ids to
+ * a path that does not exist — which surfaced as a bare "No such file or
+ * directory" naming the consumer's own import. The redirect also only applies
+ * to imports made FROM one's own files (every real one-server-only import
+ * site lives in one/dist); a consumer module whose id merely contains the
+ * substring resolves normally.
  */
 export declare function oneServerOnlyBrowserStub(workspaceRoot?: string): Plugin;
 /**

package/types/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,MAAM,WAAW,6BAA6B;IAC5C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CACpC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,6BAAkC,SA0BnD;AAED,wBAAgB,oBAAoB,CAClC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,2BAAgC,SA2BjD;AAED,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,EAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAQrF;AAGD,wBAAgB,iBAAiB,WAYhC;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA8CrF;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAUvE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CASjD;AAED,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../src/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,MAAM,WAAW,6BAA6B;IAC5C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,sBAAsB,CACpC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,6BAAkC,SA0BnD;AAED,wBAAgB,oBAAoB,CAClC,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,EAAE,GAAU,EAAE,GAAE,2BAAgC,SA2BjD;AAED,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,EAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAQrF;AAGD,wBAAgB,iBAAiB,WAYhC;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA8CrF;AA8BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAiCvE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CASjD;AAED,cAAc,QAAQ,CAAC"}