From 9eb6a62471720b03169d47b935d5caaf91e0fa2c Mon Sep 17 00:00:00 2001
From: pooya parsa <pyapar@gmail.com>
Date: Thu, 3 Nov 2022 22:48:51 +0100
Subject: [PATCH] fix: resolve ids to support pnpm (#8671)

---
 packages/nuxt/src/core/templates.ts | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index 76d914672d6..f6f3b9e6e7f 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -1,11 +1,11 @@
 import type { Nuxt, NuxtApp, NuxtTemplate } from '@nuxt/schema'
 import { genArrayFromRaw, genDynamicImport, genExport, genImport, genObjectFromRawEntries, genString, genSafeVariableName } from 'knitwork'
-
 import { isAbsolute, join, relative, resolve } from 'pathe'
 import { resolveSchema, generateTypes } from 'untyped'
 import escapeRE from 'escape-string-regexp'
 import { hash } from 'ohash'
 import { camelCase } from 'scule'
+import { resolvePath } from 'mlly'
 
 export interface TemplateContext {
   nuxt: Nuxt
@@ -206,9 +206,9 @@ declare module '@nuxt/schema' {
 export const appConfigTemplate: NuxtTemplate = {
   filename: 'app.config.mjs',
   write: true,
-  getContents: ({ app, nuxt }) => {
+  getContents: async ({ app, nuxt }) => {
     return `
-import { defuFn } from 'defu'
+import { defuFn } from '${await _resolveId('defu')}'
 
 const inlineConfig = ${JSON.stringify(nuxt.options.appConfig, null, 2)}
 
@@ -221,9 +221,9 @@ export default defuFn(${app.configs.map((_id: string, index: number) => `cfg${in
 
 export const publicPathTemplate: NuxtTemplate = {
   filename: 'paths.mjs',
-  getContents ({ nuxt }) {
+  async getContents ({ nuxt }) {
     return [
-      'import { joinURL } from \'ufo\'',
+      `import { joinURL } from '${await _resolveId('ufo')}'`,
       !nuxt.options.dev && 'import { useRuntimeConfig } from \'#internal/nitro\'',
 
       nuxt.options.dev
@@ -256,3 +256,17 @@ export const nuxtConfigTemplate = {
     return Object.entries(ctx.nuxt.options.app).map(([k, v]) => `export const ${camelCase('app-' + k)} = ${JSON.stringify(v)}`).join('\n\n')
   }
 }
+
+// TODO: Move to kit
+function _resolveId (id: string) {
+  return resolvePath(id, {
+    url: [
+      // @ts-ignore
+      global.__NUXT_PREPATHS__,
+      import.meta.url,
+      process.cwd(),
+      // @ts-ignore
+      global.__NUXT_PATHS__
+    ]
+  })
+}