Skip to content
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

Remove all css imports from result instead only from variables.scss (T1265287) #28534

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Remove all css imports from result instead only from variables.scss (T1265287) #28534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e291747
remove all css imports from result instead only from variables.scss (…
GoodDayForSurf Dec 11, 2024
49e21ea
add test for (T1265287)
GoodDayForSurf Dec 11, 2024
5610109
rename and fix test (T1265287)
GoodDayForSurf Dec 11, 2024
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: 4 additions & 4 deletions packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,17 @@ export default class BootstrapExtractor {
}

const result = `${functions}
${this.getVariables(variables)}
${variables}
${variablesDark}
${this.input}
${this.getSetterServiceCode('!default')}
${this.getCollectorServiceCode()}`;

return result;
return this.removeImports(result);
}

getVariables(variables: string): string {
return variables.replace(/^@import "variables-dark";.*$/gm, '');
removeImports(content: string): string {
return content.replace(/^@import "variables-dark";.*$/gm, '');
}

getFilePath(fileName: string): string {
Expand Down
13 changes: 9 additions & 4 deletions packages/devextreme-themebuilder/tests/modules/bootstrap-extractor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,18 @@ describe('BootstrapExtractor', () => {
extractor.getSetterServiceCode = (): string => setterServiceCode;
extractor.getCollectorServiceCode = (): string => collectorServiceCode;

expect(await extractor.sassProcessor())
.toBe(`${functions.toString()}
${extractor.getVariables(variables.toString())}
const result = await extractor.sassProcessor();

expect(result.includes('@import "variables-dark";')).toBeFalsy();

const expectedResult = `${functions.toString()}
${variables.toString()}
${variablesDark.toString()}
${testSassString}
${setterServiceCode}
${collectorServiceCode}`);
${collectorServiceCode}`;

expect(result).toBe(extractor.removeImports(expectedResult));
});

test('getSetterServiceCode', () => {
Expand Down
Loading