Merge branch 'main' into 9879-more-bidi

.all-contributorsrc

@@ -839,6 +839,15 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "Kman316",
+      "name": "Cathal Kenneally",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25666525?v=4",
+      "profile": "https://github.com/Kman316",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitConvention": "none"

.github/ISSUE_TEMPLATE/ACCESSIBILITY_ISSUE.yaml

@@ -66,6 +66,12 @@ body:
       placeholder: e.g. v10.42.0
     validations:
       required: true
+  - type: input
+    id: react-version
+    attributes:
+      label: React version
+      description: 'Which React version are you using?'
+      placeholder: e.g. v17.0.2
   - type: input
     id: tool
     attributes:

.github/ISSUE_TEMPLATE/BUG_REPORT.yaml

@@ -53,6 +53,12 @@ body:
       placeholder: e.g. v10.42.0
     validations:
       required: true
+  - type: input
+    id: react-version
+    attributes:
+      label: React version
+      description: 'Which React version are you using?'
+      placeholder: e.g. v17.0.2
   - type: textarea
     id: description
     attributes:

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Run yarn dedupe
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Install dependencies
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Install dependencies
@@ -51,10 +51,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
-      - uses: actions/cache@v2.1.6
+      - uses: actions/cache@v2.1.7
         id: cache
         with:
           path: |
@@ -77,10 +77,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
-      - uses: actions/cache@v2.1.6
+      - uses: actions/cache@v2.1.7
         id: cache
         with:
           path: |
@@ -113,10 +113,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
-      - uses: actions/cache@v2.1.6
+      - uses: actions/cache@v2.1.7
         id: cache
         with:
           path: |

.github/workflows/deploy-react-storybook.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Install dependencies

.github/workflows/deploy-vanilla-devenv.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Install dependencies

.github/workflows/nightly-release.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Install dependencies

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/sync-generated-files.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v2.4.1
+        uses: actions/setup-node@v2.5.0
         with:
           node-version: '14.x'
       - name: Install dependencies

README.md

@@ -193,6 +193,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/motou"><img src="https://avatars.githubusercontent.com/u/1215956?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zhen Wang</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=motou" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=motou" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Kman316"><img src="https://avatars.githubusercontent.com/u/25666525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cathal Kenneally</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kman316" title="Code">💻</a></td>
   </tr>
 </table>
 

config/eslint-config-carbon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-carbon",
   "description": "ESLint configuration for Carbon",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {
@@ -38,7 +38,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-cypress": "^2.11.3",
     "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-jest": "^25.3.0",
     "eslint-plugin-jsdoc": "^36.0.3",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.4.0",

config/eslint-config-carbon/plugins/jest.js

@@ -28,7 +28,7 @@ module.exports = {
         ],
 
         // Enforce lowercase test names
-        'jest/lowercase-name': 'off',
+        'jest/prefer-lowercase-title': 'off',
 
         // Disallow alias methods
         'jest/no-alias-methods': 'error',
@@ -108,11 +108,8 @@ module.exports = {
         // Suggest using toStrictEqual()
         'jest/prefer-strict-equal': 'off',
 
-        // Suggest using toBeNull()
-        'jest/prefer-to-be-null': 'off',
-
-        // Suggest using toBeUndefined()
-        'jest/prefer-to-be-undefined': 'off',
+        // Suggest using toBe() for primitive literals
+        'jest/prefer-to-be': 'off',
 
         // Suggest using toContain()
         'jest/prefer-to-contain': 'off',
@@ -130,7 +127,7 @@ module.exports = {
         'jest/require-top-level-describe': 'off',
 
         // Enforce valid describe() callback
-        'jest/valid-describe': 'error',
+        'jest/valid-describe-callback': 'error',
 
         // Enforce valid expect() usage
         'jest/valid-expect': 'error',

jest.config.js

@@ -14,6 +14,8 @@ module.exports = {
     '!packages/{cli,components,sketch}/**',
     '!packages/**/{examples,stories}/**',
     '!**/*-story.js',
+    '!**/*.stories.js',
+    '!**/*-test.e2e.js',
   ],
   reporters: ['default', 'jest-junit'],
 };

package.json

@@ -11,7 +11,8 @@
     "actions/*",
     "codemods",
     "config/*",
-    "packages/*"
+    "packages/*",
+    "www"
   ],
   "scripts": {
     "build": "lerna run build --stream --prefix --npm-client yarn",
@@ -20,7 +21,7 @@
     "doctoc": "doctoc --title '## Table of Contents'",
     "format": "prettier --write '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**'",
     "format:diff": "prettier --list-different '**/*.{js,md,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**' '!packages/components/**'",
-    "lint": "eslint actions config codemods packages",
+    "lint": "eslint actions config codemods packages www",
     "lint:styles": "stylelint '**/*.{css,scss}' --report-needless-disables --report-invalid-scope-disables",
     "sync": "carbon-cli sync",
     "test": "cross-env BABEL_ENV=test jest",

packages/carbon-react/.storybook/styles.scss

@@ -5,12 +5,7 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-@use '../index.scss' as styles with (
-  $css--font-face: true,
-  $css--plex-arabic: true,
-);
-@use '../scss/components/button';
-@use '../scss/components/tag';
+@use '../index.scss' as styles;
 
 :root {
   @include styles.theme(styles.$white);
@@ -31,16 +26,3 @@
 body {
   background: styles.$background;
 }
-
-html[lang='en'] body {
-  font-family: 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif;
-}
-
-html[lang='ar'] body {
-  font-family: 'IBM Plex Sans Arabic', 'Helvetica Neue', Arial, sans-serif;
-}
-
-.text-mono {
-  font-family: 'IBM Plex Mono', Menlo, 'DejaVu Sans Mono',
-    'Bitstream Vera Sans Mono', Courier, monospace;
-}

packages/carbon-react/__tests__/index-test.js

@@ -74,6 +74,7 @@ Array [
   "HeaderNavigation",
   "HeaderPanel",
   "HeaderSideNavItems",
+  "IconButton",
   "IconSkeleton",
   "InlineLoading",
   "InlineNotification",

packages/carbon-react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "0.9.0",
+  "version": "0.10.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.43.0",
-    "@carbon/styles": "^0.9.0",
+    "@carbon/icons-react": "^10.44.0",
+    "@carbon/styles": "^0.10.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
-    "carbon-components": "^10.48.0",
-    "carbon-components-react": "^7.48.0",
+    "carbon-components": "^10.49.0",
+    "carbon-components-react": "^7.49.0",
     "carbon-icons": "^7.0.7"
   },
   "devDependencies": {

packages/carbon-react/scss/fonts/_index.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts';

packages/carbon-react/scss/fonts/_mono.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/mono';

packages/carbon-react/scss/fonts/_sans-arabic.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/sans-arabic';

packages/carbon-react/scss/fonts/_sans-devanagari.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/sans-devanagari';

packages/carbon-react/scss/fonts/_sans-hebrew.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/sans-hebrew';

packages/carbon-react/scss/fonts/_sans-thai-looped.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/sans-thai-looped';

packages/carbon-react/scss/fonts/_sans-thai.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/sans-thai';

packages/carbon-react/scss/fonts/_sans.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/sans';

packages/carbon-react/scss/fonts/_serif.scss

@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// 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.
+//
+
+@forward '@carbon/styles/scss/fonts/serif';