diff --git a/.yarn/cache/@rollup-plugin-replace-npm-2.3.4-2b255f0126-97ae11600a.zip b/.yarn/cache/@rollup-plugin-replace-npm-2.3.4-2b255f0126-97ae11600a.zip new file mode 100644 index 000000000000..d3c4fcb23fa3 Binary files /dev/null and b/.yarn/cache/@rollup-plugin-replace-npm-2.3.4-2b255f0126-97ae11600a.zip differ diff --git a/.yarn/cache/estree-walker-npm-0.3.1-eafc7846cc-20a1a9833e.zip b/.yarn/cache/estree-walker-npm-0.3.1-eafc7846cc-20a1a9833e.zip deleted file mode 100644 index 9536fdc2d5ac..000000000000 Binary files a/.yarn/cache/estree-walker-npm-0.3.1-eafc7846cc-20a1a9833e.zip and /dev/null differ diff --git a/.yarn/cache/magic-string-npm-0.19.1-0dffe528c9-eabaf9b175.zip b/.yarn/cache/magic-string-npm-0.19.1-0dffe528c9-eabaf9b175.zip deleted file mode 100644 index ee347c85365b..000000000000 Binary files a/.yarn/cache/magic-string-npm-0.19.1-0dffe528c9-eabaf9b175.zip and /dev/null differ diff --git a/.yarn/cache/rollup-plugin-strip-banner-npm-0.2.0-0aa46b3887-ba6dab339b.zip b/.yarn/cache/rollup-plugin-strip-banner-npm-0.2.0-0aa46b3887-ba6dab339b.zip deleted file mode 100644 index fd39eb052ff2..000000000000 Binary files a/.yarn/cache/rollup-plugin-strip-banner-npm-0.2.0-0aa46b3887-ba6dab339b.zip and /dev/null differ diff --git a/.yarn/cache/rollup-pluginutils-npm-2.0.1-cb018e5ebc-40f9e1af99.zip b/.yarn/cache/rollup-pluginutils-npm-2.0.1-cb018e5ebc-40f9e1af99.zip deleted file mode 100644 index bece4920080b..000000000000 Binary files a/.yarn/cache/rollup-pluginutils-npm-2.0.1-cb018e5ebc-40f9e1af99.zip and /dev/null differ diff --git a/.yarn/cache/vlq-npm-0.2.3-292fe9aaa1-48055a9675.zip b/.yarn/cache/vlq-npm-0.2.3-292fe9aaa1-48055a9675.zip deleted file mode 100644 index 5081a1a44d03..000000000000 Binary files a/.yarn/cache/vlq-npm-0.2.3-292fe9aaa1-48055a9675.zip and /dev/null differ diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 148f7e04873d..05fcffe5a58c 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -9580,6 +9580,7 @@ $field-01: if( - **Used by**: - [carbon--theme [mixin]](#carbon--theme-mixin) - [snippet [mixin]](#snippet-mixin) + - [bx--snippet [mixin]](#bx--snippet-mixin) - [date-picker [mixin]](#date-picker-mixin) - [dropdown [mixin]](#dropdown-mixin) - [file-uploader [mixin]](#file-uploader-mixin) @@ -17777,13 +17778,15 @@ Code snippet base styles position: relative; width: 100%; max-width: rem(600px); - background-color: $snippet-background-color; + background-color: $field-01; } ``` - **Group**: [code-snippet](#code-snippet) +- **Requires**: + - [field-01 [variable]](#field-01-variable) - **Used by**: - [snippet [mixin]](#snippet-mixin) @@ -23194,6 +23197,12 @@ Inline notification styles @include carbon--breakpoint(max) { max-width: rem(832px); } + + // Firefox HCM fix + @media screen and (prefers-contrast) { + outline-width: 1px; + outline-style: solid; + } } .#{$prefix}--inline-notification:not(.#{$prefix}--inline-notification--low-contrast) @@ -23581,6 +23590,12 @@ Toast notification styles @include carbon--breakpoint(max) { width: rem(352px); } + + // Firefox HCM fix + @media screen and (prefers-contrast) { + outline-width: 1px; + outline-style: solid; + } } .#{$prefix}--toast-notification:not(.#{$prefix}--toast-notification--low-contrast) diff --git a/packages/components/package.json b/packages/components/package.json index c44d2e665aa9..52376a7032b2 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -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.27.0-rc.0", + "version": "10.27.0-rc.4", "license": "Apache-2.0", "main": "umd/index.js", "module": "es/index.js", @@ -57,6 +57,7 @@ "dev": "gulp serve", "docs": "carbon-cli sassdoc \"scss{/components,/globals/grid,/globals/scss/vendor/@carbon/elements}/**/*.scss\" -i \"scss/globals/scss/vendor/@carbon/elements/**/{_inlined,vendor}/**\"", "format:check": "prettier --check \"**/*.{css,js,md,scss}\"", + "postinstall": "carbon-telemetry collect --install", "prebuild": "gulp clean", "prepublishOnly": "yarn build", "start": "node server.js", @@ -70,6 +71,7 @@ "freshy": ">= 1.0.3" }, "dependencies": { + "@carbon/telemetry": "0.0.0-alpha.6", "flatpickr": "4.6.1", "lodash.debounce": "^4.0.8", "warning": "^3.0.0" @@ -84,9 +86,9 @@ "@babel/preset-react": "^7.10.0", "@babel/runtime": "^7.10.0", "@carbon/cli": "^10.18.0-rc.0", - "@carbon/elements": "^10.26.0-rc.0", - "@carbon/icons-handlebars": "^10.24.0-rc.0", - "@carbon/icons-react": "^10.24.0-rc.0", + "@carbon/elements": "^10.26.0-rc.4", + "@carbon/icons-handlebars": "^10.24.0-rc.1", + "@carbon/icons-react": "^10.24.0-rc.1", "@carbon/test-utils": "^10.14.0-rc.0", "@frctl/fractal": "^1.1.0", "adaro": "1.0.4", diff --git a/packages/components/src/components/code-snippet/_mixins.scss b/packages/components/src/components/code-snippet/_mixins.scss index 5f463d847dbd..f1b9d60b5a11 100644 --- a/packages/components/src/components/code-snippet/_mixins.scss +++ b/packages/components/src/components/code-snippet/_mixins.scss @@ -16,5 +16,5 @@ position: relative; width: 100%; max-width: rem(600px); - background-color: $snippet-background-color; + background-color: $field-01; } diff --git a/packages/components/src/components/notification/_inline-notification.scss b/packages/components/src/components/notification/_inline-notification.scss index c477fbf9fcde..032da9d0f8d2 100644 --- a/packages/components/src/components/notification/_inline-notification.scss +++ b/packages/components/src/components/notification/_inline-notification.scss @@ -47,6 +47,12 @@ @include carbon--breakpoint(max) { max-width: rem(832px); } + + // Firefox HCM fix + @media screen and (prefers-contrast) { + outline-width: 1px; + outline-style: solid; + } } .#{$prefix}--inline-notification:not(.#{$prefix}--inline-notification--low-contrast) diff --git a/packages/components/src/components/notification/_toast-notification.scss b/packages/components/src/components/notification/_toast-notification.scss index 62fa9a719d54..b789a1b94d35 100644 --- a/packages/components/src/components/notification/_toast-notification.scss +++ b/packages/components/src/components/notification/_toast-notification.scss @@ -40,6 +40,12 @@ @include carbon--breakpoint(max) { width: rem(352px); } + + // Firefox HCM fix + @media screen and (prefers-contrast) { + outline-width: 1px; + outline-style: solid; + } } .#{$prefix}--toast-notification:not(.#{$prefix}--toast-notification--low-contrast) diff --git a/packages/components/src/globals/scss/_theme-tokens.scss b/packages/components/src/globals/scss/_theme-tokens.scss index 37c6c5a16cdb..b93cf8fa43c4 100644 --- a/packages/components/src/globals/scss/_theme-tokens.scss +++ b/packages/components/src/globals/scss/_theme-tokens.scss @@ -190,6 +190,7 @@ $checkbox-border-width: 2px !default; /// @type Color /// @access public /// @group code-snippet +/// @deprecated $snippet-background-color: $field-01 !default; /// @type Color diff --git a/packages/elements/package.json b/packages/elements/package.json index 1e91fdae187b..064b0b929de7 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/elements", "description": "A collection of design elements in code for the IBM Design Language", - "version": "10.26.0-rc.0", + "version": "10.26.0-rc.4", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -37,12 +37,12 @@ "dependencies": { "@carbon/colors": "^10.19.0-rc.0", "@carbon/grid": "^10.19.0-rc.0", - "@carbon/icons": "^10.24.0-rc.0", + "@carbon/icons": "^10.24.0-rc.1", "@carbon/import-once": "^10.5.0-rc.0", "@carbon/layout": "^10.17.0-rc.0", "@carbon/motion": "^10.12.0-rc.0", - "@carbon/themes": "^10.26.0-rc.0", - "@carbon/type": "^10.20.0-rc.0" + "@carbon/themes": "^10.26.0-rc.1", + "@carbon/type": "^10.20.0-rc.1" }, "devDependencies": { "@carbon/cli": "^10.18.0-rc.0", diff --git a/packages/elements/src/__tests__/PublicAPI-test.js b/packages/elements/src/__tests__/PublicAPI-test.js new file mode 100644 index 000000000000..21fc7f33f87b --- /dev/null +++ b/packages/elements/src/__tests__/PublicAPI-test.js @@ -0,0 +1,12 @@ +/** + * Copyright IBM Corp. 2018, 2018 + * + * This source code is licensed under the Apache-2.0 license found in the + * LICENSE file in the root directory of this source tree. + */ + +import * as CarbonElements from '../'; + +test('Public API should only change with a semver change', () => { + expect(Object.keys(CarbonElements).sort()).toMatchSnapshot(); +}); diff --git a/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap new file mode 100644 index 000000000000..075e3e2a33fc --- /dev/null +++ b/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap @@ -0,0 +1,299 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Public API should only change with a semver change 1`] = ` +Array [ + "active01", + "activeDanger", + "activeLightUI", + "activePrimary", + "activeSecondary", + "activeTertiary", + "activeUI", + "baseFontSize", + "black", + "black100", + "blue", + "blue10", + "blue100", + "blue20", + "blue30", + "blue40", + "blue50", + "blue60", + "blue70", + "blue80", + "blue90", + "bodyLong01", + "bodyLong02", + "bodyShort01", + "bodyShort02", + "brand01", + "brand02", + "brand03", + "breakpoint", + "breakpointDown", + "breakpointUp", + "breakpoints", + "buttonSeparator", + "caption01", + "code01", + "code02", + "colors", + "container", + "container01", + "container02", + "container03", + "container04", + "container05", + "coolGray", + "coolGray10", + "coolGray100", + "coolGray20", + "coolGray30", + "coolGray40", + "coolGray50", + "coolGray60", + "coolGray70", + "coolGray80", + "coolGray90", + "cyan", + "cyan10", + "cyan100", + "cyan20", + "cyan30", + "cyan40", + "cyan50", + "cyan60", + "cyan70", + "cyan80", + "cyan90", + "danger", + "danger01", + "danger02", + "decorative01", + "disabled01", + "disabled02", + "disabled03", + "display01", + "display02", + "display03", + "display04", + "easings", + "em", + "expressiveHeading01", + "expressiveHeading02", + "expressiveHeading03", + "expressiveHeading04", + "expressiveHeading05", + "expressiveHeading06", + "expressiveParagraph01", + "field01", + "field02", + "fluid", + "fluidSpacing", + "fluidSpacing01", + "fluidSpacing02", + "fluidSpacing03", + "fluidSpacing04", + "focus", + "fontFamilies", + "fontFamily", + "fontWeight", + "fontWeights", + "formatTokenName", + "g10", + "g100", + "g90", + "getTypeSize", + "gray", + "gray10", + "gray100", + "gray20", + "gray30", + "gray40", + "gray50", + "gray60", + "gray70", + "gray80", + "gray90", + "green", + "green10", + "green100", + "green20", + "green30", + "green40", + "green50", + "green60", + "green70", + "green80", + "green90", + "heading01", + "heading02", + "helperText01", + "highlight", + "hoverDanger", + "hoverField", + "hoverLightUI", + "hoverPrimary", + "hoverPrimaryText", + "hoverRow", + "hoverSecondary", + "hoverSelectedUI", + "hoverTertiary", + "hoverUI", + "icon01", + "icon02", + "icon03", + "iconSize", + "iconSize01", + "iconSize02", + "interactive01", + "interactive02", + "interactive03", + "interactive04", + "inverse01", + "inverse02", + "inverseFocusUi", + "inverseHoverUI", + "inverseLink", + "inverseSupport01", + "inverseSupport02", + "inverseSupport03", + "inverseSupport04", + "label01", + "layout", + "layout01", + "layout02", + "layout03", + "layout04", + "layout05", + "layout06", + "layout07", + "link01", + "magenta", + "magenta10", + "magenta100", + "magenta20", + "magenta30", + "magenta40", + "magenta50", + "magenta60", + "magenta70", + "magenta80", + "magenta90", + "miniUnit", + "miniUnits", + "motion", + "orange", + "orange40", + "orange60", + "orange70", + "overlay01", + "print", + "productiveHeading01", + "productiveHeading02", + "productiveHeading03", + "productiveHeading04", + "productiveHeading05", + "productiveHeading06", + "productiveHeading07", + "purple", + "purple10", + "purple100", + "purple20", + "purple30", + "purple40", + "purple50", + "purple60", + "purple70", + "purple80", + "purple90", + "px", + "quotation01", + "quotation02", + "red", + "red10", + "red100", + "red20", + "red30", + "red40", + "red50", + "red60", + "red70", + "red80", + "red90", + "rem", + "reset", + "rgba", + "scale", + "selectedLightUI", + "selectedUI", + "skeleton01", + "skeleton02", + "spacing", + "spacing01", + "spacing02", + "spacing03", + "spacing04", + "spacing05", + "spacing06", + "spacing07", + "spacing08", + "spacing09", + "spacing10", + "spacing11", + "spacing12", + "styles", + "support01", + "support02", + "support03", + "support04", + "teal", + "teal10", + "teal100", + "teal20", + "teal30", + "teal40", + "teal50", + "teal60", + "teal70", + "teal80", + "teal90", + "text01", + "text02", + "text03", + "text04", + "text05", + "textError", + "themes", + "tokens", + "ui01", + "ui02", + "ui03", + "ui04", + "ui05", + "uiBackground", + "unstable__meta", + "unstable_tokens", + "v9", + "visitedLink", + "warmGray", + "warmGray10", + "warmGray100", + "warmGray20", + "warmGray30", + "warmGray40", + "warmGray50", + "warmGray60", + "warmGray70", + "warmGray80", + "warmGray90", + "white", + "white0", + "yellow", + "yellow20", + "yellow30", + "yellow40", + "yellow50", +] +`; diff --git a/packages/elements/src/index.js b/packages/elements/src/index.js index dcfb365eb41d..36c160781f15 100644 --- a/packages/elements/src/index.js +++ b/packages/elements/src/index.js @@ -5,8 +5,161 @@ * LICENSE file in the root directory of this source tree. */ -export * from '@carbon/colors'; +export { + black, + black100, + blue, + blue10, + blue20, + blue30, + blue40, + blue50, + blue60, + blue70, + blue80, + blue90, + blue100, + colors, + coolGray, + coolGray10, + coolGray20, + coolGray30, + coolGray40, + coolGray50, + coolGray60, + coolGray70, + coolGray80, + coolGray90, + coolGray100, + cyan, + cyan10, + cyan20, + cyan30, + cyan40, + cyan50, + cyan60, + cyan70, + cyan80, + cyan90, + cyan100, + gray, + gray10, + gray20, + gray30, + gray40, + gray50, + gray60, + gray70, + gray80, + gray90, + gray100, + green, + green10, + green20, + green30, + green40, + green50, + green60, + green70, + green80, + green90, + green100, + magenta, + magenta10, + magenta20, + magenta30, + magenta40, + magenta50, + magenta60, + magenta70, + magenta80, + magenta90, + magenta100, + orange, + orange40, + orange60, + orange70, + purple, + purple10, + purple20, + purple30, + purple40, + purple50, + purple60, + purple70, + purple80, + purple90, + purple100, + red, + red10, + red20, + red30, + red40, + red50, + red60, + red70, + red80, + red90, + red100, + rgba, + teal, + teal10, + teal20, + teal30, + teal40, + teal50, + teal60, + teal70, + teal80, + teal90, + teal100, + warmGray, + warmGray10, + warmGray20, + warmGray30, + warmGray40, + warmGray50, + warmGray60, + warmGray70, + warmGray80, + warmGray90, + warmGray100, + white0, + yellow, + yellow20, + yellow30, + yellow40, + yellow50, +} from '@carbon/colors'; +export { + fluid, + fontFamilies, + fontFamily, + fontWeights, + fontWeight, + print, + reset, + getTypeSize, + scale, + styles, + unstable_tokens, +} from '@carbon/type'; +export { + baseFontSize, + rem, + em, + px, + breakpoints, + breakpointUp, + breakpointDown, + breakpoint, + container, + fluidSpacing, + iconSize, + miniUnit, + miniUnits, + layout, + spacing, +} from '@carbon/layout'; export * from '@carbon/themes'; -export * from '@carbon/layout'; export * from '@carbon/motion'; -export * from '@carbon/type'; diff --git a/packages/icon-build-helpers/package.json b/packages/icon-build-helpers/package.json index 51fc67744d33..6ec4702edeac 100644 --- a/packages/icon-build-helpers/package.json +++ b/packages/icon-build-helpers/package.json @@ -2,7 +2,7 @@ "name": "@carbon/icon-build-helpers", "private": true, "description": "Build helpers for the Carbon Design System icon library", - "version": "0.14.0-rc.0", + "version": "0.14.0-rc.1", "license": "Apache-2.0", "main": "src/index.js", "repository": { @@ -26,6 +26,8 @@ "@babel/preset-react": "^7.10.0", "@carbon/cli-reporter": "^10.4.0", "@carbon/icon-helpers": "^10.12.0-rc.0", + "@rollup/plugin-babel": "^5.2.2", + "@rollup/plugin-replace": "^2.3.4", "browserslist-config-carbon": "^10.6.0", "change-case": "^4.1.1", "core-js": "^3.6.5", @@ -39,10 +41,8 @@ "react": "^16.6.0", "react-dom": "^16.6.0", "rimraf": "^3.0.0", - "rollup": "^1.15.1", - "rollup-plugin-babel": "^4.4.0", - "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-strip-banner": "^0.2.0", + "rollup": "^2.36.1", + "rollup-plugin-strip-banner": "^2.0.0", "svgo": "^1.1.1" } } diff --git a/packages/icon-build-helpers/src/builders/index.js b/packages/icon-build-helpers/src/builders/index.js index 5efc10abaf0c..9908470f4c95 100644 --- a/packages/icon-build-helpers/src/builders/index.js +++ b/packages/icon-build-helpers/src/builders/index.js @@ -10,7 +10,7 @@ const react = require('./react/builder'); const svg = require('./svg'); const vanilla = require('./vanilla'); -const vue = require('./vue'); +const vue = require('./vue/builder'); const builders = { react: { diff --git a/packages/icon-build-helpers/src/builders/react/builder.js b/packages/icon-build-helpers/src/builders/react/builder.js index aee2cd239acc..237a56944bad 100644 --- a/packages/icon-build-helpers/src/builders/react/builder.js +++ b/packages/icon-build-helpers/src/builders/react/builder.js @@ -7,11 +7,11 @@ 'use strict'; +const { babel } = require('@rollup/plugin-babel'); const { camelCase } = require('change-case'); const fs = require('fs-extra'); const path = require('path'); const { rollup } = require('rollup'); -const babel = require('rollup-plugin-babel'); const virtual = require('../plugins/virtual'); const BANNER = `/** @@ -41,6 +41,7 @@ const babelConfig = { '@babel/plugin-transform-react-constant-elements', 'babel-plugin-dev-expression', ], + babelHelpers: 'bundled', }; async function builder(metadata, { output }) { @@ -156,6 +157,7 @@ const didWarnAboutDeprecation = {};`; format, entryFileNames: '[name]', banner: BANNER, + exports: 'auto', }; await bundle.write(outputOptions); diff --git a/packages/icon-build-helpers/src/builders/vanilla.js b/packages/icon-build-helpers/src/builders/vanilla.js index 13fe7b0a069c..790c856c968a 100644 --- a/packages/icon-build-helpers/src/builders/vanilla.js +++ b/packages/icon-build-helpers/src/builders/vanilla.js @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ +const { babel } = require('@rollup/plugin-babel'); const path = require('path'); const { rollup } = require('rollup'); -const babel = require('rollup-plugin-babel'); const virtual = require('./plugins/virtual'); const BANNER = `/** @@ -32,6 +32,7 @@ const babelConfig = { }, ], ], + babelHelpers: 'bundled', }; async function builder(metadata, { output }) { @@ -83,6 +84,7 @@ async function builder(metadata, { output }) { format, entryFileNames: '[name]', banner: BANNER, + exports: 'auto', }; await bundle.write(outputOptions); diff --git a/packages/icon-build-helpers/src/builders/vue.js b/packages/icon-build-helpers/src/builders/vue/builder.js similarity index 58% rename from packages/icon-build-helpers/src/builders/vue.js rename to packages/icon-build-helpers/src/builders/vue/builder.js index 9543d35db307..622da7d0fc09 100644 --- a/packages/icon-build-helpers/src/builders/vue.js +++ b/packages/icon-build-helpers/src/builders/vue/builder.js @@ -7,10 +7,11 @@ 'use strict'; +const { babel } = require('@rollup/plugin-babel'); +const fs = require('fs-extra'); const path = require('path'); const { rollup } = require('rollup'); -const babel = require('rollup-plugin-babel'); -const virtual = require('./plugins/virtual'); +const virtual = require('../plugins/virtual'); const BANNER = `/** * Copyright IBM Corp. 2019, 2020 @@ -20,7 +21,7 @@ const BANNER = `/** * * Code generated by @carbon/icon-build-helpers. DO NOT EDIT. */`; -const external = ['@carbon/icon-helpers']; +const external = ['@carbon/icon-helpers', 'vue']; const babelConfig = { babelrc: false, exclude: /node_modules/, @@ -34,6 +35,7 @@ const babelConfig = { }, ], ], + babelHelpers: 'bundled', }; async function builder(metadata, { output }) { @@ -59,6 +61,10 @@ async function builder(metadata, { output }) { }, }; `, + './utils.js': await fs.readFile( + path.resolve(__dirname, './utils.js'), + 'utf8' + ), }; const input = { 'index.js': 'index.js', @@ -95,6 +101,7 @@ async function builder(metadata, { output }) { format, entryFileNames: '[name]', banner: BANNER, + exports: 'auto', }; await bundle.write(outputOptions); @@ -112,6 +119,7 @@ async function builder(metadata, { output }) { name: 'CarbonIconsVue', globals: { '@carbon/icon-helpers': 'CarbonIconHelpers', + vue: 'Vue', }, }); } @@ -123,66 +131,17 @@ async function builder(metadata, { output }) { * @param {object} descriptor * @returns {object} */ -function createIconComponent(moduleName, descriptor) { - const { attrs, content } = descriptor; - const attrsAsString = Object.keys(attrs) - .map((attr) => `${attr}: "${attrs[attr]}"`) - .join(','); - const source = `${BANNER} -import { getAttributes } from '@carbon/icon-helpers'; -export default { - name: '${moduleName}', - functional: true, - // We use title as the prop name as it is not a valid attribute for an SVG - // HTML element - props: ['title'], - render(createElement, context) { - const { children, data, listeners, props } = context; - const attrs = getAttributes({ - ${attrsAsString}, - preserveAspectRatio: 'xMidYMid meet', - xmlns: 'http://www.w3.org/2000/svg', - // Special case here, we need to coordinate that we are using title, - // potentially, to get the right focus attributes - title: props.title, - ...data.attrs - }); - const svgData = { - attrs, - on: listeners, - }; - if (data.staticClass) { - svgData.class = { - [data.staticClass]: true, - }; - } - if (data.class) { - svgData.class = svgData.class || {}; // may be no static class - svgData.class[data.class] = true; - } - // remove style set by getAttributes - delete svgData.attrs.style; - // combine incoming staticStyle, style with default willChange - svgData.style = { ...data.staticStyle, ...data.style }; - return createElement('svg', svgData, [ - props.title && createElement('title', null, props.title), - ${content.map(convertToVue).join(', ')}, - children, - ]); - }, -};`; - - return source; -} +function createIconComponent(moduleName, { attrs, content }) { + return `import createSVGComponent from './utils.js'; -/** - * Convert the given node to a Vue string source - * @param {object} node - * @returns {string} - */ -function convertToVue(node) { - const { elem, attrs } = node; - return `createElement('${elem}', { attrs: ${JSON.stringify(attrs)} })`; +const attrs = ${JSON.stringify(attrs)}; +const content = ${JSON.stringify(content)}; +const ${moduleName} = createSVGComponent(${moduleName}, ${JSON.stringify( + attrs + )}, ${JSON.stringify(content)}); + +export default ${moduleName}; +`; } module.exports = builder; diff --git a/packages/icon-build-helpers/src/builders/vue/utils.js b/packages/icon-build-helpers/src/builders/vue/utils.js new file mode 100644 index 000000000000..ea912b13f644 --- /dev/null +++ b/packages/icon-build-helpers/src/builders/vue/utils.js @@ -0,0 +1,84 @@ +/** + * Copyright IBM Corp. 2018, 2018 + * + * This source code is licensed under the Apache-2.0 license found in the + * LICENSE file in the root directory of this source tree. + */ + +import { getAttributes } from '@carbon/icon-helpers'; +import { h } from 'vue'; + +const getSvgAttrs = (title, svgAttrs, componentAttrs) => { + return getAttributes({ + ...svgAttrs, + preserveAspectRatio: 'xMidYMid meet', + xmlns: 'http://www.w3.org/2000/svg', + // Special case here, we need to coordinate that we are using title, + // potentially, to get the right focus attributes + title, + ...componentAttrs, + }); +}; + +const getVue2SvgAttrs = (title, svgAttrs, data, listeners) => { + const result = { + attrs: getSvgAttrs(title, svgAttrs, data.attrs), + on: listeners, + style: { ...data.staticStyle, ...data.style }, + }; + + // remove style set by getAttributes + delete result.attrs.style; + + if (data.staticClass || data.class) { + result.class = {}; + + if (data.staticClass) { + result.class[data.staticClass] = true; + } + + if (data.class) { + result.class[data.class] = true; + } + } + + return result; +}; + +const createSVGComponent = (name, svgAttrs, svgContent) => ({ + // We use title as a prop name for the component + // as it is not a valid attribute for an SVG HTML element + props: { title: String }, + name: name, + ...(h + ? { + // Vue 3 component + setup({ title }, { attrs: componentAttrs, slots }) { + return () => + h('svg', getSvgAttrs(title, svgAttrs, componentAttrs), [ + ...(title ? [h('title', title)] : []), + ...svgContent.map(({ elem, attrs }) => h(elem, attrs)), + ...(slots.default ? slots.default() : []), + ]); + }, + } + : { + // Vue 2 component + functional: true, + render(createElement, { props: { title }, children, data, listeners }) { + return createElement( + 'svg', + getVue2SvgAttrs(title, svgAttrs, data, listeners), + [ + ...(title ? [createElement('title', null, title)] : []), + ...svgContent.map(({ elem, attrs }) => + createElement(elem, { attrs: attrs }) + ), + ...(children || []), + ] + ); + }, + }), +}); + +export default createSVGComponent; diff --git a/packages/icons-handlebars/package.json b/packages/icons-handlebars/package.json index 828e6470c443..33045c5b5d54 100644 --- a/packages/icons-handlebars/package.json +++ b/packages/icons-handlebars/package.json @@ -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.24.0-rc.0", + "version": "10.24.0-rc.1", "license": "Apache-2.0", "main": "index.js", "repository": { @@ -27,7 +27,7 @@ }, "dependencies": { "@carbon/icon-helpers": "^10.12.0-rc.0", - "@carbon/icons": "^10.24.0-rc.0" + "@carbon/icons": "^10.24.0-rc.1" }, "devDependencies": { "handlebars": "^4.0.12" diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index e76aa894bb66..0f828a92eb50 100644 --- a/packages/icons-react/package.json +++ b/packages/icons-react/package.json @@ -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.24.0-rc.0", + "version": "10.24.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -40,8 +40,8 @@ "prop-types": "^15.7.2" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.14.0-rc.0", - "@carbon/icons": "^10.24.0-rc.0" + "@carbon/icon-build-helpers": "^0.14.0-rc.1", + "@carbon/icons": "^10.24.0-rc.1" }, "sideEffects": false } diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index f8616add3ca9..b085853c0e0c 100644 --- a/packages/icons-vue/package.json +++ b/packages/icons-vue/package.json @@ -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.24.0-rc.0", + "version": "10.24.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -32,7 +32,7 @@ }, "devDependencies": { "@carbon/cli-reporter": "^10.4.0", - "@carbon/icons": "^10.24.0-rc.0", + "@carbon/icons": "^10.24.0-rc.1", "fs-extra": "^8.1.0", "prettier": "^2.2.1", "rimraf": "^3.0.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index db8500c0fda8..d7877d8e7485 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons", "description": "Icons for digital and software products using the Carbon Design System", - "version": "10.24.0-rc.0", + "version": "10.24.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -39,6 +39,7 @@ }, "devDependencies": { "@carbon/cli": "^10.18.0-rc.0", - "@carbon/icon-build-helpers": "^0.14.0-rc.0" + "@carbon/icon-build-helpers": "^0.14.0-rc.1", + "rimraf": "^3.0.2" } } diff --git a/packages/pictograms-react/package.json b/packages/pictograms-react/package.json index 266e2ac3ba49..a088af2ad17a 100644 --- a/packages/pictograms-react/package.json +++ b/packages/pictograms-react/package.json @@ -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.2.0-rc.0", + "version": "11.2.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -42,8 +42,8 @@ "prop-types": "^15.7.2" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.14.0-rc.0", - "@carbon/pictograms": "^11.2.0-rc.0" + "@carbon/icon-build-helpers": "^0.14.0-rc.1", + "@carbon/pictograms": "^11.2.0-rc.1" }, "sideEffects": false } diff --git a/packages/pictograms/package.json b/packages/pictograms/package.json index 714a966c6aae..724cf610d465 100644 --- a/packages/pictograms/package.json +++ b/packages/pictograms/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms", "description": "Pictograms for digital and software products using the Carbon Design System", - "version": "11.2.0-rc.0", + "version": "11.2.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -31,7 +31,7 @@ "prepublishOnly": "yarn build" }, "devDependencies": { - "@carbon/icon-build-helpers": "^0.14.0-rc.0", + "@carbon/icon-build-helpers": "^0.14.0-rc.1", "rimraf": "^3.0.0" } } diff --git a/packages/react/package.json b/packages/react/package.json index 8ff51da0f5af..5e21584f5ed0 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "carbon-components-react", "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.", - "version": "7.27.0-rc.0", + "version": "7.27.0-rc.4", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -31,6 +31,7 @@ "build": "yarn clean && node scripts/build.js && rollup -c", "build-storybook": "cross-env NODE_ENV=production build-storybook", "clean": "rimraf es lib umd storybook-static build react-docgen.json", + "postinstall": "carbon-telemetry collect --install", "prepublish": "yarn build", "start": "yarn storybook", "storybook": "rimraf node_modules/.cache/storybook && start-storybook -p 9000", @@ -43,7 +44,8 @@ "react-dom": "^16.8.6 || ^17.0.1" }, "dependencies": { - "@carbon/icons-react": "^10.24.0-rc.0", + "@carbon/icons-react": "^10.24.0-rc.1", + "@carbon/telemetry": "0.0.0-alpha.6", "classnames": "2.2.6", "downshift": "5.2.1", "flatpickr": "4.6.1", @@ -83,7 +85,7 @@ "babel-plugin-react-docgen": "^4.0.0", "babel-plugin-transform-inline-environment-variables": "^0.4.0", "browserslist-config-carbon": "^10.6.0", - "carbon-components": "^10.27.0-rc.0", + "carbon-components": "^10.27.0-rc.4", "carbon-icons": "^7.0.5", "chalk": "^2.3.0", "cli-table": "^0.3.0", diff --git a/packages/react/src/components/Search/Search.js b/packages/react/src/components/Search/Search.js index cad1f3aa8b55..0be106360656 100644 --- a/packages/react/src/components/Search/Search.js +++ b/packages/react/src/components/Search/Search.js @@ -140,8 +140,6 @@ export default class Search extends Component { this.setState({ hasContent: evt.target.value !== '', }); - - this.props.onChange(evt); }; handleKeyDown = (evt) => { diff --git a/packages/react/src/components/Tooltip/Tooltip.js b/packages/react/src/components/Tooltip/Tooltip.js index db3a8d4ea62f..3e3ef62fada1 100644 --- a/packages/react/src/components/Tooltip/Tooltip.js +++ b/packages/react/src/components/Tooltip/Tooltip.js @@ -290,6 +290,8 @@ class Tooltip extends Component { _handleUserInputOpenClose = (event, { open }) => { if (this.isControlled) { + // Callback to the parent to let them decide what to do + this.props.onChange(event, { open }); return; } // capture tooltip body element before it is removed from the DOM diff --git a/packages/sketch/package.json b/packages/sketch/package.json index f257b7e45737..b11e18003a56 100644 --- a/packages/sketch/package.json +++ b/packages/sketch/package.json @@ -2,7 +2,7 @@ "name": "@carbon/sketch", "private": true, "description": "Tooling for generating a sketch plugin to bring code to design", - "version": "10.25.0-rc.0", + "version": "10.25.0-rc.2", "license": "Apache-2.0", "repository": { "type": "git", @@ -31,9 +31,9 @@ "@babel/polyfill": "^7.8.7", "@carbon/colors": "^10.19.0-rc.0", "@carbon/icon-helpers": "^10.12.0-rc.0", - "@carbon/icons": "^10.24.0-rc.0", - "@carbon/themes": "^10.26.0-rc.0", - "@carbon/type": "^10.20.0-rc.0", + "@carbon/icons": "^10.24.0-rc.1", + "@carbon/themes": "^10.26.0-rc.1", + "@carbon/type": "^10.20.0-rc.1", "@skpm/builder": "^0.7.0", "color-string": "^1.5.3", "skpm": "^1.2.0" diff --git a/packages/themes/package.json b/packages/themes/package.json index 9434ad577998..2b7aa1432ee9 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/themes", "description": "Themes for applying color in the Carbon Design System", - "version": "10.26.0-rc.0", + "version": "10.26.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -30,7 +30,7 @@ "dependencies": { "@carbon/colors": "^10.19.0-rc.0", "@carbon/layout": "^10.17.0-rc.0", - "@carbon/type": "^10.20.0-rc.0", + "@carbon/type": "^10.20.0-rc.1", "color": "^3.1.2" }, "devDependencies": { diff --git a/packages/type/package.json b/packages/type/package.json index 1224a7c0ef64..2f0adec7c006 100644 --- a/packages/type/package.json +++ b/packages/type/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/type", "description": "Typography for digital and software products using the Carbon Design System", - "version": "10.20.0-rc.0", + "version": "10.20.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/type/src/__tests__/exports-test.js b/packages/type/src/__tests__/exports-test.js index b4c89eef997f..52996224e43c 100644 --- a/packages/type/src/__tests__/exports-test.js +++ b/packages/type/src/__tests__/exports-test.js @@ -22,6 +22,7 @@ describe('type', () => { "getTypeSize", "scale", "fluid", + "unstable_tokens", "styles", "caption01", "label01", @@ -54,7 +55,6 @@ describe('type', () => { "display02", "display03", "display04", - "unstable_tokens", ] `); }); diff --git a/packages/type/src/index.js b/packages/type/src/index.js index baaf8c6afb9f..4452cbf85f90 100644 --- a/packages/type/src/index.js +++ b/packages/type/src/index.js @@ -14,7 +14,7 @@ import * as styles from './styles'; export { fluid } from './fluid'; export * from './styles'; -export * from './tokens'; +export { unstable_tokens } from './tokens'; export { fontFamilies, fontFamily, diff --git a/packages/type/src/tokens.js b/packages/type/src/tokens.js index d28041bc78c2..12ea45942364 100644 --- a/packages/type/src/tokens.js +++ b/packages/type/src/tokens.js @@ -5,36 +5,69 @@ * LICENSE file in the root directory of this source tree. */ +// Unstable tokens +export const caption01 = 'caption01'; +export const label01 = 'label01'; +export const helperText01 = 'helperText01'; +export const bodyShort01 = 'bodyShort01'; +export const bodyLong01 = 'bodyLong01'; +export const bodyShort02 = 'bodyShort02'; +export const bodyLong02 = 'bodyLong02'; +export const code01 = 'code01'; +export const code02 = 'code02'; +export const heading01 = 'heading01'; +export const productiveHeading01 = 'productiveHeading01'; +export const heading02 = 'heading02'; +export const productiveHeading02 = 'productiveHeading02'; +export const productiveHeading03 = 'productiveHeading03'; +export const productiveHeading04 = 'productiveHeading04'; +export const productiveHeading05 = 'productiveHeading05'; +export const productiveHeading06 = 'productiveHeading06'; +export const productiveHeading07 = 'productiveHeading07'; +export const expressiveHeading01 = 'expressiveHeading01'; +export const expressiveHeading02 = 'expressiveHeading02'; +export const expressiveHeading03 = 'expressiveHeading03'; +export const expressiveHeading04 = 'expressiveHeading04'; +export const expressiveHeading05 = 'expressiveHeading05'; +export const expressiveHeading06 = 'expressiveHeading06'; +export const expressiveParagraph01 = 'expressiveParagraph01'; +export const quotation01 = 'quotation01'; +export const quotation02 = 'quotation02'; +export const display01 = 'display01'; +export const display02 = 'display02'; +export const display03 = 'display03'; +export const display04 = 'display04'; + export const unstable_tokens = [ - 'caption01', - 'label01', - 'helperText01', - 'bodyShort01', - 'bodyLong01', - 'bodyShort02', - 'bodyLong02', - 'code01', - 'code02', - 'heading01', - 'productiveHeading01', - 'heading02', - 'productiveHeading02', - 'productiveHeading03', - 'productiveHeading04', - 'productiveHeading05', - 'productiveHeading06', - 'productiveHeading07', - 'expressiveHeading01', - 'expressiveHeading02', - 'expressiveHeading03', - 'expressiveHeading04', - 'expressiveHeading05', - 'expressiveHeading06', - 'expressiveParagraph01', - 'quotation01', - 'quotation02', - 'display01', - 'display02', - 'display03', - 'display04', + caption01, + label01, + helperText01, + bodyShort01, + bodyLong01, + bodyShort02, + bodyLong02, + code01, + code02, + heading01, + productiveHeading01, + heading02, + productiveHeading02, + productiveHeading03, + productiveHeading04, + productiveHeading05, + productiveHeading06, + productiveHeading07, + expressiveHeading01, + expressiveHeading02, + expressiveHeading03, + expressiveHeading04, + expressiveHeading05, + expressiveHeading06, + expressiveParagraph01, + quotation01, + quotation02, + display01, + display02, + display03, + display04, ]; diff --git a/yarn.lock b/yarn.lock index bccbae5fc852..65fd97f5eb5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1619,19 +1619,19 @@ __metadata: languageName: unknown linkType: soft -"@carbon/elements@^10.26.0-rc.0, @carbon/elements@workspace:packages/elements": +"@carbon/elements@^10.26.0-rc.4, @carbon/elements@workspace:packages/elements": version: 0.0.0-use.local resolution: "@carbon/elements@workspace:packages/elements" dependencies: "@carbon/cli": ^10.18.0-rc.0 "@carbon/colors": ^10.19.0-rc.0 "@carbon/grid": ^10.19.0-rc.0 - "@carbon/icons": ^10.24.0-rc.0 + "@carbon/icons": ^10.24.0-rc.1 "@carbon/import-once": ^10.5.0-rc.0 "@carbon/layout": ^10.17.0-rc.0 "@carbon/motion": ^10.12.0-rc.0 - "@carbon/themes": ^10.26.0-rc.0 - "@carbon/type": ^10.20.0-rc.0 + "@carbon/themes": ^10.26.0-rc.1 + "@carbon/type": ^10.20.0-rc.1 fs-extra: ^8.1.0 klaw-sync: ^6.0.0 replace-in-file: ^3.4.2 @@ -1665,7 +1665,7 @@ __metadata: languageName: unknown linkType: soft -"@carbon/icon-build-helpers@^0.14.0-rc.0, @carbon/icon-build-helpers@workspace:packages/icon-build-helpers": +"@carbon/icon-build-helpers@^0.14.0-rc.1, @carbon/icon-build-helpers@workspace:packages/icon-build-helpers": version: 0.0.0-use.local resolution: "@carbon/icon-build-helpers@workspace:packages/icon-build-helpers" dependencies: @@ -1673,6 +1673,8 @@ __metadata: "@babel/preset-react": ^7.10.0 "@carbon/cli-reporter": ^10.4.0 "@carbon/icon-helpers": ^10.12.0-rc.0 + "@rollup/plugin-babel": ^5.2.2 + "@rollup/plugin-replace": ^2.3.4 browserslist-config-carbon: ^10.6.0 change-case: ^4.1.1 core-js: ^3.6.5 @@ -1686,10 +1688,8 @@ __metadata: react: ^16.6.0 react-dom: ^16.6.0 rimraf: ^3.0.0 - rollup: ^1.15.1 - rollup-plugin-babel: ^4.4.0 - rollup-plugin-replace: ^2.2.0 - rollup-plugin-strip-banner: ^0.2.0 + rollup: ^2.36.1 + rollup-plugin-strip-banner: ^2.0.0 svgo: ^1.1.1 languageName: unknown linkType: soft @@ -1710,25 +1710,25 @@ __metadata: languageName: node linkType: hard -"@carbon/icons-handlebars@^10.24.0-rc.0, @carbon/icons-handlebars@workspace:packages/icons-handlebars": +"@carbon/icons-handlebars@^10.24.0-rc.1, @carbon/icons-handlebars@workspace:packages/icons-handlebars": version: 0.0.0-use.local resolution: "@carbon/icons-handlebars@workspace:packages/icons-handlebars" dependencies: "@carbon/icon-helpers": ^10.12.0-rc.0 - "@carbon/icons": ^10.24.0-rc.0 + "@carbon/icons": ^10.24.0-rc.1 handlebars: ^4.0.12 peerDependencies: handlebars: ^4.0.12 languageName: unknown linkType: soft -"@carbon/icons-react@^10.24.0-rc.0, @carbon/icons-react@workspace:packages/icons-react": +"@carbon/icons-react@^10.24.0-rc.1, @carbon/icons-react@workspace:packages/icons-react": version: 0.0.0-use.local resolution: "@carbon/icons-react@workspace:packages/icons-react" dependencies: - "@carbon/icon-build-helpers": ^0.14.0-rc.0 + "@carbon/icon-build-helpers": ^0.14.0-rc.1 "@carbon/icon-helpers": ^10.12.0-rc.0 - "@carbon/icons": ^10.24.0-rc.0 + "@carbon/icons": ^10.24.0-rc.1 prop-types: ^15.7.2 peerDependencies: react: ">=16" @@ -1751,7 +1751,7 @@ __metadata: dependencies: "@carbon/cli-reporter": ^10.4.0 "@carbon/icon-helpers": ^10.12.0-rc.0 - "@carbon/icons": ^10.24.0-rc.0 + "@carbon/icons": ^10.24.0-rc.1 fs-extra: ^8.1.0 prettier: ^2.2.1 rimraf: ^3.0.0 @@ -1760,12 +1760,13 @@ __metadata: languageName: unknown linkType: soft -"@carbon/icons@^10.24.0-rc.0, @carbon/icons@workspace:packages/icons": +"@carbon/icons@^10.24.0-rc.1, @carbon/icons@workspace:packages/icons": version: 0.0.0-use.local resolution: "@carbon/icons@workspace:packages/icons" dependencies: "@carbon/cli": ^10.18.0-rc.0 - "@carbon/icon-build-helpers": ^0.14.0-rc.0 + "@carbon/icon-build-helpers": ^0.14.0-rc.1 + rimraf: ^3.0.2 languageName: unknown linkType: soft @@ -1800,9 +1801,9 @@ __metadata: version: 0.0.0-use.local resolution: "@carbon/pictograms-react@workspace:packages/pictograms-react" dependencies: - "@carbon/icon-build-helpers": ^0.14.0-rc.0 + "@carbon/icon-build-helpers": ^0.14.0-rc.1 "@carbon/icon-helpers": ^10.12.0-rc.0 - "@carbon/pictograms": ^11.2.0-rc.0 + "@carbon/pictograms": ^11.2.0-rc.1 "@carbon/telemetry": 0.0.0-alpha.6 prop-types: ^15.7.2 peerDependencies: @@ -1810,11 +1811,11 @@ __metadata: languageName: unknown linkType: soft -"@carbon/pictograms@^11.2.0-rc.0, @carbon/pictograms@workspace:packages/pictograms": +"@carbon/pictograms@^11.2.0-rc.1, @carbon/pictograms@workspace:packages/pictograms": version: 0.0.0-use.local resolution: "@carbon/pictograms@workspace:packages/pictograms" dependencies: - "@carbon/icon-build-helpers": ^0.14.0-rc.0 + "@carbon/icon-build-helpers": ^0.14.0-rc.1 rimraf: ^3.0.0 languageName: unknown linkType: soft @@ -1834,9 +1835,9 @@ __metadata: "@babel/polyfill": ^7.8.7 "@carbon/colors": ^10.19.0-rc.0 "@carbon/icon-helpers": ^10.12.0-rc.0 - "@carbon/icons": ^10.24.0-rc.0 - "@carbon/themes": ^10.26.0-rc.0 - "@carbon/type": ^10.20.0-rc.0 + "@carbon/icons": ^10.24.0-rc.1 + "@carbon/themes": ^10.26.0-rc.1 + "@carbon/type": ^10.20.0-rc.1 "@skpm/builder": ^0.7.0 color-string: ^1.5.3 cross-env: ^5.2.0 @@ -1881,7 +1882,7 @@ __metadata: languageName: unknown linkType: soft -"@carbon/themes@^10.26.0-rc.0, @carbon/themes@workspace:packages/themes": +"@carbon/themes@^10.26.0-rc.1, @carbon/themes@workspace:packages/themes": version: 0.0.0-use.local resolution: "@carbon/themes@workspace:packages/themes" dependencies: @@ -1891,7 +1892,7 @@ __metadata: "@carbon/layout": ^10.17.0-rc.0 "@carbon/scss-generator": ^10.12.0-rc.0 "@carbon/test-utils": ^10.14.0-rc.0 - "@carbon/type": ^10.20.0-rc.0 + "@carbon/type": ^10.20.0-rc.1 change-case: ^4.1.1 color: ^3.1.2 core-js: ^3.6.5 @@ -1902,7 +1903,7 @@ __metadata: languageName: unknown linkType: soft -"@carbon/type@^10.20.0-rc.0, @carbon/type@workspace:packages/type": +"@carbon/type@^10.20.0-rc.1, @carbon/type@workspace:packages/type": version: 0.0.0-use.local resolution: "@carbon/type@workspace:packages/type" dependencies: @@ -3917,6 +3918,18 @@ __metadata: languageName: node linkType: hard +"@rollup/plugin-replace@npm:^2.3.4": + version: 2.3.4 + resolution: "@rollup/plugin-replace@npm:2.3.4" + dependencies: + "@rollup/pluginutils": ^3.1.0 + magic-string: ^0.25.7 + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + checksum: 97ae11600a959b7668105d9e28801319f9158b01a1d9dbf4f910136491463d8798c1bb1d62e47bf04d5ff08c9c5b3f333aa39ccad57a4e5531d8edaa38ffd74e + languageName: node + linkType: hard + "@rollup/pluginutils@npm:^3.1.0": version: 3.1.0 resolution: "@rollup/pluginutils@npm:3.1.0" @@ -8954,7 +8967,8 @@ __metadata: "@babel/plugin-transform-object-assign": ^7.7.4 "@babel/preset-env": ^7.10.0 "@babel/preset-react": ^7.10.0 - "@carbon/icons-react": ^10.24.0-rc.0 + "@carbon/icons-react": ^10.24.0-rc.1 + "@carbon/telemetry": 0.0.0-alpha.6 "@carbon/test-utils": ^10.14.0-rc.0 "@percy/storybook": ^3.3.1 "@storybook/addon-storysource": ^5.3.19 @@ -8968,7 +8982,7 @@ __metadata: babel-plugin-react-docgen: ^4.0.0 babel-plugin-transform-inline-environment-variables: ^0.4.0 browserslist-config-carbon: ^10.6.0 - carbon-components: ^10.27.0-rc.0 + carbon-components: ^10.27.0-rc.4 carbon-icons: ^7.0.5 chalk: ^2.3.0 classnames: 2.2.6 @@ -9027,7 +9041,7 @@ __metadata: languageName: unknown linkType: soft -"carbon-components@^10.27.0-rc.0, carbon-components@workspace:packages/components": +"carbon-components@^10.27.0-rc.4, carbon-components@workspace:packages/components": version: 0.0.0-use.local resolution: "carbon-components@workspace:packages/components" dependencies: @@ -9040,9 +9054,10 @@ __metadata: "@babel/preset-react": ^7.10.0 "@babel/runtime": ^7.10.0 "@carbon/cli": ^10.18.0-rc.0 - "@carbon/elements": ^10.26.0-rc.0 - "@carbon/icons-handlebars": ^10.24.0-rc.0 - "@carbon/icons-react": ^10.24.0-rc.0 + "@carbon/elements": ^10.26.0-rc.4 + "@carbon/icons-handlebars": ^10.24.0-rc.1 + "@carbon/icons-react": ^10.24.0-rc.1 + "@carbon/telemetry": 0.0.0-alpha.6 "@carbon/test-utils": ^10.14.0-rc.0 "@frctl/fractal": ^1.1.0 adaro: 1.0.4 @@ -13439,13 +13454,6 @@ __metadata: languageName: node linkType: hard -"estree-walker@npm:^0.3.0": - version: 0.3.1 - resolution: "estree-walker@npm:0.3.1" - checksum: 20a1a9833ef81e4d39ec3ed04c7d47a2f618e41c330d639d6bc4544b3355c230e32e8b65ebd587e953f03259348efbd9886cb8b3a10b7add6762e7fbec80d804 - languageName: node - linkType: hard - "estree-walker@npm:^0.6.0, estree-walker@npm:^0.6.1": version: 0.6.1 resolution: "estree-walker@npm:0.6.1" @@ -21209,15 +21217,6 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:0.19.1": - version: 0.19.1 - resolution: "magic-string@npm:0.19.1" - dependencies: - vlq: ^0.2.1 - checksum: eabaf9b175907e024d36eea0ac0687e73f5477e570e3bf37bf243e5e91e96560bceb557015aa7aacd2f456e3eec19fd890b3f8800d5f8a2013819f4c804d5bd0 - languageName: node - linkType: hard - "magic-string@npm:0.25.4": version: 0.25.4 resolution: "magic-string@npm:0.25.4" @@ -21826,7 +21825,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^2.1.5, micromatch@npm:^2.3.11": +"micromatch@npm:^2.1.5": version: 2.3.11 resolution: "micromatch@npm:2.3.11" dependencies: @@ -27489,17 +27488,6 @@ resolve@1.1.x: languageName: node linkType: hard -"rollup-plugin-strip-banner@npm:^0.2.0": - version: 0.2.0 - resolution: "rollup-plugin-strip-banner@npm:0.2.0" - dependencies: - extract-banner: 0.1.2 - magic-string: 0.19.1 - rollup-pluginutils: 2.0.1 - checksum: ba6dab339b576b3c237af2b05131b07483fa83ad19cd904c1d99ec2d7562af63ce53505429331529908ff520aad9004d1e8d1a1dee9b123ebb96db550c467184 - languageName: node - linkType: hard - "rollup-plugin-strip-banner@npm:^1.0.0": version: 1.0.0 resolution: "rollup-plugin-strip-banner@npm:1.0.0" @@ -27545,16 +27533,6 @@ resolve@1.1.x: languageName: node linkType: hard -"rollup-pluginutils@npm:2.0.1": - version: 2.0.1 - resolution: "rollup-pluginutils@npm:2.0.1" - dependencies: - estree-walker: ^0.3.0 - micromatch: ^2.3.11 - checksum: 40f9e1af99944199752ad6438f763d37fa2efd4fc8063dc48ccd812f48b469cd2b8418e895b4d9c43ed48675213806c88958a382430a7b6ce845018cc44b4a9c - languageName: node - linkType: hard - "rollup-pluginutils@npm:2.8.2, rollup-pluginutils@npm:^2.6.0, rollup-pluginutils@npm:^2.8.1": version: 2.8.2 resolution: "rollup-pluginutils@npm:2.8.2" @@ -32617,13 +32595,6 @@ resolve@1.1.x: languageName: node linkType: hard -"vlq@npm:^0.2.1": - version: 0.2.3 - resolution: "vlq@npm:0.2.3" - checksum: 48055a9675a8f58c7e78f02707d0e9daa25a7eacbe49d2b215bf35c05eca6399d4ad645c51a512d05c0acd138fb4c003a0e3534a71338f0f2f634a3746d2f03f - languageName: node - linkType: hard - "vm-browserify@npm:^1.0.1": version: 1.1.2 resolution: "vm-browserify@npm:1.1.2"