Skip to content

fix(ssrTransform): preserve line offset when transforming imports #19004

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 9 commits into from
Dec 24, 2024
Merged

fix(ssrTransform): preserve line offset when transforming imports #19004

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f10b65
fix(ssrTransform): preserve line offset when transforming imports
aleclarson Dec 18, 2024
b8c5ffe
update test snapshots
aleclarson Dec 18, 2024
37586e1
chore: format
aleclarson Dec 18, 2024
811683f
test: import hoisting and line offset preservation
aleclarson Dec 19, 2024
2281311
get the test to pass
aleclarson Dec 19, 2024
dbd8e54
one more test
aleclarson Dec 19, 2024
0317abd
tweak test name
aleclarson Dec 19, 2024
defd7f4
Update packages/vite/src/node/ssr/ssrTransform.ts
aleclarson Dec 20, 2024
684893d
Update packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
aleclarson Dec 20, 2024
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
Prev Previous commit
Next Next commit
Update packages/vite/src/node/ssr/ssrTransform.ts 
Co-authored-by: 翠 / green <[email protected]>
  • Loading branch information
@aleclarson @sapphi-red
aleclarson and sapphi-red authored Dec 20, 2024
commit defd7f41c56945ed56ce6e6f45a8ec3c8f335df1
7 changes: 4 additions & 3 deletions packages/vite/src/node/ssr/ssrTransform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,10 @@ async function ssrTransformScript(

s.update(importNode.start, importNode.end, transformedImport)

// Check for non-whitespace characters between the last import and the
// current one, to determine if hoisting is needed.
// TODO: Account for comments between imports.
// If there's only whitespace characters between the last import and the
// current one, that means there's no statements between them and
// hoisting is not needed.
// FIXME: account for comments between imports
const nonWhitespaceRegex = /\S/g
nonWhitespaceRegex.lastIndex = index
nonWhitespaceRegex.exec(code)
Expand Down
Loading