michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow passing promises to set:html (#4819)

Browse source 
* Allow passing promises to set:html

* Adding a changeset
This commit is contained in:
Matthew Phillips 2022-09-20 13:13:21 -04:00 • committed by GitHub
parent 666d98e3ec
commit 518e8f7e25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/popular-deers-grow.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Allow passing promises to set:html

10
packages/astro/src/runtime/server/escape.ts
View file

@ -29,3 +29,13 @@ export const markHTMLString = (value: any) => {
// The compiler will recursively stringify these correctly at a later stage. // The compiler will recursively stringify these correctly at a later stage.
return value; return value;
}; };
export function unescapeHTML(str: any) {
// If a promise, await the result and mark that.
if(!!str && typeof str === 'object' && typeof str.then === 'function') {
return Promise.resolve(str).then(value => {
return markHTMLString(value);
});
}
return markHTMLString(str);
}

2
packages/astro/src/runtime/server/index.ts
View file

@ -4,7 +4,7 @@ export {
escapeHTML, escapeHTML,
HTMLString, HTMLString,
markHTMLString, markHTMLString,
markHTMLString as unescapeHTML, unescapeHTML,
} from './escape.js'; } from './escape.js';
export type { Metadata } from './metadata'; export type { Metadata } from './metadata';
export { createMetadata } from './metadata.js'; export { createMetadata } from './metadata.js';

1
packages/astro/test/astro-slots.test.js
View file

@ -148,6 +148,7 @@ describe('Slots', () => {
const $ = cheerio.load(html); const $ = cheerio.load(html);
expect($('#render-args')).to.have.lengthOf(1); expect($('#render-args')).to.have.lengthOf(1);
expect($('#render-args span')).to.have.lengthOf(1);
expect($('#render-args').text()).to.equal('render-args'); expect($('#render-args').text()).to.equal('render-args');
} }
}); });

3
packages/astro/test/fixtures/astro-slots/src/components/RenderArgs.astro vendored
View file

@ -1,6 +1,5 @@
--- ---
const { id, text } = Astro.props; const { id, text } = Astro.props;
const content = await Astro.slots.render('default', [text]);
--- ---
<div id={id} set:html={content} /> <div id={id} set:html={Astro.slots.render('default', [text])} />

2
packages/astro/test/fixtures/astro-slots/src/pages/slottedapi-render.astro vendored
View file

@ -15,6 +15,6 @@ import RenderArgs from '../components/RenderArgs.astro';
<body> <body>
<Render id="render">render</Render> <Render id="render">render</Render>
<RenderFn id="render-fn">{() => "render-fn"}</RenderFn> <RenderFn id="render-fn">{() => "render-fn"}</RenderFn>
<RenderArgs id="render-args" text="render-args">{(text: string) => text}</RenderArgs> <RenderArgs id="render-args" text="render-args">{(text: string) => <span>{text}</span>}</RenderArgs>
</body> </body>
</html> </html>