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
5 changes: 5 additions & 0 deletions .changeset/brown-tires-melt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/compiler": patch
---

Fixes an issue where `server:defer` was treated like a transition directive, causing ViewTransitions CSS to be included even when no `transition:*` directives were used.
5 changes: 4 additions & 1 deletion internal/transform/transform.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ func Transform(doc *astro.Node, opts TransformOptions, h *handler.Handler) *astr
if shouldScope {
ScopeElement(n, opts)
}
if HasAttr(n, TRANSITION_ANIMATE) || HasAttr(n, TRANSITION_NAME) || HasAttr(n, TRANSITION_PERSIST) || HasAttr(n, SERVER_DEFER) {
if HasAttr(n, TRANSITION_ANIMATE) || HasAttr(n, TRANSITION_NAME) || HasAttr(n, TRANSITION_PERSIST) {
doc.Transition = true
doc.HeadPropagation = true
getOrCreateTransitionScope(n, &opts, i)
}
if HasAttr(n, SERVER_DEFER) {
doc.HeadPropagation = true
}
if len(definedVars) > 0 {
didAdd := AddDefineVars(n, definedVars)
if !didAddDefinedVars {
Expand Down
48 changes: 48 additions & 0 deletions internal/transform/transform_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,54 @@ func TestFullTransform(t *testing.T) {
}
}

func TestTransformTransitionAndHeadPropagationFlags(t *testing.T) {
tests := []struct {
name string
source string
wantTransition bool
wantHeadPropagation bool
}{
{
name: "server:defer only",
source: `<Component server:defer />`,
wantTransition: false,
wantHeadPropagation: true,
},
{
name: "transition directive",
source: `<div transition:animate="slide"></div>`,
wantTransition: true,
wantHeadPropagation: true,
},
{
name: "transition:persist-props alone does not count as transition directive",
source: `<Component transition:persist-props="true" />`,
wantTransition: false,
wantHeadPropagation: false,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
doc, err := astro.Parse(strings.NewReader(tt.source))
if err != nil {
t.Fatal(err)
}

transformOptions := TransformOptions{}
ExtractStyles(doc, &transformOptions)
Transform(doc, transformOptions, handler.NewHandler(tt.source, "/test.astro"))

if doc.Transition != tt.wantTransition {
t.Fatalf("unexpected doc.Transition value: want %v, got %v", tt.wantTransition, doc.Transition)
}
if doc.HeadPropagation != tt.wantHeadPropagation {
t.Fatalf("unexpected doc.HeadPropagation value: want %v, got %v", tt.wantHeadPropagation, doc.HeadPropagation)
}
})
}
}

func TestTransformTrailingSpace(t *testing.T) {
tests := []struct {
name string
Expand Down
Loading