Skip to content

Commit 950635e

Browse files
ematipicoflorian-lefebvreascorbic
authored
Revert "Await the result of renderTransition() after it was made async in Astro 5.9." (#1081)
Co-authored-by: florian-lefebvre <[email protected]> Co-authored-by: ascorbic <[email protected]>
1 parent 3fd20b0 commit 950635e

7 files changed

+17
-12
lines changed

.changeset/poor-melons-speak.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@astrojs/compiler": patch
3+
---
4+
5+
Reverts a change where view transitions were made async to accomodate the CSP requirements.

internal/printer/__printer_js__/transition_animate_on_Component.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import "transitions.css";
3333
3434
export const $$metadata = $$createMetadata("/projects/app/src/pages/page.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
3535
36-
const $$Page = $$createComponent(async ($$result, $$props, $$slots) => {
36+
const $$Page = $$createComponent(($$result, $$props, $$slots) => {
3737
38-
return $$render`${$$renderComponent($$result,'Component',Component,{"class":"bar","data-astro-transition-scope":(await $$renderTransition($$result, "wkm5vset", "morph", ""))})}`;
38+
return $$render`${$$renderComponent($$result,'Component',Component,{"class":"bar","data-astro-transition-scope":($$renderTransition($$result, "wkm5vset", "morph", ""))})}`;
3939
}, '/projects/app/src/pages/page.astro', 'self');
4040
export default $$Page;
4141
```

internal/printer/__printer_js__/transition_animate_with_an_expression.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import "transitions.css";
3333
3434
export const $$metadata = $$createMetadata("/projects/app/src/pages/page.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
3535
36-
const $$Page = $$createComponent(async ($$result, $$props, $$slots) => {
36+
const $$Page = $$createComponent(($$result, $$props, $$slots) => {
3737
38-
return $$render`${$$maybeRenderHead($$result)}<div${$$addAttribute(await $$renderTransition($$result, "ih7yuffh", (slide({duration:15})), ""), "data-astro-transition-scope")}></div>`;
38+
return $$render`${$$maybeRenderHead($$result)}<div${$$addAttribute($$renderTransition($$result, "ih7yuffh", (slide({duration:15})), ""), "data-astro-transition-scope")}></div>`;
3939
}, '/projects/app/src/pages/page.astro', 'self');
4040
export default $$Page;
4141
```

internal/printer/__printer_js__/transition_name_with_an_expression.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import "transitions.css";
3333
3434
export const $$metadata = $$createMetadata("/projects/app/src/pages/page.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
3535
36-
const $$Page = $$createComponent(async ($$result, $$props, $$slots) => {
36+
const $$Page = $$createComponent(($$result, $$props, $$slots) => {
3737
38-
return $$render`${$$maybeRenderHead($$result)}<div${$$addAttribute(await $$renderTransition($$result, "daiq24ry", "", (one + '-' + 'two')), "data-astro-transition-scope")}></div>`;
38+
return $$render`${$$maybeRenderHead($$result)}<div${$$addAttribute($$renderTransition($$result, "daiq24ry", "", (one + '-' + 'two')), "data-astro-transition-scope")}></div>`;
3939
}, '/projects/app/src/pages/page.astro', 'self');
4040
export default $$Page;
4141
```

internal/printer/__printer_js__/transition_name_with_an_template_literal.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import "transitions.css";
3333
3434
export const $$metadata = $$createMetadata("/projects/app/src/pages/page.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
3535
36-
const $$Page = $$createComponent(async ($$result, $$props, $$slots) => {
36+
const $$Page = $$createComponent(($$result, $$props, $$slots) => {
3737
38-
return $$render`${$$maybeRenderHead($$result)}<div${$$addAttribute(await $$renderTransition($$result, "vvov4lyr", "", `${one}-two`), "data-astro-transition-scope")}></div>`;
38+
return $$render`${$$maybeRenderHead($$result)}<div${$$addAttribute($$renderTransition($$result, "vvov4lyr", "", `${one}-two`), "data-astro-transition-scope")}></div>`;
3939
}, '/projects/app/src/pages/page.astro', 'self');
4040
export default $$Page;
4141
```

internal/printer/__printer_js__/transition_persist_uses_transition_name_if_defined.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import "transitions.css";
3333
3434
export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
3535
36-
const $$Component = $$createComponent(async ($$result, $$props, $$slots) => {
36+
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
3737
38-
return $$render`${$$maybeRenderHead($$result)}<div data-astro-transition-persist="foo"${$$addAttribute(await $$renderTransition($$result, "peuy4xf7", "", "foo"), "data-astro-transition-scope")}></div>`;
38+
return $$render`${$$maybeRenderHead($$result)}<div data-astro-transition-persist="foo"${$$addAttribute($$renderTransition($$result, "peuy4xf7", "", "foo"), "data-astro-transition-scope")}></div>`;
3939
}, undefined, 'self');
4040
export default $$Component;
4141
```

internal/printer/printer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (p *printer) addTSXStyle(start int, end int, content string, styleType stri
108108
func (p *printer) getAsyncFuncPrefix() string {
109109
// Decide whether to print `async` if top-level await is used. Use a loose check for now.
110110
funcPrefix := ""
111-
if strings.Contains(p.sourcetext, "await") || strings.Contains(p.sourcetext, "transition:name") || strings.Contains(p.sourcetext, "transition:animate") {
111+
if strings.Contains(p.sourcetext, "await") {
112112
funcPrefix = "async "
113113
}
114114
return funcPrefix
@@ -569,7 +569,7 @@ func maybeConvertTransition(n *astro.Node) {
569569

570570
n.Attr = append(n.Attr, astro.Attribute{
571571
Key: "data-astro-transition-scope",
572-
Val: fmt.Sprintf(`await %s(%s, "%s", %s, %s)`, RENDER_TRANSITION, RESULT, n.TransitionScope, animationExpr, transitionExpr),
572+
Val: fmt.Sprintf(`%s(%s, "%s", %s, %s)`, RENDER_TRANSITION, RESULT, n.TransitionScope, animationExpr, transitionExpr),
573573
Type: astro.ExpressionAttribute,
574574
})
575575
}

0 commit comments

Comments
 (0)