From 70b024fbaab08b1f1a857e934799c0c02561d93a Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 12 Aug 2022 10:11:09 +0100
Subject: [PATCH] fix(vite, nuxt): resolve relative to `srcDir` rather than
 `rootDir` (#6546)

---
 packages/nuxt/src/components/module.ts   | 2 +-
 packages/vite/src/client.ts              | 2 +-
 packages/vite/src/plugins/cache-dir.ts   | 2 +-
 packages/vite/src/plugins/dev-ssr-css.ts | 6 +++---
 packages/vite/src/runtime/vite-node.mjs  | 2 +-
 packages/vite/src/vite-node.ts           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/nuxt/src/components/module.ts b/packages/nuxt/src/components/module.ts
index e14b78b4c0..56169b112b 100644
--- a/packages/nuxt/src/components/module.ts
+++ b/packages/nuxt/src/components/module.ts
@@ -146,7 +146,7 @@ export default defineNuxtModule<ComponentsOptions>({
       if (!['add', 'unlink'].includes(event)) {
         return
       }
-      const fPath = resolve(nuxt.options.rootDir, path)
+      const fPath = resolve(nuxt.options.srcDir, path)
       if (componentDirs.find(dir => fPath.startsWith(dir.path))) {
         await nuxt.callHook('builder:generateApp')
       }
diff --git a/packages/vite/src/client.ts b/packages/vite/src/client.ts
index 783ebf70b1..c19f0b7e64 100644
--- a/packages/vite/src/client.ts
+++ b/packages/vite/src/client.ts
@@ -53,7 +53,7 @@ export async function buildClient (ctx: ViteBuildContext) {
       vuePlugin(ctx.config.vue),
       viteJsxPlugin(),
       devStyleSSRPlugin({
-        rootDir: ctx.nuxt.options.rootDir,
+        srcDir: ctx.nuxt.options.srcDir,
         buildAssetsURL: joinURL(ctx.nuxt.options.app.baseURL, ctx.nuxt.options.app.buildAssetsDir)
       }),
       ctx.nuxt.options.experimental.viteNode
diff --git a/packages/vite/src/plugins/cache-dir.ts b/packages/vite/src/plugins/cache-dir.ts
index b52989b026..6d931ae78e 100644
--- a/packages/vite/src/plugins/cache-dir.ts
+++ b/packages/vite/src/plugins/cache-dir.ts
@@ -1,7 +1,7 @@
 import { resolve } from 'pathe'
 import type { Plugin } from 'vite'
 
-export function cacheDirPlugin (rootDir, name: string) {
+export function cacheDirPlugin (rootDir: string, name: string) {
   const optimizeCacheDir = resolve(rootDir, 'node_modules/.cache/vite', name)
   return <Plugin> {
     name: 'nuxt:cache-dir',
diff --git a/packages/vite/src/plugins/dev-ssr-css.ts b/packages/vite/src/plugins/dev-ssr-css.ts
index 22248433fa..930cf97f05 100644
--- a/packages/vite/src/plugins/dev-ssr-css.ts
+++ b/packages/vite/src/plugins/dev-ssr-css.ts
@@ -3,7 +3,7 @@ import { Plugin } from 'vite'
 import { isCSS } from '../utils'
 
 export interface DevStyleSSRPluginOptions {
-  rootDir: string
+  srcDir: string
   buildAssetsURL: string
 }
 
@@ -18,8 +18,8 @@ export function devStyleSSRPlugin (options: DevStyleSSRPluginOptions): Plugin {
       }
 
       let moduleId = id
-      if (moduleId.startsWith(options.rootDir)) {
-        moduleId = moduleId.slice(options.rootDir.length)
+      if (moduleId.startsWith(options.srcDir)) {
+        moduleId = moduleId.slice(options.srcDir.length)
       }
 
       // When dev `<style>` is injected, remove the `<link>` styles from manifest
diff --git a/packages/vite/src/runtime/vite-node.mjs b/packages/vite/src/runtime/vite-node.mjs
index 10ebd1a1dd..a4c5d93350 100644
--- a/packages/vite/src/runtime/vite-node.mjs
+++ b/packages/vite/src/runtime/vite-node.mjs
@@ -7,7 +7,7 @@ import { getViteNodeOptions } from './vite-node-shared.mjs'
 const viteNodeOptions = getViteNodeOptions()
 
 const runner = new ViteNodeRunner({
-  root: viteNodeOptions.rootDir,
+  root: viteNodeOptions.root, // Equals to Nuxt `srcDir`
   base: viteNodeOptions.base,
   async fetchModule (id) {
     return await $fetch('/module/' + encodeURI(id), {
diff --git a/packages/vite/src/vite-node.ts b/packages/vite/src/vite-node.ts
index 1afe8c89a0..d85f596809 100644
--- a/packages/vite/src/vite-node.ts
+++ b/packages/vite/src/vite-node.ts
@@ -143,7 +143,7 @@ export async function initViteNodeServer (ctx: ViteBuildContext) {
   // Serialize and pass vite-node runtime options
   const viteNodeServerOptions = {
     baseURL: `${protocol}://${host}:${port}/__nuxt_vite_node__`,
-    rootDir: ctx.nuxt.options.rootDir,
+    root: ctx.nuxt.options.srcDir,
     entryPath,
     base: ctx.ssrServer.config.base || '/_nuxt/'
   }