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

Fix mixed usage of aliases and relative for client hydration (#6168)

Browse source 
* Fix mixed usgae of aliases and relative for client hydration

* Add a changeset
This commit is contained in:
Matthew Phillips 2023-02-07 16:24:05 -05:00 • committed by GitHub
parent 92dcf81c17
commit c0e4b1df9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/dull-olives-greet.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix mixed usage of aliases and relative for client hydration

14
packages/astro/src/core/build/plugins/plugin-internals.ts
View file

@ -34,12 +34,16 @@ export function vitePluginInternals(input: Set<string>, internals: BuildInternal
async generateBundle(_options, bundle) { async generateBundle(_options, bundle) {
const promises = []; const promises = [];
const mapping = new Map<string, string>(); const mapping = new Map<string, Set<string>>();
for (const specifier of input) { for (const specifier of input) {
promises.push( promises.push(
this.resolve(specifier).then((result) => { this.resolve(specifier).then((result) => {
if (result) { if (result) {
mapping.set(result.id, specifier); if(mapping.has(result.id)) {
mapping.get(result.id)!.add(specifier);
} else {
mapping.set(result.id, new Set<string>([specifier]));
}
} }
}) })
); );
@ -47,8 +51,10 @@ export function vitePluginInternals(input: Set<string>, internals: BuildInternal
await Promise.all(promises); await Promise.all(promises);
for (const [, chunk] of Object.entries(bundle)) { for (const [, chunk] of Object.entries(bundle)) {
if (chunk.type === 'chunk' && chunk.facadeModuleId) { if (chunk.type === 'chunk' && chunk.facadeModuleId) {
const specifier = mapping.get(chunk.facadeModuleId) || chunk.facadeModuleId; const specifiers = mapping.get(chunk.facadeModuleId) || new Set([chunk.facadeModuleId]);
internals.entrySpecifierToBundleMap.set(specifier, chunk.fileName); for(const specifier of specifiers) {
internals.entrySpecifierToBundleMap.set(specifier, chunk.fileName);
}
} else if (chunk.type === 'chunk') { } else if (chunk.type === 'chunk') {
for (const id of Object.keys(chunk.modules)) { for (const id of Object.keys(chunk.modules)) {
const pageData = internals.pagesByViteID.get(id); const pageData = internals.pagesByViteID.get(id);

11
packages/astro/test/alias.test.js
View file

@ -51,5 +51,16 @@ describe('Aliases', () => {
const scripts = $('script').toArray(); const scripts = $('script').toArray();
expect(scripts.length).to.be.greaterThan(0); expect(scripts.length).to.be.greaterThan(0);
}); });
it('can use aliases and relative in same project', async () => {
const html = await fixture.readFile('/two/index.html');
const $ = cheerio.load(html);
// Should render aliased element
expect($('#client').text()).to.equal('test');
const scripts = $('script').toArray();
expect(scripts.length).to.be.greaterThan(0);
});
}); });
}); });

25
packages/astro/test/fixtures/alias/src/pages/two.astro vendored Normal file
View file

@ -0,0 +1,25 @@
---
import Client from '../components/Client.svelte'
---
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width" />
<title>Svelte Client</title>
<style>
html,
body {
font-family: system-ui;
margin: 0;
}
body {
padding: 2rem;
}
</style>
</head>
<body>
<main>
<Client client:load />
</main>
</body>
</html>