Skip to content

fix(@schematics/angular): use null objects and callbacks in karma-to-vitest migration #33309

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
+13 −5
Open

fix(@schematics/angular): use null objects and callbacks in karma-to-vitest migration #33309

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
2 changes: 1 addition & 1 deletion packages/schematics/angular/migrations/migrate-karma-to-vitest/karma-config-analyzer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export function analyzeKarmaConfig(content: string): KarmaConfigAnalysis {
case ts.SyntaxKind.ArrayLiteralExpression:
return (node as ts.ArrayLiteralExpression).elements.map(extractValue);
case ts.SyntaxKind.ObjectLiteralExpression: {
const obj: { [key: string]: KarmaConfigValue } = {};
const obj: { [key: string]: KarmaConfigValue } = Object.create(null);
for (const prop of (node as ts.ObjectLiteralExpression).properties) {
if (isSupportedPropertyAssignment(prop)) {
// Recursively extract values for nested objects.
Expand Down
5 changes: 2 additions & 3 deletions packages/schematics/angular/migrations/migrate-karma-to-vitest/karma-config-comparer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ export async function generateDefaultKarmaConfig(

// TODO: Replace this with the actual schematic templating logic.
template = template
.replace(
/<%= relativePathToWorkspaceRoot %>/g,
.replace(/<%= relativePathToWorkspaceRoot %>/g, () =>
path.normalize(relativePathToWorkspaceRoot).replace(/\\/g, '/'),
)
.replace(/<%= folderName %>/g, projectName);
.replace(/<%= folderName %>/g, () => projectName);

const devkitPluginRegex = /<% if \(needDevkitPlugin\) { %>(.*?)<% } %>/gs;
const replacement = needDevkitPlugin ? '$1' : '';
Expand Down
11 changes: 10 additions & 1 deletion packages/schematics/angular/migrations/migrate-karma-to-vitest/migration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ async function processTestTargetOptions(
let needsIstanbul = false;
for (const [configName, options] of allTargetOptions(testTarget, false)) {
const configKey = configName || '';
if (configKey === '__proto__' || configKey === 'constructor') {
continue;
}
if (!customBuildOptions[configKey]) {
// Match Karma behavior where AOT was disabled by default
customBuildOptions[configKey] = {
Expand Down Expand Up @@ -276,7 +279,10 @@ function updateProjects(tree: Tree, context: SchematicContext): Rule {
tsConfigsToUpdate.add(join(project.root, 'tsconfig.spec.json'));

// Store custom build options to move to a new build configuration if needed
const customBuildOptions: Record<string, Record<string, json.JsonValue | undefined>> = {};
const customBuildOptions: Record<
string,
Record<string, json.JsonValue | undefined>
> = Object.create(null);
Comment thread
clydin marked this conversation as resolved.

const projectCoverageInfo = await processTestTargetOptions(
testTarget,
Expand All @@ -300,6 +306,9 @@ function updateProjects(tree: Tree, context: SchematicContext): Rule {
const baseOptions = buildTarget.options || {};

for (const [configKey, configOptions] of Object.entries(customBuildOptions)) {
if (configKey === '__proto__' || configKey === 'constructor') {
continue;
}
const finalConfig: Record<string, json.JsonValue | undefined> = {};

// Omit options that already have the same value in the base build options.
Expand Down
Loading