From 0d35d194d0bad04e9a863996795f0fd238f65ebe Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 25 Oct 2022 08:31:21 +0200
Subject: [PATCH 1/2] fix(kit): use `pathe` to resolve aliases

---
 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..e77aa5f11e2 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 { normalizeAliases, 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<string, string>): 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 {

From f70ee81ba390d4eb214c8db0ccba05de6ee3b718 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 25 Oct 2022 09:19:36 +0200
Subject: [PATCH 2/2] Update packages/kit/src/resolve.ts

---
 packages/kit/src/resolve.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kit/src/resolve.ts b/packages/kit/src/resolve.ts
index e77aa5f11e2..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, resolveAlias as _resolveAlias } from 'pathe/utils'
+import { resolveAlias as _resolveAlias } from 'pathe/utils'
 import { tryUseNuxt, useNuxt } from './context'
 import { tryResolveModule } from './internal/cjs'
 import { isIgnored } from './ignore'