Skip to content

Commit

Permalink
fix(themes): remove imports from mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
reme3d2y committed Dec 4, 2020
1 parent dab5d14 commit 4d878b5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion bin/build-themes.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ const extractContentFromMixins = css => {
if (match) return match[1];
};

// Удаляет импорты переменных из миксинов
const removeImports = css => {
return css.replace(/^@import .*$\n+/gm, '');
};

// Прогоняет контент через postcss, применяя postcss-color-mod-function
const filesWithVars = glob.sync(path.resolve(__dirname, '../packages/vars/src/*.css'));

Expand Down Expand Up @@ -52,7 +57,9 @@ const processPostCss = async (content, cssFile) =>
for (let cssFile of cssFiles) {
const component = path.basename(path.dirname(cssFile));
// В сборке тем не должно быть color-mod - прогоняем через color-mod-function
const content = await processPostCss(fs.readFileSync(cssFile, 'utf-8'), cssFile);
const content = removeImports(
await processPostCss(fs.readFileSync(cssFile, 'utf-8'), cssFile),
);
fs.writeFileSync(cssFile, content);

const vars = extractContentFromMixins(content);
Expand Down
2 changes: 1 addition & 1 deletion packages/themes/src/mixins/button/corp-inverted.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../../../vars/src/index.css';

@define-mixin button-corp-inverted {
/* secondary */
/* secondary (выглядит как outline) */
--button-secondary-color: var(--color-light-text-primary-inverted);
--button-secondary-base-bg-color: transparent;
--button-secondary-base-border-color: var(--color-light-border-key-inverted);
Expand Down

0 comments on commit 4d878b5

Please sign in to comment.