From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Nov 2020 20:28:35 +0000 (-0500)
Subject: wip: support inherit-attrs="false" on sfc `<tempalte>`
X-Git-Tag: v3.0.3~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faed98972cfede5feb509adb95e76574e841fe46;p=thirdparty%2Fvuejs%2Fcore.git

wip: support inherit-attrs="false" on sfc `<tempalte>`
---

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 11658523ec..f925826c56 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -33,6 +33,27 @@ return { x }
       export const n = 1"
 `;
 
+exports[`SFC compile <script setup> <template inherit-attrs="false"> 1`] = `
+"
+      const __default__ = {}
+      __default__.inheritAttrs = false
+export default __default__"
+`;
+
+exports[`SFC compile <script setup> <template inherit-attrs="false"> 2`] = `
+"export default {
+  expose: [],
+  inheritAttrs: false,
+  setup(__props) {
+
+      const a = 1
+      
+return { a }
+}
+
+}"
+`;
+
 exports[`SFC compile <script setup> defineEmit() 1`] = `
 "export default {
   expose: [],
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index ac607dcef0..624ae425c1 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -70,6 +70,28 @@ const myEmit = defineEmit(['foo', 'bar'])
   emits: ['foo', 'bar'],`)
   })
 
+  test('<template inherit-attrs="false">', () => {
+    const { content } = compile(`
+      <script>
+      export default {}
+      </script>
+      <template inherit-attrs="false">
+      {{ a }}
+      </template>
+      `)
+    assertCode(content)
+
+    const { content: content2 } = compile(`
+      <script setup>
+      const a = 1
+      </script>
+      <template inherit-attrs="false">
+      {{ a }}
+      </template>
+      `)
+    assertCode(content2)
+  })
+
   describe('<script> and <script setup> co-usage', () => {
     test('script first', () => {
       const { content } = compile(`
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index c2080b84cb..921f5c177d 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -25,9 +25,14 @@ import {
 } from '@babel/types'
 import { walk } from 'estree-walker'
 import { RawSourceMap } from 'source-map'
-import { CSS_VARS_HELPER, genCssVarsCode, injectCssVarsCalls } from './cssVars'
+import {
+  CSS_VARS_HELPER,
+  genCssVarsCode,
+  genNormalScriptCssVarsCode
+} from './cssVars'
 import { compileTemplate, SFCTemplateCompileOptions } from './compileTemplate'
 import { warnExperimental, warnOnce } from './warn'
+import { rewriteDefault } from './rewriteDefault'
 
 const DEFINE_PROPS = 'defineProps'
 const DEFINE_EMIT = 'defineEmit'
@@ -92,6 +97,8 @@ export function compileScript(
 
   const scopeId = options.id ? options.id.replace(/^data-v-/, '') : ''
   const cssVars = sfc.cssVars
+  const hasInheritAttrsFlag =
+    sfc.template && sfc.template.attrs['inherit-attrs'] === 'false'
   const scriptLang = script && script.lang
   const scriptSetupLang = scriptSetup && scriptSetup.lang
   const isTS = scriptLang === 'ts' || scriptSetupLang === 'ts'
@@ -113,18 +120,26 @@ export function compileScript(
         sourceType: 'module'
       }).program.body
       const bindings = analyzeScriptBindings(scriptAst)
+      const needRewrite = cssVars.length || hasInheritAttrsFlag
+      let content = script.content
+      if (needRewrite) {
+        content = rewriteDefault(content, `__default__`, plugins)
+        if (cssVars.length) {
+          content += genNormalScriptCssVarsCode(
+            cssVars,
+            bindings,
+            scopeId,
+            !!options.isProd
+          )
+        }
+        if (hasInheritAttrsFlag) {
+          content += `__default__.inheritAttrs = false`
+        }
+        content += `\nexport default __default__`
+      }
       return {
         ...script,
-        content: cssVars.length
-          ? injectCssVarsCalls(
-              sfc,
-              cssVars,
-              bindings,
-              scopeId,
-              !!options.isProd,
-              plugins
-            )
-          : script.content,
+        content,
         bindings,
         scriptAst
       }
@@ -922,6 +937,9 @@ export function compileScript(
   // 11. finalize default export
   // expose: [] makes <script setup> components "closed" by default.
   let runtimeOptions = `\n  expose: [],`
+  if (hasInheritAttrsFlag) {
+    runtimeOptions += `\n  inheritAttrs: false,`
+  }
   if (hasInlinedSsrRenderFn) {
     runtimeOptions += `\n  __ssrInlineRender: true,`
   }
diff --git a/packages/compiler-sfc/src/cssVars.ts b/packages/compiler-sfc/src/cssVars.ts
index 2028c39929..7489d1b511 100644
--- a/packages/compiler-sfc/src/cssVars.ts
+++ b/packages/compiler-sfc/src/cssVars.ts
@@ -8,8 +8,6 @@ import {
   BindingMetadata
 } from '@vue/compiler-dom'
 import { SFCDescriptor } from './parse'
-import { rewriteDefault } from './rewriteDefault'
-import { ParserPlugin } from '@babel/parser'
 import postcss, { Root } from 'postcss'
 import hash from 'hash-sum'
 
@@ -96,22 +94,13 @@ export function genCssVarsCode(
 
 // <script setup> already gets the calls injected as part of the transform
 // this is only for single normal <script>
-export function injectCssVarsCalls(
-  sfc: SFCDescriptor,
+export function genNormalScriptCssVarsCode(
   cssVars: string[],
   bindings: BindingMetadata,
   id: string,
-  isProd: boolean,
-  parserPlugins: ParserPlugin[]
+  isProd: boolean
 ): string {
-  const script = rewriteDefault(
-    sfc.script!.content,
-    `__default__`,
-    parserPlugins
-  )
-
   return (
-    script +
     `\nimport { ${CSS_VARS_HELPER} as _${CSS_VARS_HELPER} } from 'vue'\n` +
     `const __injectCSSVars__ = () => {\n${genCssVarsCode(
       cssVars,
@@ -122,7 +111,6 @@ export function injectCssVarsCalls(
     `const __setup__ = __default__.setup\n` +
     `__default__.setup = __setup__\n` +
     `  ? (props, ctx) => { __injectCSSVars__();return __setup__(props, ctx) }\n` +
-    `  : __injectCSSVars__\n` +
-    `export default __default__`
+    `  : __injectCSSVars__\n`
   )
 }