Skip to content

Commit

Permalink
Merge branch 'master' into audit-avt1-guidelines-icons-button-label
Browse files Browse the repository at this point in the history
  • Loading branch information
andreancardona committed Feb 17, 2021
2 parents c8d7d50 + da2eced commit 3623007
Show file tree
Hide file tree
Showing 27 changed files with 150 additions and 147 deletions.
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "2.2.0",
"version": "2.3.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "0.1.0",
"version": "0.2.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/storybook-preset-carbon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = {
'@storybook/addon-links',
CARBON_REACT_STORYBOOK_USE_CUSTOM_PROPERTIES === 'true' &&
require.resolve('./dist/preset.js'),
],
].filter(Boolean),

webpack(config) {
const sassLoader = {
Expand Down
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.3.0",
"version": "1.4.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli",
"description": "Task automation for working with the Carbon Design System",
"version": "10.19.0",
"version": "10.20.0-rc.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down
6 changes: 3 additions & 3 deletions packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "10.20.0",
"version": "10.21.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,10 +35,10 @@
"clean": "rimraf css es lib umd scss index.scss"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/cli": "^10.20.0-rc.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/scss-generator": "^10.13.0",
"@carbon/test-utils": "^10.14.0",
"@carbon/test-utils": "^10.15.0-rc.0",
"change-case": "^4.1.1",
"core-js": "^3.6.5",
"fs-extra": "^8.1.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "10.28.0",
"version": "10.29.0-rc.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -84,11 +84,11 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@carbon/cli": "^10.19.0",
"@carbon/elements": "^10.27.0",
"@carbon/icons-handlebars": "^10.25.0",
"@carbon/icons-react": "^10.25.0",
"@carbon/test-utils": "^10.14.0",
"@carbon/cli": "^10.20.0-rc.0",
"@carbon/elements": "^10.28.0-rc.0",
"@carbon/icons-handlebars": "^10.26.0-rc.0",
"@carbon/icons-react": "^10.26.0-rc.0",
"@carbon/test-utils": "^10.15.0-rc.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-commonjs": "^17.0.0",
Expand Down
11 changes: 7 additions & 4 deletions packages/components/src/globals/scss/_component-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ $enable-css-custom-properties: feature-flag-enabled(
/// @example get-token-value($component-tokens, 'tag-background-red');
/// @returns {String} Token value
/// @group component-tokens
@function get-token-value($tokens, $name) {
@function get-token-value($tokens, $name, $force-static-values: false) {
$emit-as-css-custom-property: $force-static-values == false and
feature-flag-enabled('enable-css-custom-properties');

@if map-has-key($tokens, $name) {
$config: map-get($tokens, $name);
$fallback: map-get($config, 'fallback');
Expand All @@ -33,15 +36,15 @@ $enable-css-custom-properties: feature-flag-enabled(
$value: map-get($option, 'value');

@return if(
feature-flag-enabled('enable-css-custom-properties'),
$emit-as-css-custom-property,
var(--#{$custom-property-prefix}-#{$name}, #{$value}),
$value
);
}
}

@return if(
feature-flag-enabled('enable-css-custom-properties'),
$emit-as-css-custom-property,
var(--#{$custom-property-prefix}-#{$name}, #{$fallback}),
$fallback
);
Expand Down Expand Up @@ -73,6 +76,6 @@ $enable-css-custom-properties: feature-flag-enabled(
/// @example @include emit-component-tokens($component-tokens);
@mixin emit-component-tokens($tokens) {
@each $key, $options in $tokens {
@include custom-property($key, get-token-value($tokens, $key));
@include custom-property($key, get-token-value($tokens, $key, true));
}
}
18 changes: 9 additions & 9 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "10.27.0",
"version": "10.28.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,17 +35,17 @@
"clean": "rimraf es lib umd && node tasks/clean.js"
},
"dependencies": {
"@carbon/colors": "^10.20.0",
"@carbon/grid": "^10.20.0",
"@carbon/icons": "^10.25.0",
"@carbon/colors": "^10.21.0-rc.0",
"@carbon/grid": "^10.21.0-rc.0",
"@carbon/icons": "^10.26.0-rc.0",
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.18.0",
"@carbon/motion": "^10.13.0",
"@carbon/themes": "^10.27.0",
"@carbon/type": "^10.21.0"
"@carbon/layout": "^10.19.0-rc.0",
"@carbon/motion": "^10.14.0-rc.0",
"@carbon/themes": "^10.28.0-rc.0",
"@carbon/type": "^10.22.0-rc.0"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/cli": "^10.20.0-rc.0",
"fs-extra": "^8.1.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^3.4.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/grid",
"description": "Grid for digital and software products using the Carbon Design System",
"version": "10.20.0",
"version": "10.21.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -32,10 +32,10 @@
},
"dependencies": {
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.18.0"
"@carbon/layout": "^10.19.0-rc.0"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/cli": "^10.20.0-rc.0",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/icon-build-helpers",
"private": true,
"description": "Build helpers for the Carbon Design System icon library",
"version": "0.15.0",
"version": "0.16.0-rc.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand All @@ -28,7 +28,7 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/icon-helpers": "^10.13.0",
"@carbon/icon-helpers": "^10.14.0-rc.0",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-replace": "^2.3.4",
"browserslist-config-carbon": "^10.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icon-helpers",
"description": "Helpers used alongside icons for digital and software products using the Carbon Design System",
"version": "10.13.0",
"version": "10.14.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"clean": "rimraf es lib umd"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/cli": "^10.20.0-rc.0",
"rimraf": "^3.0.0"
},
"sideEffects": false
Expand Down
6 changes: 3 additions & 3 deletions packages/icons-handlebars/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-handlebars",
"description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System",
"version": "10.25.0",
"version": "10.26.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand All @@ -26,8 +26,8 @@
"handlebars": "^4.0.12"
},
"dependencies": {
"@carbon/icon-helpers": "^10.13.0",
"@carbon/icons": "^10.25.0"
"@carbon/icon-helpers": "^10.14.0-rc.0",
"@carbon/icons": "^10.26.0-rc.0"
},
"devDependencies": {
"handlebars": "^4.0.12"
Expand Down
8 changes: 4 additions & 4 deletions packages/icons-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-react",
"description": "React components for icons in digital and software products using the Carbon Design System",
"version": "10.25.0",
"version": "10.26.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -36,12 +36,12 @@
"react": ">=16"
},
"dependencies": {
"@carbon/icon-helpers": "^10.13.0",
"@carbon/icon-helpers": "^10.14.0-rc.0",
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.15.0",
"@carbon/icons": "^10.25.0"
"@carbon/icon-build-helpers": "^0.16.0-rc.0",
"@carbon/icons": "^10.26.0-rc.0"
},
"sideEffects": false
}
6 changes: 3 additions & 3 deletions packages/icons-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-vue",
"description": "Vue components for icons in digital and software products using the Carbon Design System",
"version": "10.25.0",
"version": "10.26.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -28,11 +28,11 @@
"clean": "rimraf es lib"
},
"dependencies": {
"@carbon/icon-helpers": "^10.13.0"
"@carbon/icon-helpers": "^10.14.0-rc.0"
},
"devDependencies": {
"@carbon/cli-reporter": "^10.4.0",
"@carbon/icons": "^10.25.0",
"@carbon/icons": "^10.26.0-rc.0",
"fs-extra": "^8.1.0",
"prettier": "^2.2.1",
"rimraf": "^3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons",
"description": "Icons for digital and software products using the Carbon Design System",
"version": "10.25.0",
"version": "10.26.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,8 +38,8 @@
"prepublishOnly": "yarn build"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/icon-build-helpers": "^0.15.0",
"@carbon/cli": "^10.20.0-rc.0",
"@carbon/icon-build-helpers": "^0.16.0-rc.0",
"rimraf": "^3.0.2"
}
}
6 changes: 3 additions & 3 deletions packages/layout/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/layout",
"description": "Layout helpers for digital and software products using the Carbon Design System",
"version": "10.18.0",
"version": "10.19.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -29,10 +29,10 @@
"clean": "rimraf es lib umd scss/generated scss/modules/generated"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/cli": "^10.20.0-rc.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/scss-generator": "^10.13.0",
"@carbon/test-utils": "^10.14.0",
"@carbon/test-utils": "^10.15.0-rc.0",
"core-js": "^3.6.5",
"rimraf": "^3.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/motion/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/motion",
"description": "Motion helpers for digital and software products using the Carbon Design System",
"version": "10.13.0",
"version": "10.14.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -29,7 +29,7 @@
"clean": "rimraf es lib umd"
},
"devDependencies": {
"@carbon/cli": "^10.19.0",
"@carbon/cli": "^10.20.0-rc.0",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
8 changes: 4 additions & 4 deletions packages/pictograms-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms-react",
"description": "React components for pictograms in digital and software products using the Carbon Design System",
"version": "11.3.0",
"version": "11.4.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -37,13 +37,13 @@
"react": ">=16"
},
"dependencies": {
"@carbon/icon-helpers": "^10.13.0",
"@carbon/icon-helpers": "^10.14.0-rc.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.15.0",
"@carbon/pictograms": "^11.3.0"
"@carbon/icon-build-helpers": "^0.16.0-rc.0",
"@carbon/pictograms": "^11.4.0-rc.0"
},
"sideEffects": false
}
4 changes: 2 additions & 2 deletions packages/pictograms/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms",
"description": "Pictograms for digital and software products using the Carbon Design System",
"version": "11.3.0",
"version": "11.4.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -31,7 +31,7 @@
"prepublishOnly": "yarn build"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.15.0",
"@carbon/icon-build-helpers": "^0.16.0-rc.0",
"rimraf": "^3.0.0"
}
}
Loading

0 comments on commit 3623007

Please sign in to comment.