Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion goldens/public-api/angular/build/index.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export type NgPackagrBuilderOptions = {
// @public
export type UnitTestBuilderOptions = {
browsers?: string[];
buildTarget: string;
buildTarget?: string;
coverage?: boolean;
coverageAll?: boolean;
coverageExclude?: string[];
Expand Down
20 changes: 15 additions & 5 deletions packages/angular/build/src/builders/unit-test/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,22 @@ export async function* execute(
// Get base build options from the buildTarget
let buildTargetOptions: ApplicationBuilderInternalOptions;
try {
const builderName = await context.getBuilderNameForTarget(normalizedOptions.buildTarget);
if (
builderName !== '@angular/build:application' &&
// TODO: Add comprehensive support for ng-packagr.
builderName !== '@angular/build:ng-packagr'
) {
context.logger.warn(
`The 'buildTarget' is configured to use '${builderName}', which is not supported. ` +
`The 'unit-test' builder is designed to work with '@angular/build:application'. ` +
'Unexpected behavior or build failures may occur.',
);
}

buildTargetOptions = (await context.validateOptions(
await context.getTargetOptions(normalizedOptions.buildTarget),
await context.getBuilderNameForTarget(normalizedOptions.buildTarget),
builderName,
)) as unknown as ApplicationBuilderInternalOptions;
} catch (e) {
assertIsError(e);
Expand Down Expand Up @@ -297,12 +310,9 @@ export async function* execute(
...runnerBuildOptions,
watch: normalizedOptions.watch,
progress: normalizedOptions.buildProgress ?? buildTargetOptions.progress,
...(normalizedOptions.tsConfig ? { tsConfig: normalizedOptions.tsConfig } : {}),
} satisfies ApplicationBuilderInternalOptions;

if (normalizedOptions.tsConfig) {
applicationBuildOptions.tsConfig = normalizedOptions.tsConfig;
}

const dumpDirectory = normalizedOptions.dumpVirtualFiles
? path.join(normalizedOptions.cacheOptions.path, 'unit-test', 'output-files')
: undefined;
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/build/src/builders/unit-test/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"properties": {
"buildTarget": {
"type": "string",
"description": "Specifies the build target to use for the unit test build in the format `project:target[:configuration]`. You can also pass a comma-separated list of configurations. Example: `project:target:production,staging`.",
"description": "Specifies the build target to use for the unit test build in the format `project:target[:configuration]`. This defaults to the `build` target of the current project with the `development` configuration. You can also pass a comma-separated list of configurations. Example: `project:target:production,staging`.",
"pattern": "^[^:\\s]*:[^:\\s]*(:[^\\s]+)?$"
},
"tsConfig": {
Expand Down Expand Up @@ -262,5 +262,5 @@
}
},
"additionalProperties": false,
"required": ["buildTarget", "runner"]
"required": ["runner"]
}