Merge branch 'main' into toggled-knob

.github/ISSUE_TEMPLATE/BUG_REPORT.yaml

@@ -29,6 +29,7 @@ body:
         - '@carbon/motion'
         - '@carbon/pictograms'
         - '@carbon/pictograms-react'
+        - '@carbon/react'
         - '@carbon/themes'
         - '@carbon/type'
         - '@carbon/upgrade'

.github/dependabot.yml

@@ -5,9 +5,3 @@ updates:
     directory: '/'
     schedule:
       interval: 'daily'
-
-  # Maintain dependencies for npm
-  - package-ecosystem: 'npm'
-    directory: '/'
-    schedule:
-      interval: 'daily'

.github/renovate.json5

@@ -12,7 +12,7 @@
     // https://docs.renovatebot.com/presets-npm/#npmunpublishsafe
     "npm:unpublishSafe",
 
-    // https://docs.renovatebot.com/presets-schedule/#scheduleearlymondays
-    "schedule:earlyMondays"
+    // https://docs.renovatebot.com/presets-schedule/#scheduledaily
+    "schedule:daily"
   ]
 }

.github/workflows/release.yml

@@ -10,6 +10,7 @@ jobs:
   build:
     name: Create Release
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v2
 

package.json

@@ -53,8 +53,8 @@
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
     "all-contributors-cli": "^6.19.0",
-    "cross-env": "^5.2.0",
-    "cross-spawn": "^6.0.5",
+    "cross-env": "^7.0.0",
+    "cross-spawn": "^7.0.0",
     "doctoc": "^1.4.0",
     "eslint": "^7.28.0",
     "fs-extra": "^10.0.0",

packages/carbon-react/.storybook/Welcome/Welcome.js

@@ -18,8 +18,8 @@ export const Welcome = () => {
         background: `url(${bg}) no-repeat center center fixed`,
         backgroundSize: 'cover',
       }}>
-      <h2 className="welcome__heading">Carbon Components</h2>
-      <h4 className="welcome__heading welcome__heading--subtitle">{`React v${PackageInfo.version}`}</h4>
+      <h2 className="welcome__heading">@carbon/react</h2>
+      <h4 className="welcome__heading welcome__heading--subtitle">{`v${PackageInfo.version}`}</h4>
     </div>
   );
 };

packages/carbon-react/.storybook/preview.js

@@ -40,7 +40,7 @@ export const globalTypes = {
     description: 'Set the global theme for displaying components',
     defaultValue: 'white',
     toolbar: {
-      icon: 'circlehollow',
+      icon: 'paintbrush',
       items: ['white', 'g10', 'g90', 'g100'],
     },
   },

packages/carbon-react/.storybook/theme.js

@@ -6,52 +6,19 @@
  */
 
 import { create } from '@storybook/theming';
-import { g10 } from '@carbon/themes';
 import PackageInfo from './../package.json';
 
-const {
-  field01,
-  interactive01,
-  selectedUI,
-  text01,
-  inverse01,
-  ui01,
-  ui03,
-  uiBackground,
-} = g10;
-
+/**
+ * @see https://storybook.js.org/docs/react/configure/theming
+ */
 export default create({
   base: 'light',
 
-  colorPrimary: interactive01,
-  colorSecondary: selectedUI,
-
-  // UI
-  appBg: uiBackground,
-  appContentBg: ui01,
-  appBorderColor: ui03,
-  appBorderRadius: 0,
-
   // Typography
   fontBase: "'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif",
   fontCode:
     "'IBM Plex Mono', Menlo, 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', Courier, monospace",
 
-  // Text colors
-  textColor: text01,
-  textInverseColor: inverse01,
-
-  // Toolbar default and active colors
-  barTextColor: text01,
-  barSelectedColor: interactive01,
-  barBg: uiBackground,
-
-  // Form colors
-  inputBg: field01,
-  inputBorder: ui03,
-  inputTextColor: text01,
-  inputBorderRadius: 0,
-
   brandTitle: `@carbon/react@${PackageInfo.version}`,
   brandUrl:
     'https://github.com/carbon-design-system/carbon/tree/main/packages/carbon-react',

packages/carbon-react/package.json

@@ -60,8 +60,8 @@
     "@babel/preset-react": "^7.16.7",
     "@carbon/themes": "^10.50.0",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
+    "@rollup/plugin-commonjs": "^21.0.0",
+    "@rollup/plugin-node-resolve": "^13.0.0",
     "@storybook/addon-a11y": "^6.4.9",
     "@storybook/addon-actions": "^6.4.9",
     "@storybook/addon-docs": "^6.4.9",

packages/carbon-react/tasks/build-styles.js

@@ -549,6 +549,20 @@ async function build() {
           },
         ],
       },
+      {
+        type: 'directory',
+        filepath: 'utilities',
+        files: [
+          {
+            type: 'file',
+            filepath: '_convert.scss',
+          },
+          {
+            type: 'file',
+            filepath: '_z-index.scss',
+          },
+        ],
+      },
     ],
   };
   const files = collect(styles);

packages/cli/package.json

@@ -29,8 +29,8 @@
     "@octokit/plugin-throttling": "^2.6.0",
     "@octokit/rest": "^16.28.1",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
+    "@rollup/plugin-commonjs": "^21.0.0",
+    "@rollup/plugin-node-resolve": "^13.0.0",
     "chalk": "^4.1.1",
     "change-case": "^4.1.2",
     "child-process-promise": "^2.2.1",
@@ -44,7 +44,7 @@
     "markdown-toc": "^1.2.0",
     "prettier": "^2.2.1",
     "prettier-config-carbon": "^0.6.0",
-    "progress-estimator": "^0.2.2",
+    "progress-estimator": "^0.3.0",
     "remark": "^10.0.1",
     "replace-in-file": "^6.1.0",
     "rollup": "^2.46.0",

packages/colors/examples/sass-modules/yarn.lock

@@ -91,7 +91,7 @@
     to-fast-properties "^2.0.0"
 
 "@carbon/colors@file:../..":
-  version "10.17.0"
+  version "10.35.0"
 
 "@hapi/[email protected]":
   version "5.0.1"
@@ -409,6 +409,14 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -792,7 +800,7 @@ [email protected]:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-[email protected], "chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
+[email protected], chokidar@^3.4.1:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
   integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==
@@ -807,6 +815,21 @@ [email protected], "chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.1.2"
 
+"chokidar@>=3.0.0 <4.0.0":
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -1664,6 +1687,11 @@ fsevents@~2.1.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -1703,6 +1731,13 @@ glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -1860,6 +1895,11 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+immutable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
+  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3071,6 +3111,13 @@ readdirp@~3.5.0:
   dependencies:
     picomatch "^2.2.1"
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 regenerator-runtime@^0.13.4:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
@@ -3198,12 +3245,14 @@ [email protected]:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.29.0:
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.29.0.tgz#ec4e1842c146d8ea9258c28c141b8c2b7c6ab7f1"
-  integrity sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==
+sass@^1.36.0:
+  version "1.49.7"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49"
+  integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==
   dependencies:
-    chokidar ">=2.0.0 <4.0.0"
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
 scheduler@^0.20.1:
   version "0.20.1"
@@ -3328,9 +3377,9 @@ simple-concat@^1.0.0:
   integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
 
 simple-get@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
-  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55"
+  integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==
   dependencies:
     decompress-response "^4.2.0"
     once "^1.3.1"
@@ -3387,6 +3436,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+"source-map-js@>=0.6.2 <2.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"

packages/components/package.json

@@ -84,9 +84,9 @@
     "@carbon/test-utils": "^10.21.0",
     "@frctl/fractal": "^1.1.0",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^2.4.2",
+    "@rollup/plugin-commonjs": "^21.0.0",
+    "@rollup/plugin-node-resolve": "^13.0.0",
+    "@rollup/plugin-replace": "^3.0.0",
     "@rollup/plugin-virtual": "^2.0.3",
     "adaro": "1.0.4",
     "autoprefixer": "^9.7.4",
@@ -103,10 +103,10 @@
     "classnames": "^2.2.0",
     "commander": "^2.13.0",
     "core-js": "^3.16.0",
-    "cross-env": "^5.2.0",
+    "cross-env": "^7.0.0",
     "css-loader": "^3.4.2",
     "custom-event": "^1.0.0",
-    "del": "~2.0.2",
+    "del": "~6.0.0",
     "diff": "^5.0.0",
     "express-handlebars": "^5.2.1",
     "fancy-log": "^1.3.0",