From 3a5ab1e8f31d3ad4a4e412da8005c92dbb4b7e68 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Sun, 1 May 2022 11:00:47 +0200 Subject: [PATCH] Solve merge conflict --- packages/next/shared/lib/page-path/normalize-page-path.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/next/shared/lib/page-path/normalize-page-path.ts b/packages/next/shared/lib/page-path/normalize-page-path.ts index 1df8cef5856ad..81e7383b2da40 100644 --- a/packages/next/shared/lib/page-path/normalize-page-path.ts +++ b/packages/next/shared/lib/page-path/normalize-page-path.ts @@ -1,6 +1,7 @@ import { ensureLeadingSlash } from './ensure-leading-slash' import { isDynamicRoute } from '../router/utils' import { posix } from '../isomorphic/path' +import { NormalizeError } from '../utils' /** * Takes a page and transforms it into its file counterpart ensuring that the @@ -22,7 +23,7 @@ export function normalizePagePath(page: string): string { const resolvedPage = posix.normalize(normalized) if (resolvedPage !== normalized) { - throw new Error( + throw new NormalizeError( `Requested and resolved page mismatch: ${normalized} ${resolvedPage}` ) }