Unverified Commit 822e4c03 authored by Ben Gubler's avatar Ben Gubler Committed by GitHub

[backport] fix: add path normalization to getRelativePath for Windows (#82918) (#83023)

parent bb67ca91
...@@ -17,6 +17,8 @@ import { ...@@ -17,6 +17,8 @@ import {
isInterceptionRouteAppPath, isInterceptionRouteAppPath,
} from '../../../shared/lib/router/utils/interception-routes' } from '../../../shared/lib/router/utils/interception-routes'
import { normalizePathSep } from '../../../shared/lib/page-path/normalize-path-sep'
interface RouteInfo { interface RouteInfo {
path: string path: string
groups: { [groupName: string]: Group } groups: { [groupName: string]: Group }
...@@ -166,10 +168,12 @@ export async function createRouteTypesManifest({ ...@@ -166,10 +168,12 @@ export async function createRouteTypesManifest({
const getRelativePath = (filePath: string) => { const getRelativePath = (filePath: string) => {
if (validatorFilePath) { if (validatorFilePath) {
// For validator generation, calculate path relative to validator directory // For validator generation, calculate path relative to validator directory
return path.relative(path.dirname(validatorFilePath), filePath) return normalizePathSep(
path.relative(path.dirname(validatorFilePath), filePath)
)
} }
// For other uses, calculate path relative to project directory // For other uses, calculate path relative to project directory
return path.relative(dir, filePath) return normalizePathSep(path.relative(dir, filePath))
} }
const manifest: RouteTypesManifest = { const manifest: RouteTypesManifest = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment