Skip to content
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

Jump to bottom

Fixed component rerendering if there's only one renderer (framework components) #12131

Open
wants to merge 12 commits into
base: next
Choose a base branch
from
Open

Fixed component rerendering if there's only one renderer (framework components) #12131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9fba90
Fix component rerenders if there's only one renderer
elite174 Oct 6, 2024
0a834a5
Try valid renderers
elite174 Oct 6, 2024
dbf8b24
Check tests
elite174 Oct 6, 2024
9be548c
Fix rerenders only for solid
elite174 Oct 6, 2024
da70fb2
Added tests for solid
elite174 Oct 6, 2024
d89706c
Try to fix `solid` renderer when there are many
elite174 Oct 7, 2024
b24c2b3
Renamed variable
elite174 Oct 7, 2024
d2851c9
Removed possible fix
elite174 Oct 7, 2024
68e0746
Try to fix all for all the frameworks
elite174 Oct 8, 2024
834a01b
Ensure check is still called
matthewp Oct 9, 2024
bf8d7d5
Merge branch 'next' into fix-multiple-component-rerenders
elite174 Oct 11, 2024
1cf5bab
Remove renderer check call if there's only one renderer
elite174 Oct 11, 2024
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
33 changes: 20 additions & 13 deletions packages/astro/src/runtime/server/render/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,29 @@ async function renderFrameworkComponent(
}

if (!renderer) {
let error;
for (const r of renderers) {
try {
if (await r.ssr.check.call({ result }, Component, props, children)) {
renderer = r;
break;
// If there's only one renderer in the project
// we can skip the `check` calls and use that renderer
if (renderers.length === 1) {
renderer = renderers[0];
} else {
let error;

for (const r of renderers) {
try {
if (await r.ssr.check.call({ result }, Component, props, children)) {
renderer = r;
break;
}
} catch (e) {
error ??= e;
}
} catch (e) {
error ??= e;
}
}

// If no renderer is found and there is an error, throw that error because
// it is likely a problem with the component code.
if (!renderer && error) {
throw error;
// If no renderer is found and there is an error, throw that error because
// it is likely a problem with the component code.
if (!renderer && error) {
throw error;
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions packages/astro/test/fixtures/solid-component/src/components/RenderCount.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
let count = 1;

export default function RenderCount() {
return (
<>
<div id="render-count">{count++}</div>
</>
);
}
2 changes: 2 additions & 0 deletions packages/astro/test/fixtures/solid-component/src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Counter as DepCounter } from '@test/solid-jsx-component';
import Hello from '../components/Hello.jsx';
import ProxyComponent from '../components/ProxyComponent.jsx';
import WithNewlines from '../components/WithNewlines.jsx';
import RenderCount from '../components/RenderCount.jsx';
---
<html>
<head><title>Solid</title></head>
Expand All @@ -14,6 +15,7 @@ import WithNewlines from '../components/WithNewlines.jsx';
<Router />
<ProxyComponent client:load />
<DepCounter client:load />
<RenderCount client:load />
</div>
</body>
</html>
7 changes: 7 additions & 0 deletions packages/astro/test/solid-component.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ describe.skip('Solid component build', { todo: 'Check why an error is thrown.' }
assert.equal($('#proxy-component').text(), 'Hello world');
});

it('Renders the component only once on the server', async () => {
const html = await fixture.readFile('/index.html');
const $ = cheerio.load(html);

assert.equal($('#render-count').text(), '1');
});

// ssr-client-none.astro
it('Supports server only components', async () => {
const html = await fixture.readFile('ssr-client-none/index.html');
Expand Down
Loading