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

Retain client scripts in content cache #11170

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Retain client scripts in content cache #11170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a36eb05
Retain client scripts in content cache
matthewp May 31, 2024
e38edeb
Add test
matthewp May 31, 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
5 changes: 5 additions & 0 deletions .changeset/wicked-dragons-draw.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Retain client scripts in content cache
1 change: 1 addition & 0 deletions packages/astro/src/core/build/plugins/plugin-content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ function vitePluginContent(
...oldManifest.clientEntries,
...internals.discoveredHydratedComponents.keys(),
...internals.discoveredClientOnlyComponents.keys(),
...internals.discoveredScripts
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also want to handle rendererClientEntrypoints like here:

astro/packages/astro/src/core/build/static-build.ts

Lines 92 to 98 in ff8004f

const clientInput = new Set([
...internals.cachedClientEntries,
...internals.discoveredHydratedComponents.keys(),
...internals.discoveredClientOnlyComponents.keys(),
...rendererClientEntrypoints,
...internals.discoveredScripts,
]);

Or some way to share the input values.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't because those always get built, it's not something that's discovered from the server build the way that hydration scripts are.

]);
// Likewise, these are server modules that might not be referenced
// once the cached items are excluded from the build process
Expand Down
15 changes: 15 additions & 0 deletions packages/astro/test/experimental-content-collections-render.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,21 @@ if (!isWindows) {
const files = await fixture.readdir('');
assert.equal(files.includes('chunks'), false, 'chunks folder removed');
});

it('hoisted script is built', async () => {
const html = await fixture.readFile('/launch-week-component-scripts/index.html');
const $ = cheerio.load(html);

const allScripts = $('head > script[type="module"]');
assert.ok(allScripts.length > 0);

// Includes hoisted script
assert.notEqual(
[...allScripts].find((script) => $(script).attr('src')?.includes('/_astro/WithScripts')),
undefined,
'hoisted script missing from head.'
);
});
});
});
});
Expand Down
Loading