From d70f594f19087ed1440e44eb3f51e6b3ce1f298b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 21 Nov 2020 15:11:16 -0500
Subject: [PATCH] feat: support for new sfc experimental features

- new `<script setup>` vuejs/rfcs#227
- new `<style>` variable injection vuejs/rfcs#231

Requires a version of `@vue/compiler-sfc` that supports the above features.
---
 src/script.ts   | 1 +
 src/style.ts    | 1 +
 src/template.ts | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/script.ts b/src/script.ts
index 4e9c9b6..ac656d9 100644
--- a/src/script.ts
+++ b/src/script.ts
@@ -38,6 +38,7 @@ export function resolveScript(
   if (compileScript) {
     try {
       resolved = compileScript(descriptor, {
+        // @ts-ignore
         id: scopeId,
         isProd,
         inlineTemplate: true,
diff --git a/src/style.ts b/src/style.ts
index d00660d..aed8ead 100644
--- a/src/style.ts
+++ b/src/style.ts
@@ -49,6 +49,7 @@ export async function transformStyle(
   const result = await compileStyleAsync({
     filename: query.filename,
     id: `data-v-${query.id}`,
+    // @ts-ignore
     isProd: isProduction,
     source: code,
     scoped: block.scoped,
diff --git a/src/template.ts b/src/template.ts
index b23a8f9..284359e 100644
--- a/src/template.ts
+++ b/src/template.ts
@@ -21,7 +21,6 @@ export function transformTemplate(
   const descriptor = getDescriptor(query.filename)
   const result = compileTemplate({
     ...getTemplateCompilerOptions(options, descriptor, query.id),
-    id: query.id,
     source: code,
     filename: query.filename,
   })
@@ -73,6 +72,7 @@ export function getTemplateCompilerOptions(
     options.templatePreprocessOptions[preprocessLang]
   const resolvedScript = getResolvedScript(descriptor, isServer)
   return {
+    // @ts-ignore
     id: scopeId,
     scoped: hasScoped,
     isProd,
@@ -83,6 +83,7 @@ export function getTemplateCompilerOptions(
     preprocessCustomRequire: options.preprocessCustomRequire,
     compiler: options.compiler,
     ssr: isServer,
+    // @ts-ignore
     ssrCssVars: descriptor.cssVars,
     compilerOptions: {
       ...options.compilerOptions,