fix: cross platform file paths

NathanWalker · NathanWalker · commit 6de0d0757e7e · 2025-12-04T10:06:18.000-08:00
diff --git a/packages/vite/helpers/css-tree.ts b/packages/vite/helpers/css-tree.ts
@@ -2,7 +2,6 @@ import path from 'path';
 import { __dirname } from './project.js';
 
 export const aliasCssTree = [
-	// Node.js built-ins and mdn-data polyfills for css-tree
 	{
 		find: 'module',
 		replacement: path.resolve(__dirname, '../polyfills/module.js'),
diff --git a/packages/vite/hmr/server/vite-plugin-path.spec.ts b/packages/vite/hmr/server/vite-plugin-path.spec.ts
@@ -0,0 +1,64 @@
+import { describe, it, expect } from 'vitest';
+import path from 'path';
+import { pathToFileURL } from 'url';
+
+// Reproduce the path logic from vite-plugin.ts in a testable helper
+function computeClientImport(options: { projectRoot: string; clientFsPath: string }) {
+	const { projectRoot, clientFsPath } = options;
+	let clientImport = clientFsPath;
+	try {
+		const rel = path.relative(projectRoot, clientFsPath);
+		const relPosix = rel.replace(/\\/g, '/');
+
+		if (path.isAbsolute(rel)) {
+			clientImport = pathToFileURL(clientFsPath).toString();
+		} else {
+			clientImport = (relPosix.startsWith('.') ? relPosix : `/${relPosix}`).replace(/\/+/g, '/');
+		}
+	} catch {
+		clientImport = clientFsPath.replace(/\\/g, '/');
+	}
+	return clientImport;
+}
+
+describe('ns-hmr-client vite plugin path handling', () => {
+	it('keeps a clean project-relative POSIX path on POSIX-like roots', () => {
+		const projectRoot = '/Users/test/app';
+		const clientFsPath = '/Users/test/app/node_modules/@nativescript/vite/hmr/client/index.js';
+
+		const result = computeClientImport({ projectRoot, clientFsPath });
+
+		expect(result).toBe('/node_modules/@nativescript/vite/hmr/client/index.js');
+	});
+
+	it('falls back to file URL when relative becomes absolute (Windows-like different drive)', () => {
+		// Simulate a scenario where projectRoot and clientFsPath are on different drives.
+		// On real Windows, path.relative('C:/proj', 'D:/lib/file.js') is an absolute path
+		// starting with the target drive (e.g. 'D:/lib/file.js').
+		const projectRoot = 'C:/project/root';
+		const clientFsPath = 'D:/ns-vite-demo/node_modules/@nativescript/vite/hmr/client/index.js';
+
+		const result = computeClientImport({ projectRoot, clientFsPath });
+
+		// On non-Windows hosts, Node's path.relative may not simulate the
+		// cross-drive behavior. The important contract is: when the computed
+		// relative path is absolute, we do NOT generate an import like '/D:/...'
+		// that would later resolve to 'D:\\D:\\...'. In that case we use a
+		// file URL; otherwise we leave the relative specifier alone.
+		if (path.sep === '\\') {
+			// Windows: expect file URL behavior
+			expect(result.startsWith('file://')).toBe(true);
+		}
+		expect(result.includes('nativescript/vite/hmr/client/index.js')).toBe(true);
+	});
+
+	it('handles Windows-style same-drive paths as project-relative POSIX', () => {
+		const projectRoot = 'D:/ns-vite-demo';
+		const clientFsPath = 'D:/ns-vite-demo/node_modules/@nativescript/vite/hmr/client/index.js';
+
+		const result = computeClientImport({ projectRoot, clientFsPath });
+
+		// When on the same drive, relative path should be node_modules/... and we normalize to POSIX.
+		expect(result).toBe('/node_modules/@nativescript/vite/hmr/client/index.js');
+	});
+});
diff --git a/packages/vite/hmr/server/vite-plugin.ts b/packages/vite/hmr/server/vite-plugin.ts
@@ -1,6 +1,7 @@
 import type { Plugin, ResolvedConfig } from 'vite';
 import { createRequire } from 'node:module';
 import path from 'path';
+import { pathToFileURL } from 'url';
 const require = createRequire(import.meta.url);
 
 const VIRTUAL_ID = 'virtual:ns-hmr-client';
@@ -32,8 +33,21 @@ export function nsHmrClientVitePlugin(opts: { platform: string; verbose?: boolea
 			const projectRoot = config?.root || process.cwd();
 			let clientImport = clientFsPath;
 			try {
-				const rel = path.relative(projectRoot, clientFsPath).replace(/\\/g, '/');
-				clientImport = (rel.startsWith('.') ? rel : `/${rel}`).replace(/\/+/g, '/');
+				// Compute a project-relative POSIX path when possible. When `path.relative`
+				// returns an absolute path (this can occur on Windows if roots differ or
+				// when path.relative returns a drive-letter-prefixed path), avoid creating
+				// a specifier like `/D:/...` which later gets resolved to `D:\D:\...`.
+				const rel = path.relative(projectRoot, clientFsPath);
+				const relPosix = rel.replace(/\\/g, '/');
+
+				// If `rel` is absolute (e.g. starts with a drive letter on Windows),
+				// use a file:// URL for the import so Vite/Rollup do not prepend the
+				// project root and cause duplicated drive prefixes.
+				if (path.isAbsolute(rel)) {
+					clientImport = pathToFileURL(clientFsPath).toString();
+				} else {
+					clientImport = (relPosix.startsWith('.') ? relPosix : `/${relPosix}`).replace(/\/+/g, '/');
+				}
 			} catch {
 				// On any failure, keep the original path but normalize to POSIX
 				clientImport = clientFsPath.replace(/\\/g, '/');

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import path from 'path';`
`2`	`2`	`import { __dirname } from './project.js';`
`3`	`3`
`4`	`4`	`export const aliasCssTree = [`
`5`		`- // Node.js built-ins and mdn-data polyfills for css-tree`
`6`	`5`	`{`
`7`	`6`	`find: 'module',`
`8`	`7`	`replacement: path.resolve(__dirname, '../polyfills/module.js'),`