Skip to content

fix(@angular/build): handle loaders correctly in SSR bundles for external packages #29304

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
merged 1 commit into from
Jan 9, 2025
Merged

fix(@angular/build): handle loaders correctly in SSR bundles for external packages #29304

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
57 changes: 33 additions & 24 deletions packages/angular/build/src/tools/esbuild/application-code-bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,7 @@ export function createBrowserCodeBundleOptions(
buildOptions.plugins?.push(...options.plugins);
}

if (options.externalPackages) {
// Package files affected by a customized loader should not be implicitly marked as external
if (
options.loaderExtensions ||
options.plugins ||
typeof options.externalPackages === 'object'
) {
// Plugin must be added after custom plugins to ensure any added loader options are considered
buildOptions.plugins?.push(
createExternalPackagesPlugin(
options.externalPackages !== true ? options.externalPackages : undefined,
),
);
} else {
// Safe to use the packages external option directly
buildOptions.packages = 'external';
}
}
appendOptionsForExternalPackages(options, buildOptions);

return buildOptions;
};
Expand Down Expand Up @@ -302,9 +285,7 @@ export function createServerMainCodeBundleOptions(

buildOptions.plugins ??= [];

if (externalPackages) {
buildOptions.packages = 'external';
} else {
if (!externalPackages) {
buildOptions.plugins.push(createRxjsEsmResolutionPlugin());
}

Expand Down Expand Up @@ -381,6 +362,8 @@ export function createServerMainCodeBundleOptions(
buildOptions.plugins.push(...options.plugins);
}

appendOptionsForExternalPackages(options, buildOptions);

return buildOptions;
};
}
Expand Down Expand Up @@ -442,9 +425,7 @@ export function createSsrEntryCodeBundleOptions(

buildOptions.plugins ??= [];

if (externalPackages) {
buildOptions.packages = 'external';
} else {
if (!externalPackages) {
buildOptions.plugins.push(createRxjsEsmResolutionPlugin());
}

Expand Down Expand Up @@ -516,6 +497,8 @@ export function createSsrEntryCodeBundleOptions(
buildOptions.plugins.push(...options.plugins);
}

appendOptionsForExternalPackages(options, buildOptions);

return buildOptions;
};
}
Expand Down Expand Up @@ -721,3 +704,29 @@ function entryFileToWorkspaceRelative(workspaceRoot: string, entryFile: string):
.replace(/\\/g, '/')
);
}

function appendOptionsForExternalPackages(
options: NormalizedApplicationBuildOptions,
buildOptions: BuildOptions,
): void {
if (!options.externalPackages) {
return;
}

buildOptions.plugins ??= [];

// Package files affected by a customized loader should not be implicitly marked as external
if (options.loaderExtensions || options.plugins || typeof options.externalPackages === 'object') {
// Plugin must be added after custom plugins to ensure any added loader options are considered
buildOptions.plugins.push(
createExternalPackagesPlugin(
options.externalPackages !== true ? options.externalPackages : undefined,
),
);

buildOptions.packages = undefined;
} else {
// Safe to use the packages external option directly
buildOptions.packages = 'external';
}
}
Loading