Merge branch 'main' into 12896

.github/workflows/github-repo-stats.yml

@@ -16,4 +16,4 @@ jobs:
         # Use latest release.
         uses: jgehrcke/github-repo-stats@RELEASE
         with:
-          ghtoken: ${{ secrets.ghrs_github_api_token }}
+          ghtoken: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

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

@@ -33,6 +33,14 @@ module.exports = {
     'react/jsx-no-useless-fragment': 2,
     'react/no-typos': 2,
     'react/sort-prop-types': 2,
+    'react/forbid-component-props': [
+      2,
+      { forbid: [{ propName: 'style', message: 'Avoid using style prop' }] },
+    ],
+    'react/forbid-dom-props': [
+      2,
+      { forbid: [{ propName: 'style', message: 'Avoid using style prop' }] },
+    ],
 
     // react-hooks
     'react-hooks/rules-of-hooks': 2,
@@ -77,6 +85,16 @@ module.exports = {
       rules: {
         'react/display-name': 0,
         'react/prop-types': 0,
+        'react/forbid-component-props': 0,
+        'react/forbid-dom-props': 0,
+      },
+    },
+    // style prop is fine to be used in internal unit testing
+    {
+      files: ['*.e2e.js'],
+      rules: {
+        'react/forbid-component-props': 0,
+        'react/forbid-dom-props': 0,
       },
     },
 

docs/guides/adding-component-types.md

@@ -92,8 +92,19 @@ the repository. There is an issue tracking curring status of this effort,
 - Change extension to `.tsx` via git (do not simply rename)
   - e.g.
     `git mv packages/react/src/components/ComponentName/ComponentName.js packages/react/src/components/ComponentName/ComponentName.tsx`
-- Copying the proptypes def to above the component definition
+- Copy the proptypes def to above the component definition
 - Retool the proptypes to be a ts interface
+- Look for any
+  [legacy types for the component, previously provided via DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/carbon-components-react/lib/components)
+  - Copy these legacy types over to your working file and use them as a starting
+    point.
+  - NOTE: If there are legacy types available, these were originally provided
+    for `[email protected]` and may be out of date.
+  - Even still, it would be best to have as much parity as possible between
+    legacy types for `[email protected]` and the new typings we're
+    providing for `@carbon/[email protected]`.
+  - After copying them over to your working file, ensure the legacy types don't
+    require any updates to match the current component proptypes specification.
 - Fix errors as they appear
 - Do not add types to internal components or functions that are not exported as
   part of the Public API.

examples/codesandbox-styles/package.json

@@ -1,15 +1,15 @@
 {
   "name": "codesandbox-styles",
   "private": true,
-  "version": "0.23.0",
+  "version": "0.24.0-rc.0",
   "scripts": {
     "develop": "vite"
   },
   "devDependencies": {
     "vite": "^2.8.0"
   },
   "dependencies": {
-    "@carbon/styles": "^1.20.0",
+    "@carbon/styles": "^1.21.0-rc.0",
     "sass": "^1.51.0"
   }
 }

examples/codesandbox-with-sass-compilation/package.json

@@ -1,9 +1,9 @@
 {
   "name": "codesandbox-with-sass-compilation",
-  "version": "0.21.0",
+  "version": "0.22.0-rc.0",
   "private": true,
   "dependencies": {
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/codesandbox/package.json

@@ -1,9 +1,9 @@
 {
   "name": "codesandbox",
-  "version": "0.21.0",
+  "version": "0.22.0-rc.0",
   "private": true,
   "dependencies": {
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/custom-theme/package.json

@@ -1,14 +1,14 @@
 {
   "name": "custom-theme",
   "private": true,
-  "version": "0.18.0",
+  "version": "0.19.0-rc.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

examples/incremental-migration/package.json

@@ -1,7 +1,7 @@
 {
   "name": "incremental-migration",
   "private": true,
-  "version": "0.20.0",
+  "version": "0.21.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@carbon/icons-react": "^10.49.0",
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "carbon-components": "^10.57.0",
     "carbon-components-react": "^7.57.0",
     "carbon-icons": "^7.0.7",

examples/light-dark-mode/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-light-dark",
   "private": true,
-  "version": "0.18.0",
+  "version": "0.19.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "next": "12.1.4",
     "react": "18.0.0",
     "react-dom": "18.0.0"

examples/nextjs/package.json

@@ -1,15 +1,15 @@
 {
   "name": "examples-nextjs",
   "private": true,
-  "version": "0.20.0",
+  "version": "0.21.0-rc.0",
   "scripts": {
     "build": "next build",
     "dev": "next dev",
     "lint": "next lint",
     "start": "next start"
   },
   "dependencies": {
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "next": "12.1.4",
     "react": "18.0.0",
     "react-dom": "18.0.0"

examples/vite/package.json

@@ -1,14 +1,14 @@
 {
   "name": "vite",
   "private": true,
-  "version": "0.18.0",
+  "version": "0.19.0-rc.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@carbon/react": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

package.json

@@ -74,7 +74,7 @@
     "prettier": "^2.7.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "rimraf": "^3.0.0",
+    "rimraf": "^4.0.0",
     "stylelint": "^14.3.0"
   },
   "commitlint": {

packages/carbon-components-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": "8.20.0",
+  "version": "8.21.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,8 +39,8 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/react": "^1.20.0",
-    "@carbon/styles": "^1.20.0",
+    "@carbon/react": "^1.21.0-rc.0",
+    "@carbon/styles": "^1.21.0-rc.0",
     "@carbon/telemetry": "0.1.0"
   },
   "devDependencies": {
@@ -61,7 +61,7 @@
     "fs-extra": "^10.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.0.0",
     "rollup": "^2.79.1",
     "rollup-plugin-strip-banner": "^2.0.0"
   },

packages/carbon-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": "11.20.0",
+  "version": "11.21.0-rc.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -40,13 +40,13 @@
     "sass": "^1.33.0"
   },
   "dependencies": {
-    "@carbon/styles": "^1.20.0",
+    "@carbon/styles": "^1.21.0-rc.0",
     "@carbon/telemetry": "0.1.0"
   },
   "devDependencies": {
     "@carbon/test-utils": "^10.26.0",
     "fs-extra": "^10.0.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.0.0",
     "sass": "^1.51.0"
   },
   "sideEffects": [

packages/colors/package.json

@@ -42,7 +42,7 @@
     "@carbon/test-utils": "^10.26.0",
     "change-case": "^4.1.1",
     "fs-extra": "^10.0.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^4.0.0"
   },
   "sideEffects": false,
   "eyeglass": {

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": "11.17.0",
+  "version": "11.18.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -37,17 +37,17 @@
   "dependencies": {
     "@carbon/colors": "^11.11.0",
     "@carbon/grid": "^11.10.0",
-    "@carbon/icons": "^11.14.0",
+    "@carbon/icons": "^11.15.0-rc.0",
     "@carbon/layout": "^11.10.0",
     "@carbon/motion": "^11.8.0",
-    "@carbon/themes": "^11.15.0",
+    "@carbon/themes": "^11.16.0-rc.0",
     "@carbon/type": "^11.14.0"
   },
   "devDependencies": {
     "@carbon/cli": "^11.8.0",
     "fs-extra": "^10.0.0",
     "klaw-sync": "^6.0.0",
     "replace-in-file": "^3.4.2",
-    "rimraf": "^3.0.0"
+    "rimraf": "^4.0.0"
   }
 }

packages/feature-flags/package.json

@@ -44,7 +44,7 @@
     "change-case": "^4.1.2",
     "fs-extra": "^10.0.0",
     "js-yaml": "^3.14.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.0.0",
     "rollup": "^2.79.1",
     "rollup-plugin-strip-banner": "^2.0.0"
   },

packages/grid/package.json

@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@carbon/cli": "^11.8.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^4.0.0"
   },
   "eyeglass": {
     "exports": false,

packages/icon-build-helpers/package.json

@@ -44,7 +44,7 @@
     "prop-types": "^15.6.2",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
-    "rimraf": "^3.0.0",
+    "rimraf": "^4.0.0",
     "rollup": "^2.79.1",
     "rollup-plugin-strip-banner": "^2.0.0",
     "svg-parser": "^2.0.4",

packages/icon-helpers/package.json

@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@carbon/cli": "^11.8.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^4.0.0"
   },
   "sideEffects": false
 }

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": "11.14.0",
+  "version": "11.15.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -42,8 +42,8 @@
   },
   "devDependencies": {
     "@carbon/icon-build-helpers": "^1.9.0",
-    "@carbon/icons": "^11.14.0",
-    "rimraf": "^3.0.2"
+    "@carbon/icons": "^11.15.0-rc.0",
+    "rimraf": "^4.0.0"
   },
   "sideEffects": false
 }

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.63.0",
+  "version": "10.64.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -32,10 +32,10 @@
   },
   "devDependencies": {
     "@carbon/cli-reporter": "^10.5.0",
-    "@carbon/icons": "^11.14.0",
+    "@carbon/icons": "^11.15.0-rc.0",
     "fs-extra": "^10.0.0",
     "prettier": "^2.7.1",
-    "rimraf": "^3.0.0",
+    "rimraf": "^4.0.0",
     "rollup": "^2.79.1",
     "vue": "^2.6.8"
   },

packages/icons/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons",
   "description": "Icons for digital and software products using the Carbon Design System",
-  "version": "11.14.0",
+  "version": "11.15.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -40,6 +40,6 @@
   "devDependencies": {
     "@carbon/cli": "^11.8.0",
     "@carbon/icon-build-helpers": "^1.9.0",
-    "rimraf": "^3.0.2"
+    "rimraf": "^4.0.0"
   }
 }

packages/layout/package.json

@@ -33,6 +33,6 @@
     "@carbon/scss-generator": "^10.15.0",
     "@carbon/test-utils": "^10.26.0",
     "core-js": "^3.16.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^4.0.0"
   }
 }