Skip to content

fix: hoist pointer imports #3132

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
brillout merged 3 commits into from
Feb 27, 2026
Merged

fix: hoist pointer imports #3132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
260e0e9
[AI] Fix pointer imports hoisting by moving const declarations to top…
brillout Feb 27, 2026
87006b5
try it
brillout Feb 27, 2026
d2386aa
Revert "try it"
brillout Feb 27, 2026
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
12 changes: 8 additions & 4 deletions packages/vike/src/node/vite/shared/resolveVikeConfigInternal/pointerImports.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@ describe('transformPointerImports()', () => {
it('basics', () => {
expect(t('bla')).toMatchInlineSnapshot(`null`)
expect(t("import { something } from './bla.js'")).toMatchInlineSnapshot(
`"const something = '​import:./bla.js:something';"`,
`"const something = '​import:./bla.js:something';
"`,
)
expect(t("import def from './bla.js'")).toMatchInlineSnapshot(`"const def = '​import:./bla.js:default';"`)
expect(t("import def from './bla.js'")).toMatchInlineSnapshot(`"const def = '​import:./bla.js:default';
"`)
})
it('removes unused imports', () => {
expect(t("import './style.css'")).toMatchInlineSnapshot(`""`)
expect(t("import './script.js'")).toMatchInlineSnapshot(`""`)
})
it('import as', () => {
expect(t("import { bla as blu } from './bla.js'")).toMatchInlineSnapshot(`"const blu = '​import:./bla.js:bla';"`)
expect(t("import * as blo from './bla.js'")).toMatchInlineSnapshot(`"const blo = '​import:./bla.js:*';"`)
expect(t("import { bla as blu } from './bla.js'")).toMatchInlineSnapshot(`"const blu = '​import:./bla.js:bla';
"`)
expect(t("import * as blo from './bla.js'")).toMatchInlineSnapshot(`"const blo = '​import:./bla.js:*';
"`)
})
})
18 changes: 13 additions & 5 deletions packages/vike/src/node/vite/shared/resolveVikeConfigInternal/pointerImports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ function transformPointerImports(
skipWarnings?: true,
): string | null {
const spliceOperations: SpliceOperation[] = []
// Collect all const declarations to prepend at the top, so that they are
// available before any code runs (import declarations are hoisted but const
// is not, so we must place them at the top to avoid TDZ errors).
const constDeclarations: string[] = []

// Performance trick
if (!code.includes('import')) return null
Expand Down Expand Up @@ -93,7 +97,7 @@ function transformPointerImports(
}
}

let replacement = ''
let constDeclaration = ''
node.specifiers.forEach((specifier) => {
assert(
specifier.type === 'ImportSpecifier' ||
Expand All @@ -111,18 +115,22 @@ function transformPointerImports(
return importLocalName
})()
const importString = serializePointerImportData({ importPath, exportName, importStringWasGenerated: true })
replacement += `const ${importLocalName} = '${importString}';`
constDeclaration += `const ${importLocalName} = '${importString}';`
})

if (constDeclaration) constDeclarations.push(constDeclaration)
// Replace the import with blank lines to preserve source map line numbers.
spliceOperations.push({
start,
end,
replacement,
replacement: '\n'.repeat(importStatementCode.split('\n').length - 1),
})
})

const codeMod = spliceMany(code, spliceOperations)
return codeMod
if (constDeclarations.length === 0 && spliceOperations.length === 0) return null
const codeWithImportsRemoved = spliceMany(code, spliceOperations)
if (constDeclarations.length === 0) return codeWithImportsRemoved
return constDeclarations.join('') + '\n' + codeWithImportsRemoved
}
function getImports(code: string): ImportDeclaration[] {
const result = parseSync(code, {
Expand Down