Merge branch 'master' into 7200-JAWS-batch-action-bar

.all-contributorsrc

@@ -755,6 +755,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "guigueb",
+      "name": "Bill Guigue",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/5973642?v=4",
+      "profile": "https://github.com/guigueb",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitConvention": "none"

README.md

@@ -180,6 +180,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
     <td align="center"><a href="https://github.com/IgnasA"><img src="https://avatars.githubusercontent.com/u/7099068?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ignas Ausiejus</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=IgnasA" title="Documentation">📖</a></td>
     <td align="center"><a href="https://ryanomackey.com/"><img src="https://avatars.githubusercontent.com/u/17710824?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan O. Mackey</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ryanomackey" title="Code">💻</a></td>
     <td align="center"><a href="http://www.skateman.eu/"><img src="https://avatars.githubusercontent.com/u/649130?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Halász Dávid</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=skateman" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/guigueb"><img src="https://avatars1.githubusercontent.com/u/5973642?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bill Guigue</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=guigueb" title="Code">💻</a></td>
   </tr>
 </table>
 

codemods/package.json

@@ -18,6 +18,7 @@
     "react"
   ],
   "dependencies": {
+    "@babel/preset-env": "^7.12.13",
     "jscodeshift": "^0.11.0"
   }
 }

config/eslint-config-carbon/base.js

@@ -9,7 +9,11 @@
 
 module.exports = {
   parser: 'babel-eslint',
-  extends: ['eslint:recommended', require.resolve('./plugins/jsdoc')],
+  extends: [
+    'eslint:recommended',
+    require.resolve('./rules/best-practices'),
+    require.resolve('./plugins/jsdoc'),
+  ],
   rules: {
     // Handle cases where we are destructuring but may not be using the initial
     // variables

config/eslint-config-carbon/package.json

@@ -42,5 +42,8 @@
     "eslint-plugin-react": "^7.18.0",
     "eslint-plugin-react-hooks": "^4.0.4",
     "eslint-restricted-globals": "^0.2.0"
+  },
+  "devDependencies": {
+    "prettier": "^2.2.1"
   }
 }

config/eslint-config-carbon/rules/best-practices.js

@@ -0,0 +1,15 @@
+/**
+ * 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.
+ */
+
+'use strict';
+
+module.exports = {
+  rules: {
+    // @see https://eslint.org/docs/rules/curly
+    curly: 'error',
+  },
+};

config/jest-config-carbon/package.json

@@ -35,5 +35,9 @@
     "enzyme-adapter-react-16": "^1.14.0",
     "enzyme-to-json": "^3.3.5",
     "jest-circus": "^26.0.1"
+  },
+  "devDependencies": {
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   }
 }

config/storybook-preset-carbon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "storybook-preset-carbon",
   "private": true,
-  "version": "0.2.0-rc.0",
+  "version": "0.2.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

config/stylelint-config-carbon/package.json

@@ -35,6 +35,7 @@
     "stylelint-scss": "^3.13.0"
   },
   "devDependencies": {
+    "prettier": "^2.2.1",
     "stylelint": "^13.6.0"
   }
 }

docs/migration/11.x-themes.md

@@ -0,0 +1,21 @@
+# Motion
+
+**Note: everything in this file is a work-in-progress and will be changed.**
+
+## Changes
+
+| Filename           | v10                     | v11                                        |
+| ------------------ | ----------------------- | ------------------------------------------ |
+| `_tokens.scss`     |                         | Deprecated, use Custom Properties directly |
+| `_theme-maps.scss` |                         | Removed, use `_themes.scss` instead        |
+| `_theme-maps.scss` | `$carbon--theme--white` | `$white`                                   |
+|                    | `$carbon--theme--g10`   | `$g10`                                     |
+|                    | `$carbon--theme--g90`   | `$g90`                                     |
+|                    | `$carbon--theme--g100`  | `$g100`                                    |
+| `_mixins.scss`     |                         | Removed, use `_theme.scss` instead         |
+| `_mixins.scss`     | `carbon--theme`         | `theme`                                    |
+
+- Theme maps are now available in `scss/_themes.scss` and no longer require a
+  namespace
+- Theme mixin has been simplified, it now emits the given theme as Custom
+  Properties for the parent selector

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "10.19.0-rc.0",
+  "version": "10.19.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"
@@ -23,8 +23,9 @@
     "access": "public"
   },
   "dependencies": {
+    "@babel/core": "^7.12.13",
     "@carbon/cli-reporter": "^10.4.0",
-    "@octokit/plugin-retry": "^2.2.0",
+    "@octokit/plugin-retry": "^3.0.7",
     "@octokit/plugin-throttling": "^2.6.0",
     "@octokit/rest": "^16.28.1",
     "@rollup/plugin-babel": "^5.2.2",

packages/cli/src/commands/sassdoc/tools.js

@@ -122,7 +122,9 @@ function createAnchorLink(name, heading) {
 function createMarkdownItem(item) {
   let str = '';
 
-  if (!item.context) return '';
+  if (!item.context) {
+    return '';
+  }
 
   let status = item.access === 'public' ? '✅' : '❌';
 
@@ -160,9 +162,13 @@ $${item.context.name}: ${item.context.value};
 
     if (item.parameter) {
       item.parameter.forEach((param) => {
-        if (paramStr) paramStr += `, `;
+        if (paramStr) {
+          paramStr += `, `;
+        }
         paramStr += `$${param.name}`;
-        if (param.default) paramStr += `: ${param.default}`;
+        if (param.default) {
+          paramStr += `: ${param.default}`;
+        }
       });
     }
 

packages/colors/README.md

@@ -137,12 +137,6 @@ blue[50]; // Using the `blue` object.
 warmGray100; // Using the `warmGray100` variable.
 ```
 
-## 📖 API Documentation
-
-If you're looking for `@carbon/colors` API documentation, check out:
-
-- [Sass](./docs/sass.md)
-
 ## 📚 Examples
 
 If you're looking for more examples on how to use `@carbon/colors`, we have some