Merge pull request #942 from carbon-design-system/dev

chore: publish `v1.40`

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Also refer to [contributing in Carbon](https://github.com/carbon-design-system/carbon/blob/master/.github/CONTRIBUTING.md).
+Also refer to [contributing in Carbon](https://github.com/carbon-design-system/carbon/blob/main/.github/CONTRIBUTING.md).
 
 ## 1. Fork the repo
 

.storybook/index.js

@@ -7,19 +7,23 @@ import { LIBRARY } from '../src/components/LayoutModules/stories';
 
 // Category labels.
 const CATEGORIES = {
+  CARBON: 'Carbon',
   COMPONENTS: 'Components',
   DEPRECATED: 'Deprecated',
   LAYOUT_MODULES: 'Layout modules',
   PAGE_LAYOUTS: 'Page layouts (Canary)',
   PATTERNS: 'Patterns',
+  SECURITY: 'Security',
 };
 
 const {
+  CARBON,
   COMPONENTS,
   DEPRECATED,
   LAYOUT_MODULES,
   PAGE_LAYOUTS,
   PATTERNS,
+  SECURITY,
 } = CATEGORIES;
 
 const ORDER = [
@@ -28,6 +32,7 @@ const ORDER = [
   PAGE_LAYOUTS,
   PATTERNS,
   COMPONENTS,
+  [SECURITY, CARBON],
   DEPRECATED,
 ];
 
@@ -45,6 +50,13 @@ const getCategory = (categoryName, storyName) => `${categoryName}/${storyName}`;
  */
 const bindCategory = categoryName => getCategory.bind(this, categoryName);
 
+/**
+ * Returns a formatted string for the Carbon components category.
+ * @param {string} storyName The story name to format.
+ * @returns {string} The formatted Carbon component category and story name.
+ */
+const getCarbonCategory = bindCategory(getCategory(COMPONENTS, CARBON));
+
 /**
  * Returns a formatted string for the components category.
  * @param {string} storyName The story name to format.
@@ -80,6 +92,13 @@ const getPageLayoutsCategory = bindCategory(PAGE_LAYOUTS);
  */
 const getPatternsCategory = bindCategory(PATTERNS);
 
+/**
+ * Returns a formatted string for the Security components category.
+ * @param {string} storyName The story name to format.
+ * @returns {string} The formatted Security component category and story name.
+ */
+const getSecurityCategory = bindCategory(getCategory(COMPONENTS, SECURITY));
+
 /**
  * Configuration for disabling the centering addon.
  * @returns {Object<string, Object>} The disabled configuration.
@@ -135,12 +154,14 @@ Also refer to http://${library}.carbondesignsystem.com/?path=/docs/${group}-${st
 export {
   disableCentered,
   disableCenteredStories,
+  getCarbonCategory as carbon,
   getComponentsCategory as components,
   getDeprecatedCategory as deprecated,
   getDocsParameters,
   getLayoutModulesCategory as layoutModules,
   getPageLayoutsCategory as pageLayouts,
   getPatternsCategory as patterns,
+  getSecurityCategory as security,
   info,
   ORDER,
 };

README.md

@@ -22,15 +22,15 @@ If you only want to try out Carbon for IBM Security, you can also use
 
 If you're trying to find something specific, here's a full list of packages that we support!
 
-| Package name                                                                                             | Description                          |
-| -------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [`carbon-components`](https://github.com/carbon-design-system/carbon/tree/master/packages/components)    | Carbon component styles              |
-| [`carbon-components-react`](https://github.com/carbon-design-system/carbon/tree/master/packages/react)   | Carbon React components              |
-| [`@carbon/colors`](https://github.com/carbon-design-system/carbon/tree/master/packages/colors)           | Work with IBM Design Language colors |
-| [`@carbon/grid`](https://github.com/carbon-design-system/carbon/tree/master/packages/grid)               | Build layouts using the grid system  |
-| [`@carbon/icons-react`](https://github.com/carbon-design-system/carbon/tree/master/packages/icons-react) | Iconography assets                   |
-| [`@carbon/layout`](https://github.com/carbon-design-system/carbon/tree/master/packages/layout)           | Layout-based units and spacing scale |
-| [`@carbon/type`](https://github.com/carbon-design-system/carbon/tree/master/packages/type)               | Type tokens used alongside IBM Plex  |
+| Package name                                                                                           | Description                          |
+| ------------------------------------------------------------------------------------------------------ | ------------------------------------ |
+| [`carbon-components`](https://github.com/carbon-design-system/carbon/tree/main/packages/components)    | Carbon component styles              |
+| [`carbon-components-react`](https://github.com/carbon-design-system/carbon/tree/main/packages/react)   | Carbon React components              |
+| [`@carbon/colors`](https://github.com/carbon-design-system/carbon/tree/main/packages/colors)           | Work with IBM Design Language colors |
+| [`@carbon/grid`](https://github.com/carbon-design-system/carbon/tree/main/packages/grid)               | Build layouts using the grid system  |
+| [`@carbon/icons-react`](https://github.com/carbon-design-system/carbon/tree/main/packages/icons-react) | Iconography assets                   |
+| [`@carbon/layout`](https://github.com/carbon-design-system/carbon/tree/main/packages/layout)           | Layout-based units and spacing scale |
+| [`@carbon/type`](https://github.com/carbon-design-system/carbon/tree/main/packages/type)               | Type tokens used alongside IBM Plex  |
 
 To install Carbon for IBM Security in your project, you'll need to run one of the following commands using a package manager:
 
@@ -89,7 +89,7 @@ $security--feature-flags: (
 @import '@carbon/ibm-security/scss/components/ComponentName/index';
 ```
 
-Also refer to [feature flags in Carbon](https://github.com/carbon-design-system/carbon/blob/master/packages/components/src/globals/scss/_feature-flags.scss).
+Also refer to [feature flags in Carbon](https://github.com/carbon-design-system/carbon/blob/main/packages/components/src/globals/scss/_feature-flags.scss).
 
 ### CSS
 
@@ -99,14 +99,19 @@ To add all of the components' processed and minified styles, reference `@carbon/
 
 - [Contributing](.github/CONTRIBUTING.md): Guidelines for making contributions to this repo
 - [Migration Guides](docs/migration)
-  - [`v1` to `v2`](docs/migration/migrate-to-2.x.md)
+  - [`carbon-addons-security` to `@carbon/ibm-security`](docs/migration/carbon-for-ibm-security/README.md)
+  - [`v1` to `v2`](docs/migration/2.x/README.md)
 - [Storybook](docs/storybook.md)
 - [Themes](docs/themes)
 
 ## Contributing
 
-We're always looking for contributors to help us fix bugs, build new features, or help us improve the project documentation. If you're interested, definitely check out our [Contributing Guide](/.github/CONTRIBUTING.md) and [Carbon's Developer Guide](https://github.com/carbon-design-system/carbon/tree/master/docs/developer-handbook.md).
+We're always looking for contributors to help us fix bugs, build new features, or help us improve the project documentation. If you're interested, definitely check out our [Contributing Guide](/.github/CONTRIBUTING.md) and [Carbon's Developer Guide](https://github.com/carbon-design-system/carbon/tree/main/docs/developer-handbook.md).
 
 ## License
 
 Licensed under the [Apache License, Version 2.0](./LICENSE).
+
+## Telemetry
+
+This project [collects product dependency information for IBM and Carbon Design System properties](https://www.carbondesignsystem.com/help/faq/#telemetry).

docs/g11n.md

@@ -1,4 +1,4 @@
 # Notes on globalization
 
 - Some components, such as `DataDecorator` support a `labels` prop that provide the ability to pass an object allowing the default strings of the component to be overwritten - A [global configuration](https://github.com/carbon-design-system/ibm-security/blob/master/src/globals/nls.js) is available that outlines support for overriding default component options
-- Also refer to [g11n considerations in Carbon](https://github.com/carbon-design-system/carbon/blob/master/packages/react/docs/g11n.md)
+- Also refer to [g11n considerations in Carbon](https://github.com/carbon-design-system/carbon/blob/main/packages/react/docs/g11n.md)

docs/migration/2.x/README.md

@@ -0,0 +1,15 @@
+# `2.x` migration
+
+## Elements
+
+| Name   | `2.x`                |
+| ------ | -------------------- |
+| Color  | [Migrate](color.md)  |
+| Themes | [Migrate](themes.md) |
+
+## Components
+
+| Name            | `2.x`                                                             |
+| --------------- | ----------------------------------------------------------------- |
+| `Portal`        | [Migrate](../../../src/components/Portal/migration/2.x.md)        |
+| `StepIndicator` | [Migrate](../../../src/components/StepIndicator/migration/2.x.md) |

docs/migration/2.x/color.md

@@ -0,0 +1,7 @@
+# Colors
+
+## Variables
+
+| `1.x`                             | `2.x`       |
+| --------------------------------- | ----------- |
+| `$security-color__gray-90--hover` | `$hover-ui` |

docs/migration/2.x/themes.md

@@ -0,0 +1,13 @@
+# Themes
+
+### Functions
+
+| `1.x`   | `2.x`                            |
+| ------- | -------------------------------- |
+| `theme` | [Themes](../../themes/README.md) |
+
+### Variables
+
+| `1.x`              | `2.x`                            |
+| ------------------ | -------------------------------- |
+| `$security--theme` | [Themes](../../themes/README.md) |

docs/migration/carbon-for-ibm-security/README.md

@@ -0,0 +1,43 @@
+# `@carbon/ibm-security` migration
+
+## Process
+
+1. Remove the `registry=` entry from your `.npmrc`
+2. Remove the `@ibmduo:registry=` entry from your `.npmrc`
+3. Run `yarn cache clean` and `npm cache verify` to clear old Artifactory references from your global Yarn cache and verify the integrity of the npm cache
+4. Address any of the changes relevant to you from the tables below
+
+### Optional
+
+Remove any `@ibmduo`-scoped packages if they're listed as a dependency
+
+## Elements
+
+| Name   | `@carbon/ibm-security` |
+| ------ | ---------------------- |
+| Color  | [Migrate](color.md)    |
+| Grid   | [Migrate](grid.md)     |
+| Layout | [Migrate](layout.md)   |
+| Type   | [Migrate](type.md)     |
+
+## Components
+
+| Name                  | `@carbon/ibm-security`                                                                |
+| --------------------- | ------------------------------------------------------------------------------------- |
+| `Breadcrumb`          | [Migrate](../../../src/components/Breadcrumb/migration/carbon-for-ibm-security.md)    |
+| `Button`              | [Migrate](../../../src/components/Button/migration/carbon-for-ibm-security.md)        |
+| `CallToActionSection` | Removed                                                                               |
+| `DataDecorator`       | [Migrate](../../../src/components/DataDecorator/migration/carbon-for-ibm-security.md) |
+| `DataTable`           | [Migrate](../../../src/components/DataTable/migration/carbon-for-ibm-security.md)     |
+| `Header`              | [Migrate](../../../src/components/Header/migration/carbon-for-ibm-security.md)        |
+| `Icon`                | [Migrate](../../../src/components/Icon/migration/carbon-for-ibm-security.md)          |
+| `IconButton`          | [Migrate](../../../src/components/IconButton/migration/carbon-for-ibm-security.md)    |
+| `InlineNotification`  | [Migrate](../../../src/components/Notification/migration/carbon-for-ibm-security.md)  |
+| `Loading`             | [Migrate](../../../src/components/Loading/migration/carbon-for-ibm-security.md)       |
+| `MultiSelect`         | [Migrate](../../../src/components/MultiSelect/migration/carbon-for-ibm-security.md)   |
+| `Pagination`          | [Migrate](../../../src/components/Pagination/migration/carbon-for-ibm-security.md)    |
+| `Panel`               | [Migrate](../../../src/components/Panel/migration/carbon-for-ibm-security.md)         |
+| `Search`              | [Migrate](../../../src/components/Search/migration/carbon-for-ibm-security.md)        |
+| `Tag`                 | [Migrate](../../../src/components/Tag/migration/carbon-for-ibm-security.md)           |
+| `TextInput`           | [Migrate](../../../src/components/TextInput/migration/carbon-for-ibm-security.md)     |
+| `TypeLayout`          | [Migrate](../../../src/components/TypeLayout/migration/carbon-for-ibm-security.md)    |

docs/migration/2.x-color.md → docs/migration/carbon-for-ibm-security/color.md

@@ -1,18 +1,18 @@
 # Colors
 
-Also refer to [migration in Carbon](https://github.com/carbon-design-system/carbon/blob/master/docs/migration/10.x-color.md).
+Also refer to [migration in Carbon](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/10.x-color.md).
 
 ## Migrating
 
 ### Imports
 
-| `1.x`                                     | `2.x`                                                      |
+| `carbon-addons-security`                  | `@carbon/ibm-security`                                     |
 | ----------------------------------------- | ---------------------------------------------------------- |
 | `import { white } from '@ibmduo/colors';` | `import { white } from '@carbon/colors';`                  |
 | `@import '@ibmduo/colors/**/*';`          | `@import '@carbon/ibm-security/scss/globals/color/index';` |
 
 ### Variables
 
-| `1.x`                                      | `2.x`                           |
+| `carbon-addons-security`                   | `@carbon/ibm-security`          |
 | ------------------------------------------ | ------------------------------- |
 | `$ibm-colors__white` / `$ibm-color__white` | `$carbon--white-0` / `$white-0` |

docs/migration/2.x-grid.md → docs/migration/carbon-for-ibm-security/grid.md

@@ -1,14 +1,14 @@
 # Grid
 
-The existing grid specification will be deprecated in the next major version in favor of [Carbon's grid](https://github.com/carbon-design-system/carbon/tree/master/packages/grid#usage).
+The existing grid specification will be deprecated in the next major version in favor of [Carbon's grid](https://github.com/carbon-design-system/carbon/tree/main/packages/grid#usage).
 
-Also refer to [migration in Carbon](https://github.com/carbon-design-system/carbon/blob/master/docs/migration/10.x-grid.md).
+Also refer to [migration in Carbon](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/10.x-grid.md).
 
 ## Migrating
 
 ### Imports
 
-| `1.x`                          | `2.x`                                                     |
+| `carbon-addons-security`       | `@carbon/ibm-security`                                    |
 | ------------------------------ | --------------------------------------------------------- |
 | `@import '@ibmduo/grid/**/*';` | `@import '@carbon/ibm-security/scss/globals/grid/index';` |
 

docs/migration/2.x-layout.md → docs/migration/carbon-for-ibm-security/layout.md

@@ -1,18 +1,18 @@
 # Layout
 
-Also refer to [migration in Carbon](https://github.com/carbon-design-system/carbon/blob/master/docs/migration/10.x-layout.md).
+Also refer to [migration in Carbon](https://github.com/carbon-design-system/carbon/blob/main/docs/migration/10.x-layout.md).
 
 ## Migrating
 
 ### Imports
 
-| `1.x`                                                                              | `2.x`                                                       |
+| `carbon-addons-security`                                                           | `@carbon/ibm-security`                                      |
 | ---------------------------------------------------------------------------------- | ----------------------------------------------------------- |
 | `import { spacing } from '@ibm-security/carbon-addons-security/lib/scss-exports';` | `import { spacing } from '@carbon/layout';`                 |
 | `@import '@ibmduo/grid/**/*';`                                                     | `@import '@carbon/ibm-security/scss/globals/layout/index';` |
 
 ### Functions
 
-| `1.x`                           | `2.x`                        |
+| `carbon-addons-security`        | `@carbon/ibm-security`       |
 | ------------------------------- | ---------------------------- |
 | `get-fixed-size($unitQuantity)` | `carbon--mini-units($count)` |