Skip to content

fix(@angular-devkit/build-angular): clean up internal Angular state during rendering SSR #25927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-agius4 merged 1 commit into from
Sep 29, 2023
Merged

fix(@angular-devkit/build-angular): clean up internal Angular state during rendering SSR #25927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/angular_devkit/build_angular/src/tools/esbuild/application-code-bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,15 @@ export function createServerCodeBundleOptions(
target: string[],
sourceFileCache: SourceFileCache,
): BuildOptions {
const { jit, serverEntryPoint, workspaceRoot, ssrOptions } = options;
const {
jit,
serverEntryPoint,
workspaceRoot,
ssrOptions,
watch,
externalPackages,
prerenderOptions,
} = options;

assert(
serverEntryPoint,
Expand Down Expand Up @@ -194,7 +202,7 @@ export function createServerCodeBundleOptions(
};

buildOptions.plugins ??= [];
if (options.externalPackages) {
if (externalPackages) {
buildOptions.packages = 'external';
} else {
buildOptions.plugins.push(createRxjsEsmResolutionPlugin());
Expand Down Expand Up @@ -225,7 +233,11 @@ export function createServerCodeBundleOptions(
`export { renderApplication, renderModule, ɵSERVER_CONTEXT } from '@angular/platform-server';`,
];

if (options.prerenderOptions?.discoverRoutes) {
if (watch) {
contents.push(`export { ɵresetCompiledComponents } from '@angular/core';`);
}

if (prerenderOptions?.discoverRoutes) {
// We do not import it directly so that node.js modules are resolved using the correct context.
const routesExtractorCode = await readFile(
join(__dirname, '../../utils/routes-extractor/extractor.js'),
Expand Down
2 changes: 2 additions & 0 deletions packages/angular_devkit/build_angular/src/utils/server-rendering/main-bundle-exports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ export interface MainServerBundleExports {

/** Method to extract routes from the router config. */
extractRoutes: typeof extractRoutes;

ɵresetCompiledComponents?: () => void;
}
6 changes: 6 additions & 0 deletions packages/angular_devkit/build_angular/src/utils/server-rendering/render-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ export async function renderPage({
ɵSERVER_CONTEXT,
renderModule,
renderApplication,
ɵresetCompiledComponents,
} = await loadBundle('./main.server.mjs');

// Need to clean up GENERATED_COMP_IDS map in `@angular/core`.
// Otherwise an incorrect component ID generation collision detected warning will be displayed in development.
// See: https://github.com/angular/angular-cli/issues/25924
ɵresetCompiledComponents?.();

const platformProviders: StaticProvider[] = [
{
provide: ɵSERVER_CONTEXT,
Expand Down