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

remove the white space after the doctype according to the property co… (#7242)

Browse source
This commit is contained in:
Jerry_wu 2023-06-05 16:02:04 +08:00 committed by GitHub
parent ef410fa30b
commit 890a2bc989
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/tasty-stingrays-smile.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
remove the white space after the doctype according to the property compressHTML

4
packages/astro/src/core/build/generate.ts
View file

@ -506,11 +506,11 @@ async function generatePath(
onRequest as MiddlewareResponseHandler,
apiContext,
() => {
return renderPage({ mod, renderContext, env, apiContext });
return renderPage({ mod, renderContext, env, apiContext, isCompressHTML: settings.config.compressHTML });
}
);
} else {
response = await renderPage({ mod, renderContext, env, apiContext });
response = await renderPage({ mod, renderContext, env, apiContext, isCompressHTML: settings.config.compressHTML });
}
} catch (err) {
if (!AstroError.is(err) && !(err as SSRError).id && typeof err === 'object') {

4
packages/astro/src/core/render/core.ts
View file

@ -108,9 +108,10 @@ export type RenderPage = {
renderContext: RenderContext;
env: Environment;
apiContext?: APIContext;
isCompressHTML?: boolean
};
export async function renderPage({ mod, renderContext, env, apiContext }: RenderPage) {
export async function renderPage({ mod, renderContext, env, apiContext, isCompressHTML = false }: RenderPage) {
// Validate the page component before rendering the page
const Component = mod.default;
if (!Component)
@ -152,6 +153,7 @@ export async function renderPage({ mod, renderContext, env, apiContext }: Render
renderContext.props,
null,
env.streaming,
isCompressHTML,
renderContext.route
);

10
packages/astro/src/runtime/server/render/page.ts
View file

@ -30,6 +30,7 @@ function nonAstroPageNeedsHeadInjection(pageComponent: NonAstroPageComponent): b
async function iterableToHTMLBytes(
result: SSRResult,
iterable: ComponentIterable,
isCompressHTML: boolean,
onDocTypeInjection?: (parts: HTMLParts) => Promise<void>
): Promise<Uint8Array> {
const parts = new HTMLParts();
@ -39,7 +40,7 @@ async function iterableToHTMLBytes(
if (i === 0) {
i++;
if (!/<!doctype html/i.test(String(chunk))) {
parts.append('<!DOCTYPE html>\n', result);
parts.append(`${isCompressHTML ? '<!DOCTYPE html>' : '<!DOCTYPE html>\n'}`, result);
if (onDocTypeInjection) {
await onDocTypeInjection(parts);
}
@ -73,6 +74,7 @@ export async function renderPage(
props: any,
children: any,
streaming: boolean,
isCompressHTML: boolean,
route?: RouteData | undefined
): Promise<Response> {
if (!isAstroComponentFactory(componentFactory)) {
@ -113,7 +115,7 @@ export async function renderPage(
}
// Accumulate the HTML string and append the head if necessary.
const bytes = await iterableToHTMLBytes(result, output, async (parts) => {
const bytes = await iterableToHTMLBytes(result, output, isCompressHTML, async (parts) => {
parts.append(head, result);
});
@ -152,7 +154,7 @@ export async function renderPage(
if (isHTMLString(chunk)) {
if (i === 0) {
if (!/<!doctype html/i.test(String(chunk))) {
controller.enqueue(encoder.encode('<!DOCTYPE html>\n'));
controller.enqueue(encoder.encode(`${isCompressHTML ? '<!DOCTYPE html>' : '<!DOCTYPE html>\n'}`));
}
}
}
@ -187,7 +189,7 @@ export async function renderPage(
},
});
} else {
body = await iterableToHTMLBytes(result, iterable);
body = await iterableToHTMLBytes(result, iterable, isCompressHTML);
headers.set('Content-Length', body.byteLength.toString());
}

4
packages/astro/test/minification-html.test.js
View file

@ -5,7 +5,7 @@ import testAdapter from './test-adapter.js';
const NEW_LINES = /[\r\n]+/gm;
/**
* The doctype declaration is on a line between the rest of the HTML.
* The doctype declaration is on a line between the rest of the HTML in SSG.
* This function removes the doctype so that we can check if the rest of the HTML is without
* whitespace.
*/
@ -53,7 +53,7 @@ describe('HTML minification', () => {
it('should emit compressed HTML in the emitted file', async () => {
const html = await fixture.readFile('/index.html');
expect(NEW_LINES.test(removeDoctypeLine(html))).to.equal(false);
expect(NEW_LINES.test(html)).to.equal(false);
});
});