Remove all css imports from result instead only from variables.scss (…

…T1265287) (#28534)
DevExpress · Dec 13, 2024 · 9b90a29 · 9b90a29
1 parent 49f1508
commit 9b90a29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts b/packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts
@@ -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 {

diff --git a/packages/devextreme-themebuilder/tests/modules/bootstrap-extractor.test.ts b/packages/devextreme-themebuilder/tests/modules/bootstrap-extractor.test.ts
@@ -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', () => {