Skip to content

Commit 8c58c5e

Browse files
committed
fixup! feat(@angular/build): add library builder
1 parent ba3bf52 commit 8c58c5e

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎packages/angular/build/src/builders/library/builder.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ import assert from 'node:assert';
1212
import fs from 'node:fs/promises';
1313
import { createRequire } from 'node:module';
1414
import type ts from 'typescript';
15-
import { logCumulativeDurations } from '../../tools/esbuild/profiling';
1615
import {
1716
resetSassWorkerPoolCaches,
1817
shutdownSassWorkerPool,
1918
} from '../../tools/esbuild/stylesheets/sass-language';
2019
import { transformSupportedBrowsersToTargets } from '../../tools/esbuild/target';
2120
import { withNoProgress, withSpinner } from '../../tools/esbuild/utils';
22-
import type { BuildWatcher } from '../../tools/esbuild/watcher';
2321
import { deleteOutputDir } from '../../utils/delete-output-dir';
2422
import { maxWorkers } from '../../utils/environment-options';
2523
import { assertIsError } from '../../utils/error';
2624
import { initializeHash } from '../../utils/hash';
2725
import { toPosixPath } from '../../utils/path';
26+
import { logCumulativeDurations } from '../../utils/profiling';
2827
import { purgeStaleBuildCache } from '../../utils/purge-cache';
2928
import { getSupportedBrowsers } from '../../utils/supported-browsers';
3029
import { assertCompatibleAngularVersion } from '../../utils/version';
30+
import type { BuildWatcher } from '../../utils/watcher';
3131
import { WorkerPool } from '../../utils/worker-pool';
3232
import {
3333
type NormalizedLibraryOptions,
@@ -156,7 +156,7 @@ export async function* executeLibraryBuilder(
156156
logger.info('Watch mode enabled. Watching for file changes...');
157157
}
158158

159-
const { setupWatcher } = await import('../../tools/esbuild/watcher');
159+
const { setupWatcher } = await import('../../utils/watcher');
160160
watcher = await setupWatcher({
161161
workspaceRoot,
162162
projectRoot,

‎packages/angular/build/src/builders/library/pipeline/compilation.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export async function compileEntryPoint(
145145
compilationInstance.updateLibraryOptions({ upstreamDtsPaths, upstreamDtsFiles });
146146
}
147147

148-
let stylesheetReferencedFiles: string[] = [];
148+
const stylesheetReferencedFiles: string[] = [];
149149
const stylesheetWarnings: PartialMessage[] = [];
150150
const hostOptions: AngularHostOptions = {
151151
modifiedFiles,
@@ -166,7 +166,7 @@ export async function compileEntryPoint(
166166
}
167167

168168
if (bundleReferencedFiles?.size) {
169-
stylesheetReferencedFiles = [...bundleReferencedFiles];
169+
stylesheetReferencedFiles.push(...bundleReferencedFiles);
170170
}
171171

172172
if (bundleErrors?.length) {
@@ -208,7 +208,9 @@ export async function compileEntryPoint(
208208
kind: 'warning',
209209
color: colors,
210210
});
211-
formattedWarnings = [...(formattedWarnings ?? []), ...formattedStyleWarnings];
211+
212+
formattedWarnings ??= [];
213+
formattedWarnings.push(...formattedStyleWarnings);
212214
}
213215

214216
const emittedFiles = compilationInstance.emitAffectedFiles();

0 commit comments

Comments
 (0)