Skip to content

Commit

Permalink
Merge branch 'main' into sync-action
Browse files Browse the repository at this point in the history
  • Loading branch information
tay1orjones authored Oct 13, 2022
2 parents a4cc156 + e9bb1ba commit 41280f7
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 7 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"dependencies": {
"@babel/core": "^7.15.8",
"@carbon/charts-react": "0.55.0",
"@carbon/elements": "^11.11.0",
"@carbon/icons-react": "^11.9.0",
"@carbon/elements": "^11.12.0-rc.0",
"@carbon/icons-react": "^11.10.0-rc.0",
"@carbon/pictograms": "^12.7.0",
"@carbon/pictograms-react": "^11.33.0",
"@carbon/react": "^1.14.0",
"@carbon/react": "^1.15.0-rc.0",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
Expand Down
5 changes: 3 additions & 2 deletions src/pages/help/contact-us/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ GitHub issue.
#### Code issues

- [@carbon/react](https://github.com/carbon-design-system/carbon/issues/new/choose)
- [carbon-web-components](https://github.com/carbon-design-system/carbon-web-components/issues/new)
- [carbon-components-angular](https://github.com/IBM/carbon-components-angular/issues/new)
- [carbon-components-vanilla](https://github.com/carbon-design-system/carbon/issues/new/choose)
- [carbon-components-vue](https://github.com/carbon-design-system/carbon-components-vue/issues/new)
Expand Down Expand Up @@ -92,8 +93,8 @@ For designer questions:
[#carbon-design-system](https://ibm-studios.slack.com/messages/C0M053VPT/)

For developer questions:
[#carbon-components](https://ibm-studios.slack.com/messages/C046Y0YUD/),
[#carbon-react](https://ibm-studios.slack.com/messages/C2K6RFJ1G/)
[#carbon-react](https://ibm-studios.slack.com/messages/C2K6RFJ1G/),
[#carbon-web-components](https://ibm-studios.slack.com/archives/CL83LMKSA)

### Email

Expand Down
72 changes: 70 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,20 @@
resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-11.6.0.tgz#fe6f806c20fa4ad60eaeb2d9700c5de684d37b05"
integrity sha512-LE3aaQvRVR9zI2ao4+SHP8vfEaXtfffq4wXHvbPwoTK+I3Db745XuNWeWxC3Rte2uNPS9sjeEyCid2Q0wY/tSw==

"@carbon/elements@^11.11.0", "@carbon/elements@^11.8.0":
"@carbon/elements@^11.12.0-rc.0":
version "11.12.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/elements/-/elements-11.12.0-rc.0.tgz#c77d4998871ebf8538c14465a11c1a9eadeb46a5"
integrity sha512-LNX0XlLD/8U8jVkT+FIN8fyt48gn1b4HxtheMIQSZaRfE+P+DdutphBy4pdSCW1KrgWSaSCIbKJtTTTHjyyxzA==
dependencies:
"@carbon/colors" "^11.6.0"
"@carbon/grid" "^11.7.0"
"@carbon/icons" "^11.10.0-rc.0"
"@carbon/layout" "^11.7.0"
"@carbon/motion" "^11.5.0"
"@carbon/themes" "^11.10.0"
"@carbon/type" "^11.10.0"

"@carbon/elements@^11.8.0":
version "11.11.0"
resolved "https://registry.yarnpkg.com/@carbon/elements/-/elements-11.11.0.tgz#41ea7fa8d9390e852e539535263d7893fa712869"
integrity sha512-pJIjl+YRM7Jc4UmRbuknpzBGeDo6zoPwIiUBursLs/O88HUSbIsQLMOjeEOqZpIrwO0BnvujhVxFEG/ZVW13jg==
Expand Down Expand Up @@ -1203,6 +1216,15 @@
"@carbon/telemetry" "0.0.0-alpha.6"
prop-types "^15.7.2"

"@carbon/icons-react@^11.10.0-rc.0":
version "11.10.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-11.10.0-rc.0.tgz#c6c2951f00a3726fb54fd175ead80353b0343d97"
integrity sha512-SWsj30x4KsqXqBws2VhBM/1JVpmk71aOWKvmh9UcbTvO+0yPpjLsyEuwsJPQZL5z8j7WjmqlsdsiAudFahlrHQ==
dependencies:
"@carbon/icon-helpers" "^10.34.0"
"@carbon/telemetry" "0.1.0"
prop-types "^15.7.2"

"@carbon/icons-react@^11.9.0":
version "11.9.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-11.9.0.tgz#9f74e041f3d5c0382ce35c43fa8b86d71db71484"
Expand All @@ -1212,6 +1234,11 @@
"@carbon/telemetry" "0.1.0"
prop-types "^15.7.2"

"@carbon/icons@^11.10.0-rc.0":
version "11.10.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-11.10.0-rc.0.tgz#d28a11e7393487f94ace9abc07a46c682c277e06"
integrity sha512-bRrg2qTjhnlQUwDG4nIa2bJgbvuhJIsyWYmJP++iWsoG3GrpnBZeQakMiXehujez1flldH9EAevETRJE/p8TtQ==

"@carbon/icons@^11.9.0":
version "11.9.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-11.9.0.tgz#61ef4094554c060849167fbb495d6d26a928a22e"
Expand Down Expand Up @@ -1241,7 +1268,7 @@
resolved "https://registry.yarnpkg.com/@carbon/pictograms/-/pictograms-12.7.0.tgz#efaba2b8f3c10a69cff47d2cb8b6a3506fd6915d"
integrity sha512-FmuAXhIb+hYuSiRczPRo8TFI74HxpIc+ek7v02uj1SfPYIU8HwmtlDJHJqeHEKfUAs4FYRsJzAr2eyaquF+Sfw==

"@carbon/react@^1.11.0", "@carbon/react@^1.14.0":
"@carbon/react@^1.11.0":
version "1.14.0"
resolved "https://registry.yarnpkg.com/@carbon/react/-/react-1.14.0.tgz#9e61393aad05d465830d56a87b076555f760112a"
integrity sha512-pLJqayUDVFOGt8cYXaFcRKB9kouy6WKMb2cqx5divBsCiGXH0hM/pntjIc3DeI3PYIwWvYiSdcxrLLA9cwrZCg==
Expand All @@ -1268,6 +1295,33 @@
wicg-inert "^3.1.1"
window-or-global "^1.0.1"

"@carbon/react@^1.15.0-rc.0":
version "1.15.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/react/-/react-1.15.0-rc.0.tgz#fc3f36e1c88467d5834cd5683ab016e22b9a0ee5"
integrity sha512-Np10CNQbnw2hTmWoTMq+DGR8v1W6p7FW8u7j2OjEi6fbwhTaYmNJO3vR0RsgQtn8apzRfnqSkqfYagAXGdu9KA==
dependencies:
"@babel/runtime" "^7.18.3"
"@carbon/feature-flags" "^0.9.0"
"@carbon/icons-react" "^11.10.0-rc.0"
"@carbon/layout" "^11.7.0"
"@carbon/styles" "^1.15.0-rc.0"
"@carbon/telemetry" "0.1.0"
classnames "2.3.2"
copy-to-clipboard "^3.3.1"
downshift "5.2.1"
flatpickr "4.6.9"
invariant "^2.2.3"
lodash.debounce "^4.0.8"
lodash.findlast "^4.5.0"
lodash.isequal "^4.5.0"
lodash.omit "^4.5.0"
lodash.throttle "^4.1.1"
prop-types "^15.7.2"
react-is "^17.0.2"
use-resize-observer "^6.0.0"
wicg-inert "^3.1.1"
window-or-global "^1.0.1"

"@carbon/styles@^1.14.0":
version "1.14.0"
resolved "https://registry.yarnpkg.com/@carbon/styles/-/styles-1.14.0.tgz#49da334671cf9b6ab9d466f7502182fc6cf27527"
Expand All @@ -1282,6 +1336,20 @@
"@carbon/type" "^11.10.0"
"@ibm/plex" "6.0.0-next.6"

"@carbon/styles@^1.15.0-rc.0":
version "1.15.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/styles/-/styles-1.15.0-rc.0.tgz#5c5ea8f8b4bb0c4276bfcb23d4d7bc7dbf9c03f9"
integrity sha512-EvZv5hV0KifJ3Fg4Rs+W49hshj7YyOFsQuaT9tT30rQsAdKwDUuBHg+S/E91+sl00/irZCm2M5nP5tITaew+ww==
dependencies:
"@carbon/colors" "^11.6.0"
"@carbon/feature-flags" "^0.9.0"
"@carbon/grid" "^11.7.0"
"@carbon/layout" "^11.7.0"
"@carbon/motion" "^11.5.0"
"@carbon/themes" "^11.10.0"
"@carbon/type" "^11.10.0"
"@ibm/plex" "6.0.0-next.6"

"@carbon/telemetry@0.0.0-alpha.6":
version "0.0.0-alpha.6"
resolved "https://registry.yarnpkg.com/@carbon/telemetry/-/telemetry-0.0.0-alpha.6.tgz#1d11e64f310e98f32c3db0c55f02e047f2398087"
Expand Down

0 comments on commit 41280f7

Please sign in to comment.