fix(yarn-plugin-external-workspaces): fix output paths

.changeset/stupid-rats-battle.md

@@ -0,0 +1,6 @@
+---
+"@rnx-kit/yarn-plugin-external-workspaces": patch
+---
+
+Fixed output being saved relatively to the current working directory instead of
+the project root

incubator/yarn-plugin-external-workspaces/src/cofiguration.ts → incubator/yarn-plugin-external-workspaces/src/configuration.ts

@@ -6,6 +6,7 @@ import {
 } from "@yarnpkg/core";
 import { type PortablePath, npath, ppath } from "@yarnpkg/fslib";
 import fs from "node:fs";
+import path from "node:path";
 import {
   type PackagePaths,
   type WorkspaceOutputGeneratedContent,
@@ -40,8 +41,19 @@ export const externalWorkspacesConfiguration: CustomConfiguration = {
   },
 };
 
-function coercePortablePath(value: unknown): PortablePath {
-  return npath.toPortablePath(typeof value === "string" ? value : "");
+function coercePortablePath(
+  value: unknown,
+  projectCwd: PortablePath | null
+): PortablePath {
+  // If we have a project root, convert to an absolute path otherwise Yarn will
+  // use the current working directory instead.
+  const root = projectCwd ? npath.fromPortablePath(projectCwd) : "";
+
+  // Both `npath.join()` and `ppath.join()` mishandle Windows paths, which is
+  // why we convert them to strings first and use `node:path.join()` instead.
+  const p = path.join(root, typeof value === "string" ? value : "");
+
+  return npath.toPortablePath(p);
 }
 
 /**
@@ -53,8 +65,15 @@ export function getPluginConfiguration(configuration: Configuration): {
   outputPath: PortablePath | null;
   outputOnlyOnCommand: boolean;
 } {
-  const provider = coercePortablePath(configuration.get(PROVIDER_KEY));
-  const outputPath = coercePortablePath(configuration.get(OUTPUT_PATH_KEY));
+  const { projectCwd } = configuration;
+  const provider = coercePortablePath(
+    configuration.get(PROVIDER_KEY),
+    projectCwd
+  );
+  const outputPath = coercePortablePath(
+    configuration.get(OUTPUT_PATH_KEY),
+    projectCwd
+  );
   const outputOnlyOnCommand = Boolean(configuration.get(OUTPUT_ON_COMMAND_KEY));
   return { provider, outputPath, outputOnlyOnCommand };
 }

incubator/yarn-plugin-external-workspaces/src/hooks.ts

@@ -7,7 +7,7 @@ import {
   type Resolver,
 } from "@yarnpkg/core";
 import { npath } from "@yarnpkg/fslib";
-import { getPluginConfiguration } from "./cofiguration";
+import { getPluginConfiguration } from "./configuration";
 import { outputWorkspaces } from "./outputCommand";
 import { getWorkspaceTracker } from "./tracker";
 

incubator/yarn-plugin-external-workspaces/src/index.ts

@@ -1,5 +1,5 @@
 import { type Plugin } from "@yarnpkg/core";
-import { externalWorkspacesConfiguration } from "./cofiguration";
+import { externalWorkspacesConfiguration } from "./configuration";
 import { ExternalWorkspaceFetcher } from "./fetcher";
 import { afterAllInstalled, reduceDependency } from "./hooks";
 import { OutputWorkspaces } from "./outputCommand";

incubator/yarn-plugin-external-workspaces/src/outputCommand.ts

@@ -3,7 +3,7 @@ import { Configuration, Project, structUtils } from "@yarnpkg/core";
 import { npath, type PortablePath, ppath } from "@yarnpkg/fslib";
 import { Command, Option, UsageError } from "clipanion";
 import fs from "node:fs";
-import { getPluginConfiguration } from "./cofiguration";
+import { getPluginConfiguration } from "./configuration";
 import { type WorkspaceOutputGeneratedContent } from "./types";
 
 const outputVersion = "1.0.0";
@@ -96,15 +96,17 @@ export function outputWorkspaces(
 ): void {
   // ensure we have a valid filename and that the directory exists
   const includesJson = outputPath.endsWith(".json");
-  const outputDir = includesJson ? ppath.dirname(outputPath) : outputPath;
+  const outputDir = npath.fromPortablePath(
+    includesJson ? ppath.dirname(outputPath) : outputPath
+  );
   const outputFile = includesJson
     ? ppath.basename(outputPath)
     : fallbackOutputFilename(project);
 
   if (!checkOnly && !fs.existsSync(outputDir)) {
     fs.mkdirSync(outputDir, { recursive: true, mode: 0o755 });
   }
-  const fullPath = npath.join(npath.fromPortablePath(outputDir), outputFile);
+  const fullPath = npath.join(outputDir, outputFile);
 
   const workspaces: Record<string, string> = {};
   // iterate the workspaces and record their names and paths
@@ -117,7 +119,10 @@ export function outputWorkspaces(
   });
 
   // grab the relative path from the config to the repo root
-  const repoPath = ppath.relative(outputDir, project.cwd);
+  const repoPath = npath.relative(
+    outputDir,
+    npath.fromPortablePath(project.cwd)
+  );
 
   // create the new generated content
   const generated: WorkspaceOutputGeneratedContent = {

incubator/yarn-plugin-external-workspaces/src/tracker.ts

@@ -14,7 +14,7 @@ import {
   getFinderFromJsConfig,
   getFinderFromJsonConfig,
   getPluginConfiguration,
-} from "./cofiguration";
+} from "./configuration";
 import { type PackagePaths } from "./types";
 import { ExternalWorkspace } from "./workspace";