fix: pass compilerOptions to sfc parse & re-enable AST reuse

vuejs · Dec 30, 2023 · d2a2e05 · d2a2e05
1 parent 071f30d
commit d2a2e05
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/descriptorCache.ts b/src/descriptorCache.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs'
-import type { SFCDescriptor } from 'vue/compiler-sfc'
+import type { CompilerOptions, SFCDescriptor } from 'vue/compiler-sfc'
 import { compiler } from './compiler'
 
 const { parse } = compiler
@@ -9,7 +9,10 @@ export function setDescriptor(filename: string, entry: SFCDescriptor) {
   descriptorCache.set(cleanQuery(filename), entry)
 }
 
-export function getDescriptor(filename: string): SFCDescriptor {
+export function getDescriptor(
+  filename: string,
+  compilerOptions?: CompilerOptions
+): SFCDescriptor {
   filename = cleanQuery(filename)
   if (descriptorCache.has(filename)) {
     return descriptorCache.get(filename)!
@@ -24,6 +27,7 @@ export function getDescriptor(filename: string): SFCDescriptor {
   const { descriptor } = parse(source, {
     filename,
     sourceMap: true,
+    templateParseOptions: compilerOptions,
   })
   descriptorCache.set(filename, descriptor)
   return descriptor

diff --git a/src/index.ts b/src/index.ts
@@ -116,6 +116,7 @@ export default function loader(
   const { descriptor, errors } = parse(source, {
     filename,
     sourceMap,
+    templateParseOptions: options.compilerOptions,
   })
 
   const asCustomElement =
@@ -363,7 +364,9 @@ export default function loader(
   if (!propsToAttach.length) {
     code += `\n\nconst __exports__ = script;`
   } else {
-    code += `\n\nimport exportComponent from ${stringifyRequest(exportHelperPath)}`
+    code += `\n\nimport exportComponent from ${stringifyRequest(
+      exportHelperPath
+    )}`
     code += `\nconst __exports__ = /*#__PURE__*/exportComponent(script, [${propsToAttach
       .map(([key, val]) => `['${key}',${val}]`)
       .join(',')}])`

diff --git a/src/templateLoader.ts b/src/templateLoader.ts
@@ -27,7 +27,10 @@ const TemplateLoader: LoaderDefinitionFunction = function (source, inMap: any) {
     loaderContext.mode === 'production' || process.env.NODE_ENV === 'production'
   const query = qs.parse(loaderContext.resourceQuery.slice(1))
   const scopeId = query.id as string
-  const descriptor = getDescriptor(loaderContext.resourcePath)
+  const descriptor = getDescriptor(
+    loaderContext.resourcePath,
+    options.compilerOptions
+  )
   const script = resolveScript(
     descriptor,
     query.id as string,
@@ -44,10 +47,10 @@ const TemplateLoader: LoaderDefinitionFunction = function (source, inMap: any) {
 
   const compiled = compileTemplate({
     source,
-    // ast:
-    //   descriptor.template && !descriptor.template.lang
-    //     ? descriptor.template.ast
-    //     : undefined,
+    ast:
+      descriptor.template && !descriptor.template.lang
+        ? descriptor.template.ast
+        : undefined,
     filename: loaderContext.resourcePath,
     inMap,
     id: scopeId,