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/vite/src/module-runner/createImportMeta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export async function createNodeImportMeta(

return {
...defaultMeta,
main: false,
resolve(id: string, parent?: string) {
const resolver = importMetaResolver ?? defaultMeta.resolve
return resolver(id, parent ?? href)
Expand Down
6 changes: 6 additions & 0 deletions playground/ssr/__tests__/ssr.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ test(`import.meta.resolve is supported`, async () => {
expect(await page.textContent('.import-meta-resolve')).toBe(metaUrl)
})

test(`import.meta.main is supported`, async () => {
await page.goto(`${url}/import-meta`)

expect(await page.textContent('.import-meta-main')).toBe('false')
})

test.runIf(isServe)('html proxy is encoded', async () => {
await page.goto(
`${url}?%22%3E%3C/script%3E%3Cscript%3Econsole.log(%27html%20proxy%20is%20not%20encoded%27)%3C/script%3E`,
Expand Down
4 changes: 3 additions & 1 deletion playground/ssr/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ async function renderForkedDeadlockDynamicImports(rootDir) {
async function renderImportMeta(rootDir) {
const metaUrl = import.meta.url
const resolveResult = import.meta.resolve('./app.js')
const metaMain = import.meta.main
return (
`<div class="import-meta-url">${escapeHtml(metaUrl)}</div>` +
`<div class="import-meta-resolve">${escapeHtml(resolveResult)}</div>`
`<div class="import-meta-resolve">${escapeHtml(resolveResult)}</div>` +
`<div class="import-meta-main">${escapeHtml(String(metaMain))}</div>`
)
}
Loading