From 54da6f81a066aeb6ef862112421122d63559e6d9 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 25 Oct 2022 10:24:09 +0200 Subject: [PATCH] fix(kit): use `pathe` to resolve aliases (#8453) --- packages/kit/src/resolve.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/kit/src/resolve.ts b/packages/kit/src/resolve.ts index 68e3b5459fd..6ccb4c56af1 100644 --- a/packages/kit/src/resolve.ts +++ b/packages/kit/src/resolve.ts @@ -2,7 +2,7 @@ import { promises as fsp, existsSync } from 'node:fs' import { fileURLToPath } from 'node:url' import { basename, dirname, resolve, join, normalize, isAbsolute } from 'pathe' import { globby } from 'globby' -import { normalizeAliases } from 'pathe/utils' +import { resolveAlias as _resolveAlias } from 'pathe/utils' import { tryUseNuxt, useNuxt } from './context' import { tryResolveModule } from './internal/cjs' import { isIgnored } from './ignore' @@ -106,13 +106,7 @@ export function resolveAlias (path: string, alias?: Record): str if (!alias) { alias = tryUseNuxt()?.options.alias || {} } - for (const key in normalizeAliases(alias)) { - if (key === '@' && !path.startsWith('@/')) { continue } // Don't resolve @foo/bar - if (path.startsWith(key)) { - path = alias[key] + path.slice(key.length) - } - } - return path + return _resolveAlias(path, alias) } export interface Resolver {