Merge branch 'main' into actionable-notification-close-layout-bug

config/jest-config-carbon/package.json

@@ -2,7 +2,7 @@
   "name": "jest-config-carbon",
   "private": true,
   "description": "Jest configuration and preset for Carbon",
-  "version": "0.9.0-rc.0",
+  "version": "0.9.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

packages/carbon-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "0.6.0-rc.0",
+  "version": "0.6.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -43,11 +43,11 @@
   },
   "dependencies": {
     "@carbon/feature-flags": "^0.6.0",
-    "@carbon/icons-react": "^10.39.0",
-    "@carbon/styles": "^0.6.0-rc.0",
+    "@carbon/icons-react": "^10.40.0",
+    "@carbon/styles": "^0.6.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
-    "carbon-components": "^10.45.0-rc.0",
-    "carbon-components-react": "^7.45.0-rc.0",
+    "carbon-components": "^10.45.0",
+    "carbon-components-react": "^7.45.0",
     "carbon-icons": "^7.0.7"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "@babel/plugin-transform-react-constant-elements": "^7.14.5",
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-react": "^7.14.5",
-    "@carbon/themes": "^10.44.0-rc.0",
+    "@carbon/themes": "^10.44.0",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",

packages/carbon-react/src/components/Tag/Tag.stories.js

@@ -42,6 +42,30 @@ export const Default = () => {
       <Tag className="some-class" type="gray" size="sm" title="Clear Filter">
         {'Tag content'}
       </Tag>
+      <Tag
+        className="some-class"
+        type="cool-gray"
+        size="sm"
+        title="Clear Filter">
+        {'Tag content'}
+      </Tag>
+      <Tag
+        className="some-class"
+        type="warm-gray"
+        size="sm"
+        title="Clear Filter">
+        {'Tag content'}
+      </Tag>
+      <Tag
+        className="some-class"
+        type="high-contrast"
+        size="sm"
+        title="Clear Filter">
+        {'Tag content'}
+      </Tag>
+      <Tag className="some-class" type="outline" size="sm" title="Clear Filter">
+        {'Tag content'}
+      </Tag>
     </>
   );
 };

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"

packages/cli/src/workspace.js

@@ -11,23 +11,26 @@ const execa = require('execa');
 const fs = require('fs-extra');
 const glob = require('fast-glob');
 const path = require('path');
-const packageJson = require('../../../package.json');
-
-const WORKSPACE_ROOT = path.resolve(__dirname, '../../../');
-const packagePaths = glob
-  .sync(packageJson.workspaces.map((pattern) => `${pattern}/package.json`))
-  .map((match) => {
-    const packageJsonPath = path.join(WORKSPACE_ROOT, match);
-    return {
-      packageJsonPath,
-      packageJson: fs.readJsonSync(packageJsonPath),
-      packagePath: path.dirname(packageJsonPath),
-      packageFolder: path.relative(
-        WORKSPACE_ROOT,
-        path.dirname(packageJsonPath)
-      ),
-    };
-  });
+
+const { root: ROOT_DIR } = path.parse(__dirname);
+const WORKSPACE_ROOT = getProjectRoot(__dirname);
+const packageJson = fs.readJsonSync(path.join(WORKSPACE_ROOT, 'package.json'));
+const packagePaths = Array.isArray(packageJson.workspaces)
+  ? glob
+      .sync(packageJson.workspaces.map((pattern) => `${pattern}/package.json`))
+      .map((match) => {
+        const packageJsonPath = path.join(WORKSPACE_ROOT, match);
+        return {
+          packageJsonPath,
+          packageJson: fs.readJsonSync(packageJsonPath),
+          packagePath: path.dirname(packageJsonPath),
+          packageFolder: path.relative(
+            WORKSPACE_ROOT,
+            path.dirname(packageJsonPath)
+          ),
+        };
+      })
+  : [];
 
 const env = {
   root: {
@@ -54,6 +57,53 @@ async function getPackages() {
   return JSON.parse(lernaListOutput).filter((pkg) => !pkg.private);
 }
 
+/**
+ * Returns the root directory of a project, either as a workspace root with a
+ * collection of packages or a single project with a `package.json`
+ * @param {string} directory
+ * @returns {string}
+ */
+function getProjectRoot(directory) {
+  const packageJsonPaths = ancestors(directory).filter((directory) => {
+    return fs.existsSync(path.join(directory, 'package.json'));
+  });
+
+  const rootDirectory =
+    packageJsonPaths.length > 0
+      ? packageJsonPaths[packageJsonPaths.length - 1]
+      : null;
+
+  if (!rootDirectory) {
+    throw new Error(
+      `Unable to find a \`package.json\` file from directory: ${directory}`
+    );
+  }
+
+  return rootDirectory;
+}
+
+/**
+ * Returns an array of the the directory and its ancestors
+ * @param {string} directory
+ * @returns {Array<string>}
+ */
+function ancestors(directory) {
+  const result = [directory];
+  let current = directory;
+
+  while (current !== '') {
+    result.push(current);
+
+    if (current !== ROOT_DIR) {
+      current = path.dirname(current);
+    } else {
+      current = '';
+    }
+  }
+
+  return result;
+}
+
 module.exports = {
   workspace,
   getPackages,

packages/colors/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/colors",
   "description": "Colors for digital and software products using the Carbon Design System",
-  "version": "10.32.0",
+  "version": "10.33.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -36,7 +36,7 @@
     "clean": "rimraf css es lib umd scss index.scss"
   },
   "devDependencies": {
-    "@carbon/cli": "^10.29.0",
+    "@carbon/cli": "^10.30.0",
     "@carbon/cli-reporter": "^10.5.0",
     "@carbon/scss-generator": "^10.13.0",
     "@carbon/test-utils": "^10.19.0",

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.45.0-rc.0",
+  "version": "10.45.0",
   "license": "Apache-2.0",
   "main": "umd/index.js",
   "module": "es/index.js",
@@ -80,10 +80,10 @@
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-react": "^7.14.5",
     "@babel/runtime": "^7.14.6",
-    "@carbon/cli": "^10.29.0",
-    "@carbon/elements": "^10.44.0-rc.0",
-    "@carbon/icons-handlebars": "^10.39.0",
-    "@carbon/icons-react": "^10.39.0",
+    "@carbon/cli": "^10.30.0",
+    "@carbon/elements": "^10.44.0",
+    "@carbon/icons-handlebars": "^10.40.0",
+    "@carbon/icons-react": "^10.40.0",
     "@carbon/test-utils": "^10.19.0",
     "@frctl/fractal": "^1.1.0",
     "@rollup/plugin-babel": "^5.3.0",

packages/components/src/components/accordion/_accordion.scss

@@ -158,11 +158,15 @@
 
   .#{$prefix}--accordion--start .#{$prefix}--accordion__arrow {
     // Alters `$accordion-arrow-margin` token:
-    margin: 2px 0 0 $carbon--spacing-03;
+    margin: 2px 0 0 $carbon--spacing-05;
+  }
+
+  .#{$prefix}--accordion--start .#{$prefix}--accordion__title {
+    margin-right: $carbon--spacing-05;
   }
 
   .#{$prefix}--accordion--start .#{$prefix}--accordion__content {
-    margin-left: $carbon--spacing-06;
+    margin-left: $carbon--spacing-07;
   }
 
   .#{$prefix}--accordion__item--collapsing .#{$prefix}--accordion__content,