Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 11:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/ssr): apply HTML transformation to CSR responses

Browse Source 
Before this commit, HTML transformations were not applied to CSR responses, leading to the omission of the Vite client code.

Closes #29033
This commit is contained in:
Alan Agius 2024-12-04 09:09:33 +00:00 committed by Alan Agius
parent f2571b3251
commit f897b7a7f1
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/angular/ssr/src/app.ts
View File

@ -25,12 +25,7 @@ import { InlineCriticalCssProcessor } from './utils/inline-critical-css';
import { LRUCache } from './utils/lru-cache'; import { LRUCache } from './utils/lru-cache';
import { AngularBootstrap, renderAngular } from './utils/ng'; import { AngularBootstrap, renderAngular } from './utils/ng';
import { promiseWithAbort } from './utils/promise'; import { promiseWithAbort } from './utils/promise';
import { import { buildPathWithParams, joinUrlParts, stripLeadingSlash } from './utils/url';
buildPathWithParams,
joinUrlParts,
stripIndexHtmlFromURL,
stripLeadingSlash,
} from './utils/url';
/** /**
* Maximum number of critical CSS entries the cache can store. * Maximum number of critical CSS entries the cache can store.
@ -256,6 +251,7 @@ export class AngularServerApp {
return null; return null;
} }
const url = new URL(request.url);
const platformProviders: StaticProvider[] = []; const platformProviders: StaticProvider[] = [];
// Initialize the response with status and headers if available. // Initialize the response with status and headers if available.
@ -285,7 +281,10 @@ export class AngularServerApp {
); );
} else if (renderMode === RenderMode.Client) { } else if (renderMode === RenderMode.Client) {
// Serve the client-side rendered version if the route is configured for CSR. // Serve the client-side rendered version if the route is configured for CSR.
return new Response(await this.assets.getServerAsset('index.csr.html').text(), responseInit); let html = await this.assets.getServerAsset('index.csr.html').text();
html = await this.runTransformsOnHtml(html, url);
return new Response(html, responseInit);
} }
const { const {
@ -301,16 +300,9 @@ export class AngularServerApp {
}); });
} }
const url = new URL(request.url);
let html = await assets.getIndexServerHtml().text();
// Skip extra microtask if there are no pre hooks.
if (hooks.has('html:transform:pre')) {
html = await hooks.run('html:transform:pre', { html, url });
}
this.boostrap ??= await bootstrap(); this.boostrap ??= await bootstrap();
let html = await assets.getIndexServerHtml().text();
html = await this.runTransformsOnHtml(html, url);
html = await renderAngular( html = await renderAngular(
html, html,
this.boostrap, this.boostrap,
@ -381,6 +373,21 @@ export class AngularServerApp {
return stripLeadingSlash(assetPath); return stripLeadingSlash(assetPath);
} }
/**
* Runs the registered transform hooks on the given HTML content.
*
* @param html - The raw HTML content to be transformed.
* @param url - The URL associated with the HTML content, used for context during transformations.
* @returns A promise that resolves to the transformed HTML string.
*/
private async runTransformsOnHtml(html: string, url: URL): Promise<string> {
if (this.hooks.has('html:transform:pre')) {
html = await this.hooks.run('html:transform:pre', { html, url });
}
return html;
}
} }
let angularServerApp: AngularServerApp | undefined; let angularServerApp: AngularServerApp | undefined;