Skip to content

fix: detect import.meta.resolve when formatted across multiple lines #21312

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
sapphi-red merged 4 commits into from
Dec 19, 2025
Merged

fix: detect import.meta.resolve when formatted across multiple lines #21312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7114255
Initial plan
Copilot Dec 19, 2025
b117a61
Fix import.meta.resolve detection for multi-line formatting
Copilot Dec 19, 2025
226911f
Address PR feedback: hoist regex and reuse existing test fixture
Copilot Dec 19, 2025
c61c74c
Remove unintended pnpm-lock.yaml changes
Copilot Dec 19, 2025
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/node/__tests__/config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,7 @@ describe('loadConfigFromFile', () => {
expect(c.dirname).toContain('import-meta')
expect(c.filename).toContain('vite.config.ts')
expect(c.resolved).toBe(c.url)
expect(c.resolvedMultiline).toBe(c.url)
})

test('shebang is preserved at the top of the file', async () => {
Expand Down
3 changes: 3 additions & 0 deletions packages/vite/src/node/__tests__/fixtures/config/import-meta/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ export default {
dirname: import.meta.dirname,
filename: import.meta.filename,
resolved: import.meta.resolve('../import-meta/vite.config.ts'),
// prettier-ignore
resolvedMultiline: import.meta
.resolve('../import-meta/vite.config.ts'),
}
3 changes: 2 additions & 1 deletion packages/vite/src/node/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2305,6 +2305,7 @@ async function bundleConfigFile(
const importMetaUrlVarName = '__vite_injected_original_import_meta_url'
const importMetaResolveVarName =
'__vite_injected_original_import_meta_resolve'
const importMetaResolveRegex = /import\.meta\s*\.\s*resolve/

const bundle = await rolldown({
input: fileName,
Expand Down Expand Up @@ -2392,7 +2393,7 @@ async function bundleConfigFile(
`const ${importMetaUrlVarName} = ${JSON.stringify(
pathToFileURL(id).href,
)};`
if (code.includes('import.meta.resolve')) {
if (importMetaResolveRegex.test(code)) {
if (isESM) {
if (!importMetaResolverRegistered) {
importMetaResolverRegistered = true
Expand Down