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

fix(hoisted scripts): consider script's dependents (#7144)

Browse source
This commit is contained in:
Arsh 2023-05-22 18:45:21 +05:30 committed by GitHub
parent 49bfeacdec
commit ba06362409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/perfect-oranges-tease.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixed an issue where scripts that weren't safe to inline were inlined.

71
packages/astro/src/core/build/plugins/plugin-hoisted-scripts.ts
View file

@ -4,7 +4,7 @@ import { viteID } from '../../util.js';
import type { BuildInternals } from '../internal.js'; import type { BuildInternals } from '../internal.js';
import { getPageDataByViteID } from '../internal.js'; import { getPageDataByViteID } from '../internal.js';
import type { AstroBuildPlugin } from '../plugin'; import type { AstroBuildPlugin } from '../plugin';
import type { StaticBuildOptions } from '../types'; import type { OutputChunk, StaticBuildOptions } from '../types';
function virtualHoistedEntry(id: string) { function virtualHoistedEntry(id: string) {
return id.startsWith('/astro/hoisted.js?q='); return id.startsWith('/astro/hoisted.js?q=');
@ -50,46 +50,55 @@ export function vitePluginHoistedScripts(
assetInlineLimit = settings.config.vite?.build.assetsInlineLimit; assetInlineLimit = settings.config.vite?.build.assetsInlineLimit;
} }
const considerInlining = new Map<string, OutputChunk>();
const importedByOtherScripts = new Set<string>();
// Find all page entry points and create a map of the entry point to the hashed hoisted script. // Find all page entry points and create a map of the entry point to the hashed hoisted script.
// This is used when we render so that we can add the script to the head. // This is used when we render so that we can add the script to the head.
for (const [id, output] of Object.entries(bundle)) { Object.entries(bundle).forEach(([ id, output ]) => {
if ( if (
output.type === 'chunk' && output.type === 'chunk' &&
output.facadeModuleId && output.facadeModuleId &&
virtualHoistedEntry(output.facadeModuleId) virtualHoistedEntry(output.facadeModuleId)
) { ) {
const canBeInlined = considerInlining.set(id, output);
output.imports.length === 0 && output.imports.forEach(imported => importedByOtherScripts.add(imported));
output.dynamicImports.length === 0 && }
Buffer.byteLength(output.code) <= assetInlineLimit; });
let removeFromBundle = false;
const facadeId = output.facadeModuleId!; for (const [ id, output ] of considerInlining.entries()) {
const pages = internals.hoistedScriptIdToPagesMap.get(facadeId)!; const canBeInlined =
for (const pathname of pages) { importedByOtherScripts.has(output.fileName) === false &&
const vid = viteID(new URL('.' + pathname, settings.config.root)); output.imports.length === 0 &&
const pageInfo = getPageDataByViteID(internals, vid); output.dynamicImports.length === 0 &&
if (pageInfo) { Buffer.byteLength(output.code) <= assetInlineLimit;
if (canBeInlined) { let removeFromBundle = false;
pageInfo.hoistedScript = { const facadeId = output.facadeModuleId!;
type: 'inline', const pages = internals.hoistedScriptIdToPagesMap.get(facadeId)!;
value: output.code, for (const pathname of pages) {
}; const vid = viteID(new URL('.' + pathname, settings.config.root));
removeFromBundle = true; const pageInfo = getPageDataByViteID(internals, vid);
} else { if (pageInfo) {
pageInfo.hoistedScript = { if (canBeInlined) {
type: 'external', pageInfo.hoistedScript = {
value: id, type: 'inline',
}; value: output.code,
} };
removeFromBundle = true;
} else {
pageInfo.hoistedScript = {
type: 'external',
value: id,
};
} }
} }
// Remove the bundle if it was inlined
if (removeFromBundle) {
delete bundle[id];
}
} }
}
// Remove the bundle if it was inlined
if (removeFromBundle) {
delete bundle[id];
}
};
}, },
}; };
} }