Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/plugin-vue/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin<Api> {
if (query.type === 'template') {
return transformTemplateAsModule(
code,
filename,
descriptor,
options.value,
this,
Expand Down
7 changes: 6 additions & 1 deletion packages/plugin-vue/src/script.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ export function resolveScript(
id: descriptor.id,
isProd: options.isProduction,
inlineTemplate: isUseInlineTemplate(descriptor, options),
templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr),
templateOptions: resolveTemplateCompilerOptions(
descriptor,
options,
descriptor.filename,
ssr,
),
sourceMap: options.sourceMap,
genDefaultAs: canInlineMain(descriptor, options)
? scriptIdentifier
Expand Down
10 changes: 7 additions & 3 deletions packages/plugin-vue/src/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import type { ResolvedOptions } from './index'

export async function transformTemplateAsModule(
code: string,
filename: string,
descriptor: SFCDescriptor,
options: ResolvedOptions,
pluginContext: Rollup.TransformPluginContext,
Expand All @@ -24,6 +25,7 @@ export async function transformTemplateAsModule(
}> {
const result = compile(
code,
filename,
descriptor,
options,
pluginContext,
Expand Down Expand Up @@ -62,6 +64,7 @@ export function transformTemplateInMain(
): SFCTemplateCompileResults {
const result = compile(
code,
descriptor.filename,
descriptor,
options,
pluginContext,
Expand All @@ -80,16 +83,16 @@ export function transformTemplateInMain(
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export function compile(
code: string,
filename: string,
descriptor: SFCDescriptor,
options: ResolvedOptions,
pluginContext: Rollup.PluginContext,
ssr: boolean,
customElement: boolean,
) {
const filename = descriptor.filename
resolveScript(descriptor, options, ssr, customElement)
const result = options.compiler.compileTemplate({
...resolveTemplateCompilerOptions(descriptor, options, ssr)!,
...resolveTemplateCompilerOptions(descriptor, options, filename, ssr)!,
source: code,
})

Expand Down Expand Up @@ -118,6 +121,7 @@ export function compile(
export function resolveTemplateCompilerOptions(
descriptor: SFCDescriptor,
options: ResolvedOptions,
filename: string,
ssr: boolean,
): Omit<SFCTemplateCompileOptions, 'source'> | undefined {
const block = descriptor.template
Expand All @@ -126,7 +130,7 @@ export function resolveTemplateCompilerOptions(
}
const resolvedScript = getResolvedScript(descriptor, ssr)
const hasScoped = descriptor.styles.some((s) => s.scoped)
const { id, filename, cssVars } = descriptor
const { id, cssVars } = descriptor

let transformAssetUrls = options.template?.transformAssetUrls
// compiler-sfc should export `AssetURLOptions`
Expand Down
2 changes: 2 additions & 0 deletions playground/vue-sourcemap/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<SassWithImport />
<Less />
<SrcImport />
<SrcImportHtml />
<NoScript />
<NoTemplate />
</template>
Expand All @@ -19,6 +20,7 @@ import Sass from './Sass.vue'
import SassWithImport from './SassWithImport.vue'
import Less from './Less.vue'
import SrcImport from './src-import/SrcImport.vue'
import SrcImportHtml from './src-import-html/SrcImportHtml.vue'
import NoScript from './NoScript.vue'
import NoTemplate from './NoTemplate.vue'
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,20 @@ exports[`serve:vue-sourcemap > src imported > serve-src-imported 1`] = `
}
`;

exports[`serve:vue-sourcemap > src imported html > serve-html 1`] = `
{
"mappings": ";;;wBAAA,oBAA8B,WAA3B,mBAAuB",
"sources": [
"src-import.html",
],
Comment on lines +321 to +323
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this fix, this sources was ['SrcImportHtml.vue']. So the vue file's content was replaced with the html file's content (= the content in sourcesContent)

"sourcesContent": [
"<p>&lt;src-import-html&gt;</p>
",
],
"version": 3,
}
`;

exports[`serve:vue-sourcemap > src imported sass > serve-src-imported-sass 1`] = `
{
"ignoreList": [],
Expand Down
12 changes: 12 additions & 0 deletions playground/vue-sourcemap/__tests__/vue-sourcemap.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,18 @@ describe.runIf(isServe)('serve:vue-sourcemap', () => {
)
})

test('src imported html', async () => {
const res = await page.request.get(
new URL(
'./src-import-html/src-import.html?import&vue&type=template&src=true&lang.js',
page.url(),
).href,
)
const js = await res.text()
const map = extractSourcemap(js)
expect(formatSourcemapForSnapshot(map)).toMatchSnapshot('serve-html')
})

test('no script', async () => {
const res = await page.request.get(
new URL('./NoScript.vue', page.url()).href,
Expand Down
5 changes: 5 additions & 0 deletions playground/vue-sourcemap/src-import-html/SrcImportHtml.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<template src="./src-import.html" />

<script setup lang="ts">
console.log('src-import-html')
</script>
1 change: 1 addition & 0 deletions playground/vue-sourcemap/src-import-html/src-import.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>&lt;src-import-html&gt;</p>