Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-23 21:53:55 -05:00
Code Issues Activity

fix(astro/core): Do not add base to hoisted script body (#5720)

Browse source 
* fix(astro/core): Do not add base to hoisted script body

* fix(astro/core): Add base path to hoisted .js files only

* fix(astro/core): undo style changes
This commit is contained in:
Muzafar Umarov 2023-01-03 08:59:05 -05:00 committed by GitHub
parent c2844a79c8
commit fe316be86f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/good-carpets-confess.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Do not add base path to a hoisted script body

6
packages/astro/src/core/build/vite-plugin-ssr.ts
View file

@ -44,9 +44,7 @@ const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
renderers: _main.renderers
});
const _args = ${adapter.args ? JSON.stringify(adapter.args) : 'undefined'};
export * from '${pagesVirtualModuleId}';
${
adapter.exports
? `const _exports = adapter.createExports(_manifest, _args);
@ -165,9 +163,11 @@ function buildManifest(
for (const pageData of eachServerPageData(internals)) {
const scripts: SerializedRouteInfo['scripts'] = [];
if (pageData.hoistedScript) {
const hoistedValue = pageData.hoistedScript.value
const value = hoistedValue.endsWith('.js') ? joinBase(hoistedValue) : hoistedValue
scripts.unshift(
Object.assign({}, pageData.hoistedScript, {
value: joinBase(pageData.hoistedScript.value),
value,
})
);
}

20
packages/astro/test/ssr-hoisted-script.test.js
View file

@ -29,4 +29,24 @@ describe('Hoisted scripts in SSR', () => {
const $ = cheerioLoad(html);
expect($('script').length).to.equal(1);
});
describe('base path', () => {
const base = '/hello';
before(async () => {
fixture = await loadFixture({
root: './fixtures/ssr-hoisted-script/',
output: 'server',
adapter: testAdapter(),
base,
});
await fixture.build();
});
it('Inlined scripts get included without base path in the script', async () => {
const html = await fetchHTML('/hello/');
const $ = cheerioLoad(html);
expect($('script').html()).to.equal('console.log("hello world");\n');
});
});
});