From 5bb720dc188de6ad4209f8bd3361a26486a89c47 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Thu, 16 Sep 2021 10:21:51 +0800
Subject: [PATCH 1/2] fix(sfc): recognizes exported vars in normal script

---
 .../__snapshots__/compileScript.spec.ts.snap       |  8 ++++----
 .../compiler-sfc/__tests__/compileScript.spec.ts   | 14 ++++++++++++++
 packages/compiler-sfc/src/compileScript.ts         |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 54591d402bd..382d8941dc3 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -11,7 +11,7 @@ export default {
 
       x()
       
-return { x }
+return { n, x }
 }
 
 }"
@@ -26,7 +26,7 @@ export default {
 
       x()
       
-return { x }
+return { n, x }
 }
 
 }
@@ -66,7 +66,7 @@ function setup(__props, { expose }) {
 
         x()
         
-return { x }
+return { n, x }
 }
 
 
@@ -87,7 +87,7 @@ function setup(__props, { expose }) {
 
         x()
         
-return { x }
+return { n, x }
 }
 
 
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 854357b6397..7200d48ddcf 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -1279,6 +1279,20 @@ describe('SFC analyze <script> bindings', () => {
     expect(bindings!.__isScriptSetup).toBe(false)
   })
 
+  it('recognizes exported vars', () => {
+    const { bindings } = compile(`
+      <script>
+        export const foo = 2
+      </script>
+      <script setup>
+        console.log(foo)
+      </script>
+    `)
+    expect(bindings).toStrictEqual({
+      foo: BindingTypes.SETUP_CONST
+    })
+  })
+
   it('recognizes async setup return', () => {
     const { bindings } = compile(`
       <script>
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 523efd724d0..0c014f2bb44 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -704,6 +704,7 @@ export function compileScript(
             )
           }
         }
+        walkDeclaration(node.declaration!, setupBindings, userImportAlias)
       } else if (
         (node.type === 'VariableDeclaration' ||
           node.type === 'FunctionDeclaration' ||

From a3a00dc1874638a16a8a89e44df7e63e0813d971 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Sep 2021 17:18:32 -0400
Subject: [PATCH 2/2] Should check node.declaration presence

---
 packages/compiler-sfc/src/compileScript.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 0c014f2bb44..84e6d4a6111 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -671,7 +671,7 @@ export function compileScript(
         const start = node.start! + scriptStartOffset!
         const end = node.declaration.start! + scriptStartOffset!
         s.overwrite(start, end, `const ${defaultTempVar} = `)
-      } else if (node.type === 'ExportNamedDeclaration' && node.specifiers) {
+      } else if (node.type === 'ExportNamedDeclaration') {
         const defaultSpecifier = node.specifiers.find(
           s => s.exported.type === 'Identifier' && s.exported.name === 'default'
         ) as ExportSpecifier
@@ -704,7 +704,9 @@ export function compileScript(
             )
           }
         }
-        walkDeclaration(node.declaration!, setupBindings, userImportAlias)
+        if (node.declaration) {
+          walkDeclaration(node.declaration, setupBindings, userImportAlias)
+        }
       } else if (
         (node.type === 'VariableDeclaration' ||
           node.type === 'FunctionDeclaration' ||