Skip to content

refactor(material/schematics): support extra variables in themingApi … #22741

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
May 20, 2021
Merged

refactor(material/schematics): support extra variables in themingApi … #22741

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
8 changes: 5 additions & 3 deletions src/material/schematics/ng-update/migrations/theming-api-v12/migration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ interface DetectImportResult {
interface ExtraSymbols {
mixins?: Record<string, string>;
functions?: Record<string, string>;
variables?: Record<string, string>;
}

/**
Expand Down Expand Up @@ -123,19 +124,20 @@ function migrateMaterialSymbols(content: string, importPath: string,
extraMaterialSymbols: ExtraSymbols = {}): string {
const initialContent = content;
const namespace = 'mat';
const mixinsToUpdate = {...materialMixins, ...extraMaterialSymbols.mixins};
const functionsToUpdate = {...materialFunctions, ...extraMaterialSymbols.functions};

// Migrate the mixins.
const mixinsToUpdate = {...materialMixins, ...extraMaterialSymbols.mixins};
content = renameSymbols(content, mixinsToUpdate, detectedImports.namespaces, mixinKeyFormatter,
getMixinValueFormatter(namespace));

// Migrate the functions.
const functionsToUpdate = {...materialFunctions, ...extraMaterialSymbols.functions};
content = renameSymbols(content, functionsToUpdate, detectedImports.namespaces,
functionKeyFormatter, getFunctionValueFormatter(namespace));

// Migrate the variables.
content = renameSymbols(content, materialVariables, detectedImports.namespaces,
const variablesToUpdate = {...materialVariables, ...extraMaterialSymbols.variables};
content = renameSymbols(content, variablesToUpdate, detectedImports.namespaces,
variableKeyFormatter, getVariableValueFormatter(namespace));

if (content !== initialContent) {
Expand Down
3 changes: 3 additions & 0 deletions src/material/schematics/ng-update/test-cases/v12/misc/theming-api-v12.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,7 @@ describe('v12 theming API migration', () => {
`@import '~@angular/material/theming';`,
`$something: mat-mdc-typography-config();`,
`@include mat-mdc-button-theme();`,
`$another: $mat-vermillion`
].join('\n');

const migratedContent = migrateFileContent(
Expand All @@ -708,12 +709,14 @@ describe('v12 theming API migration', () => {
'~@angular/cdk', {
mixins: {'mat-mdc-button-theme': 'mdc-button-theme'},
functions: {'mat-mdc-typography-config': 'mdc-typography-config'},
variables: {'mat-vermillion': 'vermillion-palette'},
});

expect(migratedContent).toBe([
`@use '~@angular/material' as mat;`,
`$something: mat.mdc-typography-config();`,
`@include mat.mdc-button-theme();`,
`$another: mat.$vermillion-palette`,
].join('\n'));
});

Expand Down