From 21feab9e99eb3501454969fc2932f82fd930c97f Mon Sep 17 00:00:00 2001
From: Lachlan Miller <lachlan.miller.1990@outlook.com>
Date: Fri, 3 Mar 2023 08:07:54 +1000
Subject: [PATCH 1/3] publish: v29.2.3

---
 packages/vue2-jest/package.json | 2 +-
 packages/vue3-jest/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vue2-jest/package.json b/packages/vue2-jest/package.json
index 865bdad5..df55698d 100644
--- a/packages/vue2-jest/package.json
+++ b/packages/vue2-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/vue2-jest",
-  "version": "29.2.2",
+  "version": "29.2.3",
   "description": "Jest transformer for Vue 2",
   "main": "lib/index.js",
   "files": [
diff --git a/packages/vue3-jest/package.json b/packages/vue3-jest/package.json
index a06233f5..b6620a3b 100644
--- a/packages/vue3-jest/package.json
+++ b/packages/vue3-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/vue3-jest",
-  "version": "29.2.2",
+  "version": "29.2.3",
   "description": "Jest Vue transform",
   "main": "lib/index.js",
   "files": [

From 3605c5e7b96a63fbd89055d57b521b954ee82af2 Mon Sep 17 00:00:00 2001
From: quienti <hermel.quentin@gmail.com>
Date: Thu, 27 Apr 2023 02:10:53 +0200
Subject: [PATCH 2/3] fix: script and script setup in same vue component file
 (Vue 3) (#541)

Co-authored-by: qhermel <quentin.hermel@preventeo.com>
---
 .../basic/components/ScriptAndScriptSetup.vue | 23 +++++++++++++++++++
 e2e/3.x/basic/test.js                         |  7 ++++++
 packages/vue3-jest/lib/process.js             | 10 ++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 e2e/3.x/basic/components/ScriptAndScriptSetup.vue

diff --git a/e2e/3.x/basic/components/ScriptAndScriptSetup.vue b/e2e/3.x/basic/components/ScriptAndScriptSetup.vue
new file mode 100644
index 00000000..e3aa2fcb
--- /dev/null
+++ b/e2e/3.x/basic/components/ScriptAndScriptSetup.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <button @click="increase">Products: {{ products }}</button>
+    <Basic />
+    <span>{{ msg }}</span>
+  </div>
+</template>
+
+<script>
+import Basic from './Basic.vue'
+</script>
+
+<script setup>
+import { ref } from 'vue'
+
+const products = ref(10)
+const greet = () => console.log('greet')
+const increase = () => {
+  greet()
+  num.value++
+}
+const msg = 'hello world'
+</script>
diff --git a/e2e/3.x/basic/test.js b/e2e/3.x/basic/test.js
index 3a5dddaa..504c44c7 100644
--- a/e2e/3.x/basic/test.js
+++ b/e2e/3.x/basic/test.js
@@ -24,6 +24,7 @@ import ScriptSetupSugarRef from './components/ScriptSetupSugarRef.vue'
 import FunctionalRenderFn from './components/FunctionalRenderFn.vue'
 import CompilerDirective from './components/CompilerDirective.vue'
 import ExtendedTsConfig from './components/ExtendedTsConfig.vue'
+import ScriptAndScriptSetup from './components/ScriptAndScriptSetup.vue'
 
 // TODO: JSX for Vue 3? TSX?
 import Jsx from './components/Jsx.vue'
@@ -214,3 +215,9 @@ test('handles extended tsconfig.json files', () => {
   const elm = document.querySelector('div')
   expect(elm).toBeDefined()
 })
+
+test('processes SFC with both <script> and <script setup> in same component file', () => {
+  mount(ScriptAndScriptSetup)
+  expect(document.body.outerHTML).toContain('Products: 10')
+  expect(document.body.outerHTML).toContain('Welcome to Your Vue.js App')
+})
diff --git a/packages/vue3-jest/lib/process.js b/packages/vue3-jest/lib/process.js
index a8d1c5c9..ff1e3de6 100644
--- a/packages/vue3-jest/lib/process.js
+++ b/packages/vue3-jest/lib/process.js
@@ -164,8 +164,6 @@ module.exports = function(src, filename, config) {
     getVueJestConfig(config)['componentNamespace'] || vueComponentNamespace
 
   const templateResult = processTemplate(descriptor, filename, config)
-  const scriptResult = processScript(descriptor.script, filename, config)
-  const scriptSetupResult = processScriptSetup(descriptor, filename, config)
   const stylesResult = processStyle(descriptor.styles, filename, config)
   const customBlocksResult = processCustomBlocks(
     descriptor.customBlocks,
@@ -173,6 +171,14 @@ module.exports = function(src, filename, config) {
     componentNamespace,
     config
   )
+
+  let scriptResult
+  const scriptSetupResult = processScriptSetup(descriptor, filename, config)
+
+  if (!scriptSetupResult) {
+    scriptResult = processScript(descriptor.script, filename, config)
+  }
+
   const output = generateCode({
     scriptResult,
     scriptSetupResult,

From 972e5aa9e45e402548dc172dbf65c6eb5aa16553 Mon Sep 17 00:00:00 2001
From: Lachlan Miller <lachlan.miller.1990@outlook.com>
Date: Thu, 27 Apr 2023 10:12:04 +1000
Subject: [PATCH 3/3] publish: 29.2.4

---
 packages/vue2-jest/package.json | 2 +-
 packages/vue3-jest/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vue2-jest/package.json b/packages/vue2-jest/package.json
index df55698d..a05f7503 100644
--- a/packages/vue2-jest/package.json
+++ b/packages/vue2-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/vue2-jest",
-  "version": "29.2.3",
+  "version": "29.2.4",
   "description": "Jest transformer for Vue 2",
   "main": "lib/index.js",
   "files": [
diff --git a/packages/vue3-jest/package.json b/packages/vue3-jest/package.json
index b6620a3b..550f02b7 100644
--- a/packages/vue3-jest/package.json
+++ b/packages/vue3-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/vue3-jest",
-  "version": "29.2.3",
+  "version": "29.2.4",
   "description": "Jest Vue transform",
   "main": "lib/index.js",
   "files": [