From 3dc76ff8491d149d89a8ba5deb02f517f1535f98 Mon Sep 17 00:00:00 2001
From: Lachlan Miller <lachlan.miller.1990@outlook.com>
Date: Mon, 12 Dec 2022 08:58:50 +1000
Subject: [PATCH 1/2] publish: 29.2.2

---
 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 bec989c2..865bdad5 100644
--- a/packages/vue2-jest/package.json
+++ b/packages/vue2-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/vue2-jest",
-  "version": "29.2.1",
+  "version": "29.2.2",
   "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 27615ce3..a06233f5 100644
--- a/packages/vue3-jest/package.json
+++ b/packages/vue3-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/vue3-jest",
-  "version": "29.2.1",
+  "version": "29.2.2",
   "description": "Jest Vue transform",
   "main": "lib/index.js",
   "files": [

From 36c6d970ed3cd29797791fa4e8c6b2fc2b5c34d4 Mon Sep 17 00:00:00 2001
From: Renan Andrade <renansoareess@gmail.com>
Date: Thu, 2 Mar 2023 23:02:36 +0100
Subject: [PATCH 2/2] fix: script and script setup in same vue file (#536)

---
 .../basic/components/ScriptAndScriptSetup.vue | 23 +++++++++++++++++++
 e2e/2.x/basic/test.js                         |  7 ++++++
 packages/vue2-jest/lib/process.js             |  9 ++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 e2e/2.x/basic/components/ScriptAndScriptSetup.vue

diff --git a/e2e/2.x/basic/components/ScriptAndScriptSetup.vue b/e2e/2.x/basic/components/ScriptAndScriptSetup.vue
new file mode 100644
index 00000000..e3aa2fcb
--- /dev/null
+++ b/e2e/2.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/2.x/basic/test.js b/e2e/2.x/basic/test.js
index a340be9c..9eb6b525 100644
--- a/e2e/2.x/basic/test.js
+++ b/e2e/2.x/basic/test.js
@@ -21,6 +21,7 @@ import Jsx from './components/Jsx.vue'
 import Constructor from './components/Constructor.vue'
 import { compileStyle } from '@vue/component-compiler-utils'
 import ScriptSetup from './components/ScriptSetup'
+import ScriptAndScriptSetup from './components/ScriptAndScriptSetup'
 import ExtendedTsConfig from './components/ExtendedTsConfig.vue'
 
 jest.mock('@vue/component-compiler-utils', () => ({
@@ -165,6 +166,12 @@ test('processes SFC with <script setup>', () => {
   expect(wrapper.html()).toContain('Welcome to Your Vue.js App')
 })
 
+test('processes SFC with both <script> and <script setup> in same component file', () => {
+  const wrapper = mount(ScriptAndScriptSetup)
+  expect(wrapper.html()).toContain('Products: 10')
+  expect(wrapper.html()).toContain('Welcome to Your Vue.js App')
+})
+
 test('handles extended tsconfig.json files', () => {
   const wrapper = mount(ExtendedTsConfig)
   expect(wrapper.element.tagName).toBe('DIV')
diff --git a/packages/vue2-jest/lib/process.js b/packages/vue2-jest/lib/process.js
index cbb63b3a..a47917ff 100644
--- a/packages/vue2-jest/lib/process.js
+++ b/packages/vue2-jest/lib/process.js
@@ -144,8 +144,6 @@ module.exports = function(src, filename, config) {
   })
 
   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,
@@ -153,6 +151,13 @@ module.exports = function(src, filename, config) {
     config
   )
 
+  let scriptResult
+  const scriptSetupResult = processScriptSetup(descriptor, filename, config)
+
+  if (!scriptSetupResult) {
+    scriptResult = processScript(descriptor.script, filename, config)
+  }
+
   const isFunctional =
     (descriptor.template &&
       descriptor.template.attrs &&