fix: save original source descriptor in cache to compare on hmr, vite…

…js#211
rashfael · Jul 27, 2023 · bd77219 · bd77219
1 parent ec58d00
commit bd77219
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/packages/plugin-vue/src/compiler.ts b/packages/plugin-vue/src/compiler.ts
@@ -2,6 +2,7 @@
 declare module 'vue/compiler-sfc' {
   interface SFCDescriptor {
     id: string
+    original?: SFCDescriptor
   }
 }
 

diff --git a/packages/plugin-vue/src/handleHotUpdate.ts b/packages/plugin-vue/src/handleHotUpdate.ts
@@ -23,7 +23,7 @@ const directRequestRE = /(?:\?|&)direct\b/
  * Vite-specific HMR handling
  */
 export async function handleHotUpdate(
-  { file, modules, read }: HmrContext,
+  { file, modules, read, server }: HmrContext,
   options: ResolvedOptions,
 ): Promise<ModuleNode[] | void> {
   const prevDescriptor = getDescriptor(file, options, false)
@@ -42,7 +42,10 @@ export async function handleHotUpdate(
   const mainModule = getMainModule(modules)
   const templateModule = modules.find((m) => /type=template/.test(m.url))
 
-  const scriptChanged = hasScriptChanged(prevDescriptor, descriptor)
+  const scriptChanged = hasScriptChanged(
+    prevDescriptor.original ? prevDescriptor.original : prevDescriptor,
+    descriptor,
+  )
   if (scriptChanged) {
     affectedModules.add(getScriptModule(modules) || mainModule)
   }

diff --git a/packages/plugin-vue/src/main.ts b/packages/plugin-vue/src/main.ts
@@ -37,7 +37,12 @@ export async function transformMain(
 
   // prev descriptor is only set and used for hmr
   const prevDescriptor = getPrevDescriptor(filename)
-  const { descriptor, errors } = createDescriptor(filename, code, options)
+  const { descriptor, errors } = createDescriptor(
+    filename,
+    code,
+    options,
+    pluginContext.originalCode,
+  )
 
   if (errors.length) {
     errors.forEach((error) =>

diff --git a/packages/plugin-vue/src/utils/descriptorCache.ts b/packages/plugin-vue/src/utils/descriptorCache.ts
@@ -18,6 +18,7 @@ export function createDescriptor(
   filename: string,
   source: string,
   { root, isProduction, sourceMap, compiler }: ResolvedOptions,
+  originalSource?: string,
 ): SFCParseResult {
   const { descriptor, errors } = compiler.parse(source, {
     filename,
@@ -29,6 +30,14 @@ export function createDescriptor(
   const normalizedPath = slash(path.normalize(path.relative(root, filename)))
   descriptor.id = getHash(normalizedPath + (isProduction ? source : ''))
 
+  if (originalSource && source !== originalSource) {
+    const { descriptor: originalDescriptor } = compiler.parse(originalSource, {
+      filename,
+      sourceMap,
+    })
+    descriptor.original = originalDescriptor
+  }
+
   cache.set(filename, descriptor)
   return { descriptor, errors }
 }