Skip to content

build: add return types for component stylesheet bundler #28746

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
Oct 30, 2024
Merged

build: add return types for component stylesheet bundler #28746

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
17 changes: 13 additions & 4 deletions packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ import {
createStylesheetBundleOptions,
} from '../stylesheets/bundle-options';

export type ComponentStylesheetResult = BundleContextResult & {
contents: string;
referencedFiles: Set<string> | undefined;
};

/**
* Bundles component stylesheets. A stylesheet can be either an inline stylesheet that
* is contained within the Component's metadata definition or an external file referenced
Expand Down Expand Up @@ -48,7 +53,11 @@ export class ComponentStylesheetBundler {
* @param direct If true, the output will be used directly by the builder; false if used inside the compiler plugin.
* @returns A component bundle result object.
*/
async bundleFile(entry: string, externalId?: string | boolean, direct?: boolean) {
async bundleFile(
entry: string,
externalId?: string | boolean,
direct?: boolean,
): Promise<ComponentStylesheetResult> {
const bundlerContext = await this.#fileContexts.getOrCreate(entry, () => {
return new BundlerContext(this.options.workspaceRoot, this.incremental, (loadCache) => {
const buildOptions = createStylesheetBundleOptions(this.options, loadCache);
Expand Down Expand Up @@ -82,7 +91,7 @@ export class ComponentStylesheetBundler {
filename: string,
language = this.defaultInlineLanguage,
externalId?: string,
) {
): Promise<ComponentStylesheetResult> {
// Use a hash of the inline stylesheet content to ensure a consistent identifier. External stylesheets will resolve
// to the actual stylesheet file path.
// TODO: Consider xxhash instead for hashing
Expand Down Expand Up @@ -191,13 +200,13 @@ export class ComponentStylesheetBundler {
referencedFiles: Set<string> | undefined,
external: boolean,
direct: boolean,
) {
): ComponentStylesheetResult {
let contents = '';
const outputFiles: BuildOutputFile[] = [];

const { errors, warnings } = result;
if (errors) {
return { errors, warnings, referencedFiles };
return { errors, warnings, referencedFiles, contents: '' };
}

for (const outputFile of result.outputFiles) {
Expand Down