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

[ci] format

Browse source
This commit is contained in:
matthewp 2023-07-27 18:44:29 +00:00 committed by astrobot-houston
parent 7dbcbc86b3
commit 9fe1089e3e
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/astro/src/content/runtime.ts
View file

@ -6,8 +6,8 @@ import {
createComponent, createComponent,
createHeadAndContent, createHeadAndContent,
renderComponent, renderComponent,
renderUniqueScriptElement,
renderTemplate, renderTemplate,
renderUniqueScriptElement,
renderUniqueStylesheet, renderUniqueStylesheet,
unescapeHTML, unescapeHTML,
type AstroComponentFactory, type AstroComponentFactory,
@ -303,7 +303,9 @@ async function render({
.join(''); .join('');
} }
if (Array.isArray(collectedScripts)) { if (Array.isArray(collectedScripts)) {
scripts = collectedScripts.map((script: any) => renderUniqueScriptElement(result, script)).join(''); scripts = collectedScripts
.map((script: any) => renderUniqueScriptElement(result, script))
.join('');
} }
let props = baseProps; let props = baseProps;

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

@ -27,8 +27,8 @@ export {
renderSlotToString, renderSlotToString,
renderTemplate, renderTemplate,
renderToString, renderToString,
renderUniqueStylesheet,
renderUniqueScriptElement, renderUniqueScriptElement,
renderUniqueStylesheet,
voidElementNames, voidElementNames,
} from './render/index.js'; } from './render/index.js';
export type { export type {

12
packages/astro/src/runtime/server/render/tags.ts
View file

@ -10,16 +10,18 @@ export function renderScriptElement({ props, children }: SSRElement) {
} }
export function renderUniqueScriptElement(result: SSRResult, { props, children }: SSRElement) { export function renderUniqueScriptElement(result: SSRResult, { props, children }: SSRElement) {
if(Array.from(result.scripts).some(s => { if (
Array.from(result.scripts).some((s) => {
if (s.props.type === props.type && s.props.src === props.src) { if (s.props.type === props.type && s.props.src === props.src) {
return true; return true;
} }
if (!props.src && s.children === children) return true; if (!props.src && s.children === children) return true;
})) return ''; })
)
return '';
const key = `script-${props.type}-${props.src}-${children}`; const key = `script-${props.type}-${props.src}-${children}`;
if (checkOrAddContentKey(result, key)) return ''; if (checkOrAddContentKey(result, key)) return '';
return renderScriptElement({ props, children }); return renderScriptElement({ props, children });
} }
export function renderUniqueStylesheet(result: SSRResult, sheet: StylesheetAsset) { export function renderUniqueStylesheet(result: SSRResult, sheet: StylesheetAsset) {
@ -30,9 +32,9 @@ export function renderUniqueStylesheet(result: SSRResult, sheet: StylesheetAsset
return renderElement('link', { return renderElement('link', {
props: { props: {
rel: 'stylesheet', rel: 'stylesheet',
href: sheet.src href: sheet.src,
}, },
children: '' children: '',
}); });
} }