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

fix(colors): update classic sass file variable initialization #8670

Merged
merged 3 commits into from
May 13, 2021
Merged

fix(colors): update classic sass file variable initialization #8670

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bc064c
fix(colors): update classic sass file variable initialization
joshblack May 12, 2021
6eb1966
Merge branch 'main' into 8565-update-colors-build
tw15egan May 12, 2021
f48100c
Merge branch 'main' into 8565-update-colors-build
kodiakhq[bot] May 13, 2021
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
133 changes: 68 additions & 65 deletions packages/colors/tasks/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,6 @@ async function build() {
return acc.concat(...values);
}, []);

const colorVariables = colorValues.map(({ grade, swatch, value }) =>
t.Assignment({
id: t.Identifier(`${swatch}-${grade}`),
init: t.SassColor(value),
default: true,
})
);
const deprecatedColorVariables = colorValues.map(({ grade, swatch, value }) =>
t.Assignment({
id: t.Identifier(`ibm-color__${swatch}-${grade}`),
init: t.SassColor(value),
default: true,
global: true,
})
);
const colorMapProperties = t.SassMap({
properties: Object.keys(colors).flatMap((swatch) => {
const value = t.SassMap({
Expand Down Expand Up @@ -106,65 +91,83 @@ async function build() {
];
}),
});
const deprecatedColorMap = t.Assignment({
id: t.Identifier('ibm-color-map'),
init: colorMapProperties,
default: true,
global: true,
});
const colorMap = t.Assignment({
id: t.Identifier('carbon--colors'),
init: colorMapProperties,
default: true,

const prefixes = ['ibm-color__', 'carbon--', ''];
const variables = prefixes.flatMap((prefix) => {
return colorValues.flatMap(({ swatch, grade, value }) => {
return t.Assignment({
id: t.Identifier(`${prefix}${swatch}-${grade}`),
init: t.SassColor(value),
default: true,
});
});
});

const mixins = t.StyleSheet({
children: [
FILE_BANNER,
t.Comment(`/ Define color variables
/ @access public
/ @group @carbon/colors
/ @deprecated Use \`$${NAMESPACE}--colors\` going forward`),
t.SassMixin({
id: t.Identifier('ibm--colors'),
body: t.BlockStatement([
...deprecatedColorVariables,
deprecatedColorMap,
]),
variables.push(
t.Assignment({
id: t.Identifier('ibm-color-map'),
init: colorMapProperties,
default: true,
}),
t.Assignment({
id: t.Identifier('carbon--colors'),
init: colorMapProperties,
default: true,
}),
t.Newline()
);

const ibmColorsMixin = t.SassMixin({
id: t.Identifier('ibm--colors'),
body: t.BlockStatement([
...colorValues.flatMap(({ swatch, grade, value }) => {
return t.Assignment({
id: t.Identifier(`ibm-color__${swatch}-${grade}`),
init: t.SassColor(value),
global: true,
});
}),
t.Assignment({
id: t.Identifier('ibm-color-map'),
init: colorMapProperties,
global: true,
}),
]),
});

t.Comment(`/ Define color variables
/ @access public
/ @group @carbon/colors`),
...colorValues.map(({ grade, swatch, value }) =>
t.Assignment({
const carbonColorsMixin = t.SassMixin({
id: t.Identifier('carbon--colors'),
body: t.BlockStatement([
...colorValues.flatMap(({ swatch, grade, value }) => {
return t.Assignment({
id: t.Identifier(`carbon--${swatch}-${grade}`),
init: t.SassValue(value),
})
),
...colorValues.map(({ grade, swatch, value }) =>
t.Assignment({
id: t.Identifier(`${swatch}-${grade}`),
init: t.SassColor(value),
})
),
t.SassMixin({
id: t.Identifier(`${NAMESPACE}--colors`),
body: t.BlockStatement([
...colorValues.map(({ grade, swatch, value }) =>
t.Assignment({
id: t.Identifier(`carbon--${swatch}-${grade}`),
init: t.SassColor(value),
default: true,
})
),
...colorVariables,
colorMap,
]),
global: true,
});
}),
],
t.Assignment({
id: t.Identifier('carbon--colors'),
init: colorMapProperties,
global: true,
}),
]),
});

const mixins = t.StyleSheet([
FILE_BANNER,
...variables,
t.Comment(`/ Define color variables
/ @access public
/ @group @carbon/colors
/ @deprecated Use \`$carbon--colors\` going forward`),
ibmColorsMixin,
t.Newline(),
t.Comment(`/ Define color variables
/ @access public
/ @group @carbon/colors`),
carbonColorsMixin,
]);

const entrypoint = t.StyleSheet([
FILE_BANNER,
t.SassImport('./mixins'),
Expand Down