Merge branch 'master' into checkbox-focus-fix

carbon-design-system · Jan 25, 2021 · 4eea27e · 4eea27e
2 parents 574f946 + b62628f
commit 4eea27e
Show file tree

Hide file tree

Showing 70 changed files with 5,184 additions and 7,924 deletions.
diff --git a/.yarn/cache/@rollup-plugin-replace-npm-2.3.4-2b255f0126-97ae11600a.zip b/.yarn/cache/@rollup-plugin-replace-npm-2.3.4-2b255f0126-97ae11600a.zip
diff --git a/.yarn/cache/diff-npm-5.0.0-ad6900db18-ef241d3b20.zip b/.yarn/cache/diff-npm-5.0.0-ad6900db18-ef241d3b20.zip
diff --git a/.yarn/cache/estree-walker-npm-0.3.1-eafc7846cc-20a1a9833e.zip b/.yarn/cache/estree-walker-npm-0.3.1-eafc7846cc-20a1a9833e.zip
diff --git a/.yarn/cache/magic-string-npm-0.19.1-0dffe528c9-eabaf9b175.zip b/.yarn/cache/magic-string-npm-0.19.1-0dffe528c9-eabaf9b175.zip
diff --git a/.yarn/cache/rollup-plugin-strip-banner-npm-0.2.0-0aa46b3887-ba6dab339b.zip b/.yarn/cache/rollup-plugin-strip-banner-npm-0.2.0-0aa46b3887-ba6dab339b.zip
diff --git a/.yarn/cache/rollup-pluginutils-npm-2.0.1-cb018e5ebc-40f9e1af99.zip b/.yarn/cache/rollup-pluginutils-npm-2.0.1-cb018e5ebc-40f9e1af99.zip
diff --git a/.yarn/cache/vlq-npm-0.2.3-292fe9aaa1-48055a9675.zip b/.yarn/cache/vlq-npm-0.2.3-292fe9aaa1-48055a9675.zip
diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json
@@ -2,7 +2,7 @@
   "name": "jest-config-carbon",
   "private": true,
   "description": "Jest configuration and preset for Carbon",
-  "version": "0.1.0-rc.0",
+  "version": "0.1.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/config/prettier-config-carbon/package.json b/config/prettier-config-carbon/package.json
@@ -1,7 +1,7 @@
 {
   "name": "prettier-config-carbon",
   "description": "Prettier config for the Carbon Design System",
-  "version": "0.6.0-rc.0",
+  "version": "0.6.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/docs/migration/11.x-layout.md b/docs/migration/11.x-layout.md
@@ -0,0 +1,24 @@
+# Layout
+
+**Note: everything in this file is a work-in-progress and will be changed.**
+
+## Changes
+
+| v10                               | v11                       |
+| --------------------------------- | ------------------------- |
+| `$carbon--base-font-size`         | `$base-font-size`         |
+| `carbon--rem`                     | `rem`                     |
+| `carbon--em`                      | `em`                      |
+| `$carbon--grid-gutter`            | `$grid-gutter`            |
+| `$carbon--grid-gutter--condensed` | `$grid-gutter--condensed` |
+| `$carbon--grid-breakpoints`       | `$grid-breakpoints`       |
+| `carbon--breakpoint-next`         | `breakpoint-next`         |
+| `carbon--breakpoint-prev`         | `breakpoint-prev`         |
+| `carbon--is-smallest-breakpoint`  | `is-smallest-breakpoint`  |
+| `carbon--largest-breakpoint-name` | `largest-breakpoint-name` |
+| `carbon--breakpoint-infix`        | `breakpoint-infix`        |
+| `carbon--breakpoint-up`           | `breakpoint-up`           |
+| `carbon--breakpoint-down`         | `breakpoint-down`         |
+| `carbon--breakpoint-between`      | `breakpoint-between`      |
+| `carbon--largest-breakpoint`      | `largest-breakpoint`      |
+| `carbon--breakpoint`              | `breakpoint`              |
diff --git a/docs/migration/11.x-motion.md b/docs/migration/11.x-motion.md
@@ -0,0 +1,11 @@
+# Motion
+
+**Note: everything in this file is a work-in-progress and will be changed.**
+
+## Changes
+
+| v10                        | v11        |
+| -------------------------- | ---------- |
+| `$carbon--easings`         | `$easings` |
+| `@function carbon--motion` | `motion`   |
+| `@mixin carbon--motion`    | `motion`   |
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "10.18.0-rc.0",
+  "version": "10.18.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"
@@ -42,7 +42,7 @@
     "lodash.template": "^4.5.0",
     "markdown-toc": "^1.2.0",
     "prettier": "^2.2.1",
-    "prettier-config-carbon": "^0.6.0-rc.0",
+    "prettier-config-carbon": "^0.6.0",
     "progress-estimator": "^0.2.2",
     "remark": "^10.0.1",
     "replace-in-file": "^6.1.0",

diff --git a/packages/colors/.gitignore b/packages/colors/.gitignore
@@ -1 +1,2 @@
 scss
+index.scss
diff --git a/packages/colors/__tests__/__snapshots__/modules-test.js.snap b/packages/colors/__tests__/__snapshots__/modules-test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`modules.scss Public API 1`] = `
+exports[`@carbon/colors Public API 1`] = `
 Object {
   "black": "#000000",
   "black-100": "#000000",

diff --git a/packages/colors/__tests__/modules-test.js b/packages/colors/__tests__/modules-test.js
@@ -13,13 +13,13 @@ const { SassRenderer } = require('@carbon/test-utils/scss');
 
 const { render } = SassRenderer.create(__dirname);
 
-describe('modules.scss', () => {
+describe('@carbon/colors', () => {
   test('Public API', async () => {
     const { getValue } = await render(`
       @use 'sass:meta';
-      @use '../scss/module';
+      @use '../index.scss' as colors;
 
-      $_: get-value(meta.module-variables('module'));
+      $_: get-value(meta.module-variables('colors'));
     `);
 
     const variables = getValue(0);