Merge branch 'main' into issue-10293-size-prop

carbon-design-system · Jan 5, 2022 · 9434e49 · 9434e49
2 parents c60d8d8 + c8fba17
commit 9434e49
Show file tree

Hide file tree

Showing 42 changed files with 928 additions and 749 deletions.
diff --git a/.yarn/cache/@next-swc-android-arm64-npm-12.0.3-36c0b95ce8-615c95d182.zip b/.yarn/cache/@next-swc-android-arm64-npm-12.0.3-36c0b95ce8-615c95d182.zip
diff --git a/.yarn/cache/@next-swc-darwin-arm64-npm-12.0.3-3a1d4de5e2-f6c0bfbb09.zip b/.yarn/cache/@next-swc-darwin-arm64-npm-12.0.3-3a1d4de5e2-f6c0bfbb09.zip
diff --git a/...-x64-npm-12.0.3-a2433f1b97-22906cd7a8.zip → ...wc-darwin-x64-npm-12.0.3-a2433f1b97-8.zip b/...-x64-npm-12.0.3-a2433f1b97-22906cd7a8.zip → ...wc-darwin-x64-npm-12.0.3-a2433f1b97-8.zip
diff --git a/.yarn/cache/@next-swc-linux-arm-gnueabihf-npm-12.0.3-1108fcc677-3474c5681d.zip b/.yarn/cache/@next-swc-linux-arm-gnueabihf-npm-12.0.3-1108fcc677-3474c5681d.zip
diff --git a/.yarn/cache/@next-swc-linux-arm64-gnu-npm-12.0.3-9aa11046a9-ede87d91e5.zip b/.yarn/cache/@next-swc-linux-arm64-gnu-npm-12.0.3-9aa11046a9-ede87d91e5.zip
diff --git a/.yarn/cache/@next-swc-linux-arm64-musl-npm-12.0.3-e1fc596907-f6cbe1e7dd.zip b/.yarn/cache/@next-swc-linux-arm64-musl-npm-12.0.3-e1fc596907-f6cbe1e7dd.zip
diff --git a/...-gnu-npm-12.0.3-903b1f3ddd-0b0bc4b7c1.zip → ...linux-x64-gnu-npm-12.0.3-903b1f3ddd-8.zip b/...-gnu-npm-12.0.3-903b1f3ddd-0b0bc4b7c1.zip → ...linux-x64-gnu-npm-12.0.3-903b1f3ddd-8.zip
diff --git a/...musl-npm-12.0.3-e6e6e5fe53-6678c0a7b9.zip → ...inux-x64-musl-npm-12.0.3-e6e6e5fe53-8.zip b/...musl-npm-12.0.3-e6e6e5fe53-6678c0a7b9.zip → ...inux-x64-musl-npm-12.0.3-e6e6e5fe53-8.zip
diff --git a/.yarn/cache/@next-swc-win32-arm64-msvc-npm-12.0.3-49313b276d-0c2d9dddd3.zip b/.yarn/cache/@next-swc-win32-arm64-msvc-npm-12.0.3-49313b276d-0c2d9dddd3.zip
diff --git a/.yarn/cache/@next-swc-win32-ia32-msvc-npm-12.0.3-e88703bc78-dc79d45f9e.zip b/.yarn/cache/@next-swc-win32-ia32-msvc-npm-12.0.3-e88703bc78-dc79d45f9e.zip
diff --git a/...msvc-npm-12.0.3-b2ecd87ca4-2c2f2540c8.zip → ...in32-x64-msvc-npm-12.0.3-b2ecd87ca4-8.zip b/...msvc-npm-12.0.3-b2ecd87ca4-2c2f2540c8.zip → ...in32-x64-msvc-npm-12.0.3-b2ecd87ca4-8.zip
diff --git a/.../fsevents-patch-34a78773f2-78db9daf1f.zip → .yarn/cache/fsevents-patch-3340e2eb10-8.zip b/.../fsevents-patch-34a78773f2-78db9daf1f.zip → .yarn/cache/fsevents-patch-3340e2eb10-8.zip
diff --git a/.../fsevents-patch-8d31d41ec5-008ff261ef.zip → .yarn/cache/fsevents-patch-c0aa546cbc-8.zip b/.../fsevents-patch-8d31d41ec5-008ff261ef.zip → .yarn/cache/fsevents-patch-c0aa546cbc-8.zip
diff --git a/.yarn/cache/immutable-npm-4.0.0-74b844f82e-4b5e9181e4.zip b/.yarn/cache/immutable-npm-4.0.0-74b844f82e-4b5e9181e4.zip
diff --git a/...e/resolve-patch-4c1e11bf79-eb88c5e538.zip → ...e/resolve-patch-00f699a708-21684b4d99.zip b/...e/resolve-patch-4c1e11bf79-eb88c5e538.zip → ...e/resolve-patch-00f699a708-21684b4d99.zip
diff --git a/...e/resolve-patch-da1bf0dd3c-bed00be983.zip → ...e/resolve-patch-b4a69197d3-a0dd7d16a8.zip b/...e/resolve-patch-da1bf0dd3c-bed00be983.zip → ...e/resolve-patch-b4a69197d3-a0dd7d16a8.zip
diff --git a/.yarn/cache/sass-npm-1.43.4-757ce458fc-9af80105da.zip b/.yarn/cache/sass-npm-1.43.4-757ce458fc-9af80105da.zip
diff --git a/.yarn/cache/sass-npm-1.45.0-83550ad0f7-f20d22ddf9.zip b/.yarn/cache/sass-npm-1.45.0-83550ad0f7-f20d22ddf9.zip
diff --git a/.yarn/cache/source-map-js-npm-1.0.1-c86a8e0dcb-22606113d6.zip b/.yarn/cache/source-map-js-npm-1.0.1-c86a8e0dcb-22606113d6.zip
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.0.0.cjs b/.yarn/releases/yarn-3.0.0.cjs
diff --git a/.yarn/releases/yarn-3.1.1.cjs b/.yarn/releases/yarn-3.1.1.cjs
diff --git a/.yarnrc b/.yarnrc
@@ -1,4 +1,4 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
 
-yarn-path ".yarn/releases/yarn-3.0.0.cjs"
+yarn-path ".yarn/releases/yarn-3.1.1.cjs"
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,8 +2,18 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+    spec: '@yarnpkg/plugin-interactive-tools'
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
+    spec: '@yarnpkg/plugin-workspace-tools'
 
-yarnPath: .yarn/releases/yarn-3.0.0.cjs
+supportedArchitectures:
+  os:
+    - 'current'
+    - 'darwin'
+    - 'linux'
+    - 'win32'
+  cpu:
+    - 'current'
+    - 'x64'
+
+yarnPath: .yarn/releases/yarn-3.1.1.cjs
diff --git a/config/jest-config-carbon/index.js b/config/jest-config-carbon/index.js
@@ -21,7 +21,7 @@ module.exports = {
   ],
   transform: {
     '^.+\\.(js|jsx)$': require.resolve('./transform/jsTransform.js'),
-    '^.+\\.css$': require.resolve('./transform/cssTransform.js'),
+    '^.+\\.s?css$': require.resolve('./transform/cssTransform.js'),
     '^(?!.*\\.(js|jsx|css|json)$)': require.resolve(
       './transform/fileTransform.js'
     ),

diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json
@@ -35,7 +35,8 @@
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
     "jest-circus": "^27.0.6",
-    "jest-watch-typeahead": "^0.6.4"
+    "jest-watch-typeahead": "^0.6.4",
+    "sass": "^1.45.0"
   },
   "devDependencies": {
     "react": "^17.0.1",

diff --git a/config/jest-config-carbon/transform/cssTransform.js b/config/jest-config-carbon/transform/cssTransform.js
@@ -7,15 +7,48 @@
 
 'use strict';
 
-// This is a custom Jest transformer turning style imports into empty objects.
-// http://facebook.github.io/jest/docs/tutorial-webpack.html
+const { createHash } = require('crypto');
+const fs = require('fs');
+const sass = require('sass');
+const path = require('path');
+
+const THIS_FILE = fs.readFileSync(__filename);
 
 module.exports = {
-  process() {
-    return 'module.exports = {};';
+  process(_file, filepath) {
+    const result = sass.renderSync({
+      file: filepath,
+      outputStyle: 'compressed',
+    });
+    return `
+      const css = \`${result.css.toString()}\`;
+      let style;
+      beforeAll(() => {
+        style = document.createElement('style');
+        style.textContent = css;
+        document.head.appendChild(style);
+      });
+      afterAll(() => {
+        document.head.removeChild(style);
+      });
+    `;
   },
-  getCacheKey() {
-    // The output is always the same.
-    return 'cssTransform';
+  getCacheKey(sourceText, sourcePath, transformOptions) {
+    const { config, configString, instrument } = transformOptions;
+    return createHash('md5')
+      .update(THIS_FILE)
+      .update('\0', 'utf8')
+      .update(sourceText)
+      .update('\0', 'utf8')
+      .update(path.relative(config.rootDir, sourcePath))
+      .update('\0', 'utf8')
+      .update(configString)
+      .update('\0', 'utf8')
+      .update(instrument ? 'instrument' : '')
+      .update('\0', 'utf8')
+      .update(process.version)
+      .update('\0', 'utf8')
+      .update(sass.info)
+      .digest('hex');
   },
 };
diff --git a/packages/colors/examples/preview/.yarn/install-state.gz b/packages/colors/examples/preview/.yarn/install-state.gz
diff --git a/packages/colors/examples/preview/yarn.lock b/packages/colors/examples/preview/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.16.0":
@@ -21,7 +21,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.16.5, @babel/core@npm:^7.12.0":
+"@babel/core@npm:^7.12.0":
   version: 7.16.5
   resolution: "@babel/core@npm:7.16.5"
   dependencies:
@@ -453,7 +453,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/core@npm:2.0.1, @parcel/core@npm:^2.0.1":
+"@parcel/core@npm:^2.0.1":
   version: 2.0.1
   resolution: "@parcel/core@npm:2.0.1"
   dependencies:
@@ -2979,10 +2979,10 @@ __metadata:
 
 "fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -2992,6 +2992,7 @@ fsevents@~2.3.2:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -12,9 +12,6 @@
   },
   "bugs": "https://github.com/carbon-design-system/carbon/issues",
   "homepage": "https://www.carbondesignsystem.com/",
-  "engines": {
-    "node": ">=6.x"
-  },
   "files": [
     "css/**/*",
     "es/**/*",

diff --git a/packages/grid/examples/css-grid/yarn.lock b/packages/grid/examples/css-grid/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:7.12.11":
@@ -1199,10 +1199,10 @@ __metadata:
 
 "fsevents@patch:fsevents@~2.3.1#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -1212,6 +1212,7 @@ __metadata:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard
 

diff --git a/packages/grid/examples/preview/yarn.lock b/packages/grid/examples/preview/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:^7.0.0":
@@ -30,7 +30,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.16.5, @babel/core@npm:^7.12.0":
+"@babel/core@npm:^7.12.0":
   version: 7.16.5
   resolution: "@babel/core@npm:7.16.5"
   dependencies:
@@ -463,7 +463,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/core@npm:2.0.1, @parcel/core@npm:^2.0.1":
+"@parcel/core@npm:^2.0.1":
   version: 2.0.1
   resolution: "@parcel/core@npm:2.0.1"
   dependencies:
@@ -3065,10 +3065,10 @@ __metadata:
 
 "fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -3078,6 +3078,7 @@ fsevents@~2.3.2:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard
 

diff --git a/packages/icons/examples/preview/yarn.lock b/packages/icons/examples/preview/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:^7.0.0":
@@ -30,7 +30,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.16.5, @babel/core@npm:^7.12.0":
+"@babel/core@npm:^7.12.0":
   version: 7.16.5
   resolution: "@babel/core@npm:7.16.5"
   dependencies:
@@ -463,7 +463,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/core@npm:2.0.1, @parcel/core@npm:^2.0.1":
+"@parcel/core@npm:^2.0.1":
   version: 2.0.1
   resolution: "@parcel/core@npm:2.0.1"
   dependencies:
@@ -3043,10 +3043,10 @@ __metadata:
 
 "fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -3056,6 +3056,7 @@ fsevents@~2.3.2:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard
 

diff --git a/packages/layout/examples/preview/yarn.lock b/packages/layout/examples/preview/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:^7.0.0":
@@ -30,7 +30,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.16.5, @babel/core@npm:^7.12.0":
+"@babel/core@npm:^7.12.0":
   version: 7.16.5
   resolution: "@babel/core@npm:7.16.5"
   dependencies:
@@ -463,7 +463,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/core@npm:2.0.1, @parcel/core@npm:^2.0.1":
+"@parcel/core@npm:^2.0.1":
   version: 2.0.1
   resolution: "@parcel/core@npm:2.0.1"
   dependencies:
@@ -3012,10 +3012,10 @@ __metadata:
 
 "fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -3025,6 +3025,7 @@ fsevents@~2.3.2:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard
 

diff --git a/packages/pictograms/examples/preview/yarn.lock b/packages/pictograms/examples/preview/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 4
+  version: 5
   cacheKey: 8
 
 "@babel/code-frame@npm:^7.0.0":
@@ -30,7 +30,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.16.5, @babel/core@npm:^7.12.0":
+"@babel/core@npm:^7.12.0":
   version: 7.16.5
   resolution: "@babel/core@npm:7.16.5"
   dependencies:
@@ -463,7 +463,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/core@npm:2.0.1, @parcel/core@npm:^2.0.1":
+"@parcel/core@npm:^2.0.1":
   version: 2.0.1
   resolution: "@parcel/core@npm:2.0.1"
   dependencies:
@@ -3043,10 +3043,10 @@ __metadata:
 
 "fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
   version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
   dependencies:
     node-gyp: latest
-  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
+  conditions: os=darwin
   languageName: node
   linkType: hard
 
@@ -3056,6 +3056,7 @@ fsevents@~2.3.2:
   dependencies:
     node-gyp: latest
   checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  conditions: os=darwin
   languageName: node
   linkType: hard