From 4b759075ff2cbbbd4d8da434d42d3da32bb03ddd Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 8 Oct 2021 21:44:39 +0800
Subject: [PATCH 1/3] fix(compiler-sfc): add new line after defineProps

---
 packages/compiler-sfc/src/compileScript.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 94d13f6471a..e55d84e4463 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -1214,7 +1214,7 @@ export function compileScript(
       startOffset,
       `\nconst ${propsIdentifier} = __props${
         propsTypeDecl ? ` as ${genSetupPropsType(propsTypeDecl)}` : ``
-      }`
+      }\n`
     )
   }
   if (propsDestructureRestId) {

From 8db3d5ae5cbd31ddf22167af71bfba175dbef7d6 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 8 Oct 2021 21:52:37 +0800
Subject: [PATCH 2/3] fix: fix snap

---
 .../__tests__/__snapshots__/compileScript.spec.ts.snap     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 9dbe37cc9de..4d219209b1e 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -392,6 +392,7 @@ export default {
   expose()
 
 const props = __props
+
     
     
 return { props, propsModel }
@@ -410,6 +411,7 @@ exports[`SFC compile <script setup> defineProps() 1`] = `
 
 const props = __props
 
+
 const bar = 1
 
 return { props, bar }
@@ -426,6 +428,7 @@ exports[`SFC compile <script setup> defineProps/defineEmits in multi-variable de
   expose()
 
 const props = __props
+
     
     
 return { props, emit }
@@ -442,6 +445,7 @@ exports[`SFC compile <script setup> defineProps/defineEmits in multi-variable de
   expose()
 
 const props = __props
+
     const a = 1;
     
 return { props, a, emit }
@@ -1286,6 +1290,7 @@ const props = __props
 
 
 
+
 return { props, emit }
 }
 
@@ -1341,6 +1346,7 @@ const props = __props as {
         bar?: number
         baz: boolean
       }
+
       
       
 return { props, defaults }
@@ -1363,6 +1369,7 @@ export default /*#__PURE__*/_defineComponent({
   expose()
 
 const props = __props as { foo: string, bar?: number, baz: boolean, qux(): number }
+
       
       
 return { props }

From 9153c352fca8a0b60f3760a1b91bea67efc39b29 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Fri, 8 Oct 2021 22:05:56 +0800
Subject: [PATCH 3/3] test: add test case

---
 .../__snapshots__/compileScript.spec.ts.snap   | 18 ++++++++++++++++++
 .../__tests__/compileScript.spec.ts            | 12 ++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 4d219209b1e..023e0e586d5 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -593,6 +593,24 @@ return { bar }
 }"
 `;
 
+exports[`SFC compile <script setup> import without new line at top of setup script + defineProps  1`] = `
+"const props = __props
+import { ref } from 'vue'
+
+export default {
+  props: {
+  foo: String
+},
+  setup(__props, { expose }) {
+  expose()
+
+
+return { props, ref }
+}
+
+}"
+`;
+
 exports[`SFC compile <script setup> imports dedupe between user & helper 1`] = `
 "import { ref as _ref } from 'vue'
 import { ref } from 'vue'
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index ff4279ecd63..2d08045c048 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -84,6 +84,18 @@ const bar = 1
 },`)
   })
 
+  test('import without new line at top of setup script + defineProps ', () => {
+    const { content } = compile(`
+<script setup>import { ref } from 'vue'
+const props = defineProps({
+  foo: String
+})
+</script>
+  `)
+    // should generate working code
+    assertCode(content)
+  })
+
   test('defineProps w/ external definition', () => {
     const { content } = compile(`
     <script setup>