diff --git a/packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts b/packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts index 77f742ff03dd..32cff0e2f319 100644 --- a/packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts +++ b/packages/devextreme-themebuilder/src/modules/bootstrap-extractor.ts @@ -93,10 +93,11 @@ export default class BootstrapExtractor { async sassProcessor(): Promise { const functions = await this.readSassFile('_functions.scss'); const variables = await this.readSassFile('_variables.scss'); - + const variablesDarkFile = '_variables-dark.scss'; const variablesDark = this.version === 5 && existsSync(this.getFilePath(variablesDarkFile)) ? await this.readSassFile(variablesDarkFile) : ''; // TODO: can be removed safely in bootstrap@6 + console.log('------readSassFile---->'); const result = `${functions} ${variables} ${variablesDark} diff --git a/packages/devextreme-themebuilder/tests/modules/builder.test.ts b/packages/devextreme-themebuilder/tests/modules/builder.test.ts index 4f6b8fb0af58..886adb86c3c1 100644 --- a/packages/devextreme-themebuilder/tests/modules/builder.test.ts +++ b/packages/devextreme-themebuilder/tests/modules/builder.test.ts @@ -119,7 +119,7 @@ describe('Builder integration tests', () => { const themeBuilderCss = normalizeCss(result.css); const cssPath = path.resolve(__dirname, '../../../devextreme/artifacts/css/dx.light.css'); const distributionCss = normalizeCss(readFileSync(cssPath, 'utf8')); - expect(themeBuilderCss.substring(0,1000)).toBe(distributionCss.substring(0,1000)); + expect(themeBuilderCss).toBe(distributionCss); }); }, buildTimeout);