From 7f7dcc9f7d9a036df366453e2bf228f29c0bef82 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Apr 2021 18:11:04 -0400
Subject: [PATCH] fix(compiler-sfc): fix wrong scopeId for nested `<script
 setup>` components

---
 packages/compiler-core/src/codegen.ts         | 15 ++++++-----
 .../__snapshots__/compileScript.spec.ts.snap  | 19 ++++++++++++++
 .../__tests__/compileScript.spec.ts           | 26 +++++++++++++++++++
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-core/src/codegen.ts b/packages/compiler-core/src/codegen.ts
index 939b3b356ad..e3dbbc820fc 100644
--- a/packages/compiler-core/src/codegen.ts
+++ b/packages/compiler-core/src/codegen.ts
@@ -231,12 +231,12 @@ export function generate(
       ? args.map(arg => `${arg}: any`).join(',')
       : args.join(', ')
 
-  if (genScopeId) {
-    if (isSetupInlined) {
-      push(`${PURE_ANNOTATION}${WITH_ID}(`)
-    } else {
-      push(`const ${functionName} = ${PURE_ANNOTATION}${WITH_ID}(`)
-    }
+  if (genScopeId && !isSetupInlined) {
+    // root-level _withId wrapping is no longer necessary after 3.0.8 and is
+    // a noop, it's only kept so that code compiled with 3.0.8+ can run with
+    // runtime < 3.0.8.
+    // TODO: consider removing in 3.1
+    push(`const ${functionName} = ${PURE_ANNOTATION}${WITH_ID}(`)
   }
   if (isSetupInlined || genScopeId) {
     push(`(${signature}) => {`)
@@ -303,7 +303,7 @@ export function generate(
   deindent()
   push(`}`)
 
-  if (genScopeId) {
+  if (genScopeId && !isSetupInlined) {
     push(`)`)
   }
 
@@ -438,6 +438,7 @@ function genModulePreamble(
 
   // we technically don't need this anymore since `withCtx` already sets the
   // correct scopeId, but this is necessary for backwards compat
+  // TODO: consider removing in 3.1
   if (genScopeId) {
     push(
       `const ${WITH_ID} = ${PURE_ANNOTATION}${helper(
diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index f648f39e8fa..7397228fb3b 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -272,6 +272,25 @@ return (_ctx, _cache) => {
 }"
 `;
 
+exports[`SFC compile <script setup> inlineTemplate mode should not wrap render fn with withId when having scoped styles 1`] = `
+"import { toDisplayString as _toDisplayString, openBlock as _openBlock, createBlock as _createBlock, withScopeId as _withScopeId } from \\"vue\\"
+const _withId = /*#__PURE__*/_withScopeId(\\"data-v-xxxxxxxx\\")
+
+
+export default {
+  expose: [],
+  setup(__props) {
+
+        const msg = 1
+        
+return (_ctx, _cache) => {
+  return (_openBlock(), _createBlock(\\"h1\\", null, _toDisplayString(msg)))
+}
+}
+
+}"
+`;
+
 exports[`SFC compile <script setup> inlineTemplate mode should work 1`] = `
 "import { toDisplayString as _toDisplayString, createVNode as _createVNode, Fragment as _Fragment, openBlock as _openBlock, createBlock as _createBlock } from \\"vue\\"
 
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 41e3abe8c57..d74d7448aa9 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -404,6 +404,32 @@ const myEmit = defineEmit(['foo', 'bar'])
       expect(content).toMatch(`ssrInterpolate`)
       assertCode(content)
     })
+
+    // _withId is only generated for backwards compat and is a noop when called
+    // in module scope.
+    // when inside setup(), currentInstance will be non-null and _withId will
+    // no longer be noop and cause scopeId errors.
+    // TODO: this test should no longer be necessary if we remove _withId
+    // codegen in 3.1
+    test('should not wrap render fn with withId when having scoped styles', async () => {
+      const { content } = compile(
+        `
+        <script setup>
+        const msg = 1
+        </script>
+        <template><h1>{{ msg }}</h1></template>
+        <style scoped>
+        h1 { color: red; }
+        </style>
+        `,
+        {
+          inlineTemplate: true
+        }
+      )
+      expect(content).toMatch(`return (_ctx, _cache`)
+      expect(content).not.toMatch(`_withId(`)
+      assertCode(content)
+    })
   })
 
   describe('with TypeScript', () => {