Skip to content

Commit 3e1c066

Browse files
ThemeBuilder: clean imports from bootstrap _variables.scss (#28552)
1 parent 694642a commit 3e1c066

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,17 @@ export default class BootstrapExtractor {
9898
const variablesDark = this.version === 5 && existsSync(this.getFilePath(variablesDarkFile)) ? await this.readSassFile(variablesDarkFile) : ''; // TODO: can be removed safely in bootstrap@6
9999

100100
const result = `${functions}
101-
${variables.replace('@import "variables-dark";', '')}
101+
${variables}
102102
${variablesDark}
103103
${this.input}
104104
${this.getSetterServiceCode('!default')}
105105
${this.getCollectorServiceCode()}`;
106106

107-
return result;
107+
return this.removeImports(result);
108+
}
109+
110+
removeImports(content: string): string {
111+
return content.replace(/^@import "variables-dark";.*$/gm, '');
108112
}
109113

110114
async lessProcessor(): Promise<string> {

packages/devextreme-themebuilder/tests/modules/bootstrap-extractor.test.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,18 @@ ${collectorServiceCode}`);
7575
extractor.getSetterServiceCode = (): string => setterServiceCode;
7676
extractor.getCollectorServiceCode = (): string => collectorServiceCode;
7777

78-
expect(await extractor.sassProcessor())
79-
.toBe(`${functions.toString()}
78+
const result = await extractor.sassProcessor();
79+
80+
expect(result.includes('@import "variables-dark";')).toBeFalsy();
81+
82+
const expectedResult = `${functions.toString()}
8083
${variables.toString()}
8184
${variablesDark.toString()}
8285
${testSassString}
8386
${setterServiceCode}
84-
${collectorServiceCode}`);
87+
${collectorServiceCode}`;
88+
89+
expect(result).toBe(extractor.removeImports(expectedResult));
8590
});
8691

8792
test('lessProcessor', async () => {

0 commit comments

Comments
 (0)