diff --git a/.yarn/cache/rimraf-npm-4.0.7-78bdaf661f-294ae52619.zip b/.yarn/cache/rimraf-npm-4.0.7-78bdaf661f-294ae52619.zip new file mode 100644 index 000000000000..ed5cee64181c Binary files /dev/null and b/.yarn/cache/rimraf-npm-4.0.7-78bdaf661f-294ae52619.zip differ diff --git a/config/eslint-config-carbon/plugins/react.js b/config/eslint-config-carbon/plugins/react.js index 71ab2fc0e531..1276582e0ca1 100644 --- a/config/eslint-config-carbon/plugins/react.js +++ b/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, }, }, diff --git a/package.json b/package.json index aab1c1457466..841529a2010a 100644 --- a/package.json +++ b/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": { diff --git a/packages/carbon-components-react/package.json b/packages/carbon-components-react/package.json index fc0df366b266..225156d2fc35 100644 --- a/packages/carbon-components-react/package.json +++ b/packages/carbon-components-react/package.json @@ -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" }, diff --git a/packages/carbon-components/package.json b/packages/carbon-components/package.json index 5ee6eaaeed60..26daa9c6272a 100644 --- a/packages/carbon-components/package.json +++ b/packages/carbon-components/package.json @@ -46,7 +46,7 @@ "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": [ diff --git a/packages/colors/package.json b/packages/colors/package.json index eff720d1c105..fac7546d16db 100644 --- a/packages/colors/package.json +++ b/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": { diff --git a/packages/elements/package.json b/packages/elements/package.json index 6ca5d041ff53..0b23cd2efb0e 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -48,6 +48,6 @@ "fs-extra": "^10.0.0", "klaw-sync": "^6.0.0", "replace-in-file": "^3.4.2", - "rimraf": "^3.0.0" + "rimraf": "^4.0.0" } } diff --git a/packages/feature-flags/package.json b/packages/feature-flags/package.json index e682afcc28b1..daa321f1776a 100644 --- a/packages/feature-flags/package.json +++ b/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" }, diff --git a/packages/grid/package.json b/packages/grid/package.json index 2dab9cf05bdf..1c80183e7ae6 100644 --- a/packages/grid/package.json +++ b/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, diff --git a/packages/icon-build-helpers/package.json b/packages/icon-build-helpers/package.json index 8459cba0d49f..655e1cabe409 100644 --- a/packages/icon-build-helpers/package.json +++ b/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", diff --git a/packages/icon-helpers/package.json b/packages/icon-helpers/package.json index e9b5c499b021..1f4209a497c4 100644 --- a/packages/icon-helpers/package.json +++ b/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 } diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index 01f00d04f76d..6ca41a0fd9c4 100644 --- a/packages/icons-react/package.json +++ b/packages/icons-react/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@carbon/icon-build-helpers": "^1.9.0", "@carbon/icons": "^11.15.0-rc.0", - "rimraf": "^3.0.2" + "rimraf": "^4.0.0" }, "sideEffects": false } diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index e46cf51e4fd9..1a7c1110476e 100644 --- a/packages/icons-vue/package.json +++ b/packages/icons-vue/package.json @@ -35,7 +35,7 @@ "@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" }, diff --git a/packages/icons/package.json b/packages/icons/package.json index 6477403f9f57..1e1c6609e0b6 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -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" } } diff --git a/packages/layout/package.json b/packages/layout/package.json index 3d924bd12d52..322055815d28 100644 --- a/packages/layout/package.json +++ b/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" } } diff --git a/packages/motion/package.json b/packages/motion/package.json index f5582704f290..48f15f896270 100644 --- a/packages/motion/package.json +++ b/packages/motion/package.json @@ -29,6 +29,6 @@ }, "devDependencies": { "@carbon/cli": "^11.8.0", - "rimraf": "^3.0.0" + "rimraf": "^4.0.0" } } diff --git a/packages/pictograms/package.json b/packages/pictograms/package.json index fa6a0baf777e..b8f98dd10b47 100644 --- a/packages/pictograms/package.json +++ b/packages/pictograms/package.json @@ -32,6 +32,6 @@ }, "devDependencies": { "@carbon/icon-build-helpers": "^1.9.0", - "rimraf": "^3.0.0" + "rimraf": "^4.0.0" } } diff --git a/packages/react/package.json b/packages/react/package.json index 15416e27867b..f71182b5cd9c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -111,7 +111,7 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "requestanimationframe": "^0.0.23", - "rimraf": "^3.0.2", + "rimraf": "^4.0.0", "rollup": "^2.79.1", "rollup-plugin-strip-banner": "^2.0.0", "rtlcss": "^4.0.0", diff --git a/packages/react/src/components/FocusScope/index.js b/packages/react/src/components/FocusScope/index.js index 038c431b7ab2..58abad96e84f 100644 --- a/packages/react/src/components/FocusScope/index.js +++ b/packages/react/src/components/FocusScope/index.js @@ -89,6 +89,7 @@ function FocusScopeBumper(props) { return ( ( // eslint-disable-next-line react/prop-types export const StoryFrame = ({ children }) => ( + // eslint-disable-next-line react/forbid-dom-props
{children} diff --git a/packages/react/src/components/Stack/Stack.js b/packages/react/src/components/Stack/Stack.js index 23c9b0fca0ef..9447b8c371b5 100644 --- a/packages/react/src/components/Stack/Stack.js +++ b/packages/react/src/components/Stack/Stack.js @@ -59,6 +59,7 @@ const Stack = React.forwardRef(function Stack(props, ref) { } return ( + // eslint-disable-next-line react/forbid-component-props {children} diff --git a/packages/sketch/package.json b/packages/sketch/package.json index 959b9f62fb88..5fa309240b23 100644 --- a/packages/sketch/package.json +++ b/packages/sketch/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "cross-env": "^7.0.0", - "rimraf": "^3.0.0" + "rimraf": "^4.0.0" }, "skpm": { "name": "Carbon Elements", diff --git a/packages/styles/package.json b/packages/styles/package.json index c8db43a45dc5..191413a237d8 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -50,7 +50,7 @@ "lodash.isequal": "^4.5.0", "postcss": "^8.4.14", "postcss-flexbugs-fixes": "^5.0.2", - "rimraf": "^3.0.2", + "rimraf": "^4.0.0", "sass": "^1.51.0" }, "sideEffects": [ diff --git a/packages/styles/scss/__tests__/type-test.js b/packages/styles/scss/__tests__/type-test.js index d7f670e357d2..b3b81035b054 100644 --- a/packages/styles/scss/__tests__/type-test.js +++ b/packages/styles/scss/__tests__/type-test.js @@ -83,6 +83,30 @@ describe('@carbon/styles/scss/type', () => { "display-02", "display-03", "display-04", + "legal-01", + "legal-02", + "body-compact-01", + "body-compact-02", + "heading-compact-01", + "heading-compact-02", + "body-01", + "body-02", + "heading-03", + "heading-04", + "heading-05", + "heading-06", + "heading-07", + "fluid-heading-03", + "fluid-heading-04", + "fluid-heading-05", + "fluid-heading-06", + "fluid-paragraph-01", + "fluid-quotation-01", + "fluid-quotation-02", + "fluid-display-01", + "fluid-display-02", + "fluid-display-03", + "fluid-display-04", "font-families", "font-weights", "tokens", diff --git a/packages/styles/scss/type/_index.scss b/packages/styles/scss/type/_index.scss index bcfb9129d702..00964e95bef2 100644 --- a/packages/styles/scss/type/_index.scss +++ b/packages/styles/scss/type/_index.scss @@ -51,6 +51,32 @@ $display-02, $display-03, $display-04, + // V11 Tokens + $legal-01, + $legal-02, + $body-compact-01, + $body-compact-02, + $heading-compact-01, + $heading-compact-02, + $body-01, + $body-02, + $heading-03, + $heading-04, + $heading-05, + $heading-06, + $heading-07, + $fluid-heading-03, + $fluid-heading-04, + $fluid-heading-05, + $fluid-heading-06, + $fluid-paragraph-01, + $fluid-quotation-01, + $fluid-quotation-02, + $fluid-display-01, + $fluid-display-02, + $fluid-display-03, + $fluid-display-04, + // others $font-families, $font-weights, $tokens; diff --git a/packages/themes/package.json b/packages/themes/package.json index 4e059f0d42d5..c1c94b8287b4 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -45,7 +45,7 @@ "core-js": "^3.16.0", "fs-extra": "^10.0.0", "js-yaml": "^3.13.0", - "rimraf": "^3.0.0" + "rimraf": "^4.0.0" }, "sideEffects": false } diff --git a/packages/type/package.json b/packages/type/package.json index a38af6ec942b..c4b52fad3210 100644 --- a/packages/type/package.json +++ b/packages/type/package.json @@ -45,7 +45,7 @@ "@carbon/test-utils": "^10.26.0", "change-case": "^4.1.1", "css": "^3.0.0", - "rimraf": "^3.0.0" + "rimraf": "^4.0.0" }, "eyeglass": { "exports": false, diff --git a/packages/type/scss/_styles.scss b/packages/type/scss/_styles.scss index ec9f7b7c6297..d907034c9da3 100644 --- a/packages/type/scss/_styles.scss +++ b/packages/type/scss/_styles.scss @@ -696,7 +696,7 @@ $tokens: ( fluid-display-02: $fluid-display-02, fluid-display-03: $fluid-display-03, fluid-display-04: $fluid-display-04, -); +) !default; /// @param {Map} $map /// @access public diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json index 50e742916238..db35834c7713 100644 --- a/packages/upgrade/package.json +++ b/packages/upgrade/package.json @@ -50,7 +50,7 @@ "memfs": "^3.4.0", "nanoid": "^3.1.30", "npm-which": "^3.0.1", - "rimraf": "^3.0.2", + "rimraf": "^4.0.0", "semver": "^7.3.5", "yargs": "^17.0.1" }, diff --git a/www/package.json b/www/package.json index b96d5d221e3f..ed9683e2196f 100644 --- a/www/package.json +++ b/www/package.json @@ -39,7 +39,7 @@ "devDependencies": { "fast-glob": "^3.2.7", "lodash.merge": "^4.6.2", - "rimraf": "^3.0.2", + "rimraf": "^4.0.0", "semver": "^7.3.5" } } diff --git a/www/src/pages/insights/[owner]/[repo].js b/www/src/pages/insights/[owner]/[repo].js index b5768e96cdc3..c4bc163552dc 100644 --- a/www/src/pages/insights/[owner]/[repo].js +++ b/www/src/pages/insights/[owner]/[repo].js @@ -154,6 +154,7 @@ export default function InsightPage(props) { {formatChange(sprint.issues.states.open.change)} + {/* eslint-disable-next-line react/forbid-component-props */} @@ -165,6 +166,7 @@ export default function InsightPage(props) { {closedLabel} + {/* eslint-disable-next-line react/forbid-component-props */} diff --git a/yarn.lock b/yarn.lock index 0382637bdf51..0a0f4ec7a28e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1818,7 +1818,7 @@ __metadata: "@carbon/test-utils": ^10.26.0 change-case: ^4.1.1 fs-extra: ^10.0.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -1837,7 +1837,7 @@ __metadata: fs-extra: ^10.0.0 klaw-sync: ^6.0.0 replace-in-file: ^3.4.2 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -1856,7 +1856,7 @@ __metadata: 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 languageName: unknown @@ -1875,7 +1875,7 @@ __metadata: dependencies: "@carbon/cli": ^11.8.0 "@carbon/layout": ^11.10.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -1905,7 +1905,7 @@ __metadata: 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 @@ -1919,7 +1919,7 @@ __metadata: resolution: "@carbon/icon-helpers@workspace:packages/icon-helpers" dependencies: "@carbon/cli": ^11.8.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -1932,7 +1932,7 @@ __metadata: "@carbon/icons": ^11.15.0-rc.0 "@carbon/telemetry": 0.1.0 prop-types: ^15.7.2 - rimraf: ^3.0.2 + rimraf: ^4.0.0 peerDependencies: react: ">=16" languageName: unknown @@ -1960,7 +1960,7 @@ __metadata: "@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 languageName: unknown @@ -1972,7 +1972,7 @@ __metadata: dependencies: "@carbon/cli": ^11.8.0 "@carbon/icon-build-helpers": ^1.9.0 - rimraf: ^3.0.2 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -1985,7 +1985,7 @@ __metadata: "@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 languageName: unknown linkType: soft @@ -2001,7 +2001,7 @@ __metadata: resolution: "@carbon/motion@workspace:packages/motion" dependencies: "@carbon/cli": ^11.8.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -2024,7 +2024,7 @@ __metadata: resolution: "@carbon/pictograms@workspace:packages/pictograms" dependencies: "@carbon/icon-build-helpers": ^1.9.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -2095,7 +2095,7 @@ __metadata: react-dom: ^17.0.2 react-is: ^17.0.2 requestanimationframe: ^0.0.23 - rimraf: ^3.0.2 + rimraf: ^4.0.0 rollup: ^2.79.1 rollup-plugin-strip-banner: ^2.0.0 rtlcss: ^4.0.0 @@ -2139,7 +2139,7 @@ __metadata: core-js: ^3.16.0 cross-env: ^7.0.0 regenerator-runtime: ^0.13.7 - rimraf: ^3.0.0 + rimraf: ^4.0.0 skpm: ^1.2.0 languageName: unknown linkType: soft @@ -2164,7 +2164,7 @@ __metadata: lodash.isequal: ^4.5.0 postcss: ^8.4.14 postcss-flexbugs-fixes: ^5.0.2 - rimraf: ^3.0.2 + rimraf: ^4.0.0 sass: ^1.51.0 peerDependencies: sass: ^1.33.0 @@ -2213,7 +2213,7 @@ __metadata: core-js: ^3.16.0 fs-extra: ^10.0.0 js-yaml: ^3.13.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -2227,7 +2227,7 @@ __metadata: "@carbon/test-utils": ^10.26.0 change-case: ^4.1.1 css: ^3.0.0 - rimraf: ^3.0.0 + rimraf: ^4.0.0 languageName: unknown linkType: soft @@ -2250,7 +2250,7 @@ __metadata: memfs: ^3.4.0 nanoid: ^3.1.30 npm-which: ^3.0.1 - rimraf: ^3.0.2 + rimraf: ^4.0.0 semver: ^7.3.5 yargs: ^17.0.1 bin: @@ -11207,7 +11207,7 @@ __metadata: 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 peerDependencies: @@ -11237,7 +11237,7 @@ __metadata: "@carbon/telemetry": 0.1.0 "@carbon/test-utils": ^10.26.0 fs-extra: ^10.0.0 - rimraf: ^3.0.2 + rimraf: ^4.0.0 sass: ^1.51.0 peerDependencies: sass: ^1.33.0 @@ -11290,7 +11290,7 @@ __metadata: 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 languageName: unknown linkType: soft @@ -28211,6 +28211,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"rimraf@npm:^4.0.0": + version: 4.0.7 + resolution: "rimraf@npm:4.0.7" + bin: + rimraf: dist/cjs/src/bin.js + checksum: 294ae526198eadac7b57e7b43782aaa0be5d5c2a606ee65c26d9cd2fdddc320d80cc43c3c1c0b9562e88aa265f67c4c00f70af2b4d065e76ce03d9d7a2a5c901 + languageName: node + linkType: hard + "rimraf@npm:~2.6.2": version: 2.6.3 resolution: "rimraf@npm:2.6.3" @@ -33517,7 +33526,7 @@ resolve@^2.0.0-next.3: prop-types: ^15.7.2 react: ^17.0.2 react-dom: ^17.0.2 - rimraf: ^3.0.2 + rimraf: ^4.0.0 sass: ^1.51.0 semver: ^7.3.5 languageName: unknown