Skip to content

fix(@angular/build): inherit preserveSymlinks option from build target in unit-test builder #33452

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

Open
clydin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(@angular/build): inherit preserveSymlinks option from build target in unit-test builder #33452

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
5 changes: 5 additions & 0 deletions packages/angular/build/src/builders/unit-test/builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ export async function* execute(
return;
}

// Resolve final preserveSymlinks option
normalizedOptions.preserveSymlinks =
buildTargetOptions.preserveSymlinks ?? process.execArgv.includes('--preserve-symlinks');

// Get runner-specific build options
let runnerBuildOptions;
let virtualFiles;
Expand Down Expand Up @@ -327,6 +331,7 @@ export async function* execute(
progress: normalizedOptions.buildProgress ?? buildTargetOptions.progress,
quiet: normalizedOptions.quiet,
...(normalizedOptions.tsConfig ? { tsConfig: normalizedOptions.tsConfig } : {}),
preserveSymlinks: normalizedOptions.preserveSymlinks,
} satisfies ApplicationBuilderInternalOptions;

const dumpDirectory = normalizedOptions.dumpVirtualFiles
Expand Down
1 change: 1 addition & 0 deletions packages/angular/build/src/builders/unit-test/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export async function normalizeOptions(
: [],
dumpVirtualFiles: options.dumpVirtualFiles,
listTests: options.listTests,
preserveSymlinks: undefined as boolean | undefined,
runnerConfig:
typeof runnerConfig === 'string'
? runnerConfig.length === 0
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/build/src/builders/unit-test/runners/karma/executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class KarmaExecutor implements TestExecutor {
progress: unitTestOptions.buildProgress ?? buildTargetOptions.progress,
watch: unitTestOptions.watch,
poll: buildTargetOptions.poll,
preserveSymlinks: buildTargetOptions.preserveSymlinks,
preserveSymlinks: unitTestOptions.preserveSymlinks,
browsers: unitTestOptions.browsers?.join(','),
codeCoverage: unitTestOptions.coverage.enabled,
codeCoverageExclude: unitTestOptions.coverage.exclude,
Expand Down
1 change: 1 addition & 0 deletions packages/angular/build/src/builders/unit-test/runners/vitest/executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ export class VitestExecutor implements TestExecutor {
include,
watch,
isolate: this.options.isolate,
preserveSymlinks: this.options.preserveSymlinks,
}),
],
};
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ interface VitestConfigPluginOptions {
optimizeDepsInclude: string[];
watch: boolean;
isolate: boolean | undefined;
preserveSymlinks?: boolean;
}

async function findTestEnvironment(
Expand Down Expand Up @@ -258,6 +259,7 @@ export async function createVitestConfigPlugin(
resolve: {
mainFields: ['es2020', 'module', 'main'],
conditions: ['es2015', 'es2020', 'module', ...(browser ? ['browser'] : [])],
preserveSymlinks: options.preserveSymlinks,
},
};

Expand Down
Loading