Skip to content

Fix(js_scanner): import hoisting corruption when import.meta.env … #1158

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

Open
bosmievoll wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix(js_scanner): import hoisting corruption when import.meta.env … #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0f5ebf
Fix(js_scanner): fix import hoisting corruption when import.meta.env …
bosmievoll Mar 23, 2026
3f26dd6
Add changeset
bosmievoll Mar 23, 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
5 changes: 5 additions & 0 deletions .changeset/mighty-moments-begin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/compiler": patch
---

Fix (js_scanner): import hoisting corruption when import.meta.env precedes import statements (#944)
5 changes: 4 additions & 1 deletion internal/js_scanner/js_scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,9 @@ func NextImportStatement(source []byte, pos int) (int, ImportStatement) {
if next == js.DotToken {
isMeta := false
for {
next, _ := l.Next()
next, nextInnerValue := l.Next()
i += len(nextInnerValue)
text = append(text, nextInnerValue...)
if next == js.MetaToken {
isMeta = true
}
Expand Down Expand Up @@ -919,6 +921,7 @@ func NextImportStatement(source []byte, pos int) (int, ImportStatement) {
break
}
}
continue
}

i += len(value)
Expand Down
14 changes: 14 additions & 0 deletions internal/js_scanner/js_scanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,20 @@ import
import Test from "../components/Test.astro";`,
want: `import Test from "../components/Test.astro";`,
},
{
name: "import.meta.env before import",
source: `export const prerender = import.meta.env.MY_VAR !== 'true';
import { nanoid } from 'nanoid';`,
want: `import { nanoid } from 'nanoid';`,
},
{
name: "import.meta.env before multiple imports",
source: `export const prerender = import.meta.env.PUBLIC_PRERENDER;
import { foo } from 'foo';
import { bar } from 'bar';`,
want: `import { foo } from 'foo';
import { bar } from 'bar';`,
},
{
name: "import/export",
source: `import { fn } from "package";
Expand Down