Skip to content

fix(language-core): ensure <script> content generates before <script setup> #5795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnsoncodehk merged 1 commit into from
Dec 2, 2025
Merged

fix(language-core): ensure <script> content generates before <script setup> #5795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions packages/language-core/lib/codegen/script/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,17 @@ function* generateWorker(

// <script> + <script setup>
if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
// <script> head
// <script>
const { exportDefault, componentOptions } = scriptRanges;
if (exportDefault) {
yield* generateSfcBlockSection(script, 0, exportDefault.start, codeFeatures.all, true);
const { expression: options } = componentOptions ?? exportDefault;
yield* generateSfcBlockSection(script, 0, options.start, codeFeatures.all);
yield exportExpression;
yield* generateSfcBlockSection(script, options.end, script.content.length, codeFeatures.all, true);
}
else {
yield* generateSfcBlockSection(script, 0, script.content.length, codeFeatures.all, true);
yield `export default ${exportExpression}${endOfLine}`;
}

// <script setup>
Expand Down Expand Up @@ -95,17 +99,6 @@ function* generateWorker(
);
yield `})()${endOfLine}`;
}

// <script> tail
if (exportDefault) {
const { expression } = componentOptions ?? exportDefault;
yield* generateSfcBlockSection(script, exportDefault.start, expression.start, codeFeatures.all);
yield exportExpression;
yield* generateSfcBlockSection(script, expression.end, script.content.length, codeFeatures.all);
}
else {
yield `export default ${exportExpression}${endOfLine}`;
}
}
// only <script setup>
else if (scriptSetup && scriptSetupRanges) {
Expand Down
20 changes: 20 additions & 0 deletions test-workspace/tsc/passedFixtures/vue3/#5776/main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<script setup lang="ts">
import { ref } from 'vue';

defineProps<{ msg: string }>();

const count = ref(eee);
</script>

<script lang="ts">
export default {
name: '1212'
}
export const eee = 1
</script>

<template>
<div class="flex items-center justify-center w-screen h-screen">
{{ count }}
</div>
</template>
1 change: 0 additions & 1 deletion test-workspace/tsc/passedFixtures/vue3/script-setup-scope/export-order.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ export const useTwo = async () => ({ two: 'two' })

<script lang="ts" setup>
useOne()
// @ts-expect-error
useTwo()
</script>