Skip to content

Commit

Permalink
Merge branch 'main' into icon-page-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Jul 23, 2021
2 parents 12508c0 + 3b33c72 commit 69109bf
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 85 deletions.
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@
"/node_modules/*"
],
"resolutions": {
"carbon-components": "^10.40.0-rc.0",
"carbon-components-react": "^7.40.0-rc.0",
"@carbon/elements": "^10.39.0-rc.0",
"@carbon/icons": "^10.36.0-rc.0",
"@carbon/icons-react": "^10.36.0-rc.0",
"carbon-components": "^10.40.0",
"carbon-components-react": "^7.40.0",
"@carbon/elements": "^10.39.0",
"@carbon/icons": "^10.36.0",
"@carbon/icons-react": "^10.36.0",
"gatsby-remark-images": "^3.3.33"
},
"dependencies": {
"@carbon/charts-react": "0.41.65",
"@carbon/elements": "^10.39.0-rc.0",
"@carbon/icons": "^10.36.0-rc.0",
"@carbon/icons-react": "^10.36.0-rc.0",
"@carbon/pictograms": "^11.14.0-rc.0",
"@carbon/pictograms-react": "^11.14.0-rc.0",
"@carbon/elements": "^10.39.0",
"@carbon/icons": "^10.36.0",
"@carbon/icons-react": "^10.36.0",
"@carbon/pictograms": "^11.14.0",
"@carbon/pictograms-react": "^11.14.0",
"@loadable/component": "^5.12.0",
"@slack/web-api": "^5.11.0",
"carbon-components": "^10.40.0-rc.0",
"carbon-components-react": "^7.40.0-rc.0",
"carbon-components": "^10.40.0",
"carbon-components-react": "^7.40.0",
"change-case": "^4.1.1",
"classnames": "^2.2.6",
"codesandbox": "^2.1.10",
Expand Down
146 changes: 73 additions & 73 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1175,56 +1175,56 @@
resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-10.24.0.tgz#1966a4a0181d7a9b7196ad236f1e6a15e139a807"
integrity sha512-8dcFsrguFYcWE6lrecB0+kqVS0a5dSknaE4yM4F/P45ilFsd6FUenW+1uB8a9m7Dk/c38rj/FzpgwQ0Hfm6fmQ==

"@carbon/colors@^10.29.0-rc.0":
version "10.29.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-10.29.0-rc.0.tgz#3d9f71f8e2b8f28a47dc7cde2c8405856e9debd9"
integrity sha512-q/kbA3Iwf9qwoh4jRDe5BujYZ+pfjexcVM5q9YD028EFfqPQ21HjFv1EVs9ysnih3T1SAVn692OnxH7uEeJLwA==

"@carbon/elements@^10.32.0", "@carbon/elements@^10.39.0-rc.0":
version "10.39.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/elements/-/elements-10.39.0-rc.0.tgz#46eec45d18f8e3eb3b677aa568e8c831f40bf372"
integrity sha512-4gaYlnT381CKbva6NTrVdMKkInwvRPDCmVsVuELxSNrFfflASFbLMsotKT+oGftk6aDzVkPg0DYXkFn2xwUHcA==
dependencies:
"@carbon/colors" "^10.29.0-rc.0"
"@carbon/grid" "^10.32.0-rc.0"
"@carbon/icons" "^10.36.0-rc.0"
"@carbon/colors@^10.29.0":
version "10.29.0"
resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-10.29.0.tgz#92b1f8822a0ca07d23daba12d360f90debcc3d26"
integrity sha512-Ga20vVFGrhEgALIVZoWbcooWOVnx7Ox8GbRWlZDEAe6JUbz6ynDKiq3td7GtFVk0ELRCIV8gVu3F/PfssyhwQA==

"@carbon/elements@^10.32.0", "@carbon/elements@^10.39.0":
version "10.39.0"
resolved "https://registry.yarnpkg.com/@carbon/elements/-/elements-10.39.0.tgz#297a840daffd4be8cdfde337f5bd6cf57f3b684e"
integrity sha512-09VAxBZWfO0d/tuXflbUUua2LO7TW0hGiFnUEwvZsaW45jQYPFFgux5fU1JJkyC7k8Iyhoo+GsOPfqrXSES26Q==
dependencies:
"@carbon/colors" "^10.29.0"
"@carbon/grid" "^10.32.0"
"@carbon/icons" "^10.36.0"
"@carbon/import-once" "^10.6.0"
"@carbon/layout" "^10.28.0-rc.0"
"@carbon/motion" "^10.21.0-rc.0"
"@carbon/themes" "^10.39.0-rc.0"
"@carbon/type" "^10.32.0-rc.0"
"@carbon/layout" "^10.28.0"
"@carbon/motion" "^10.21.0"
"@carbon/themes" "^10.39.0"
"@carbon/type" "^10.32.0"

"@carbon/feature-flags@^0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@carbon/feature-flags/-/feature-flags-0.5.0.tgz#726e9d411e7650e3f4ca0c63e1ffc527bb5e93f8"
integrity sha512-AEmsE2bUfl7ycWIep4Yu+DFLXLTRZf9UbhfBiJTncsbnAKPpYnD9XZXi1S4EgLrGKvHyFgKDvomf4hAd3yIe5A==

"@carbon/grid@^10.32.0-rc.0":
version "10.32.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-10.32.0-rc.0.tgz#c12e5a4486aae8146c8e7e590a58be2180f6c931"
integrity sha512-9Ir8IQPrvSM4oXE8Wy/k7koKNLBdHsQzsUXKkKmWT3ueuhr8Lcv1t3MUgPXvNpq6ZIc6ZRQno8inxcvIMQ6mWw==
"@carbon/grid@^10.32.0":
version "10.32.0"
resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-10.32.0.tgz#4de880318474d13f6a3bd7f8d193fc9b20faa28a"
integrity sha512-gWEB885aCqQpP/afiOtmDqqAHbLcCyq1IQ4T90TiyQQyuMvDU9Yj6Uz95r86gJNHvMatPOHGCwXMs7qnwkz7gw==
dependencies:
"@carbon/import-once" "^10.6.0"
"@carbon/layout" "^10.28.0-rc.0"
"@carbon/layout" "^10.28.0"

"@carbon/icon-helpers@^10.20.0-rc.0":
version "10.20.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.20.0-rc.0.tgz#9fba1047308f0b0dd5bc885ba34e208003eaa343"
integrity sha512-Pbs7v4UOD0se4fKB4macuC++WgVxThg8n4N8lWBu7qMKb9oFAACP93zImmrVQSbaiMeIZao9juHMeL1RouDZHQ==
"@carbon/icon-helpers@^10.20.0":
version "10.20.0"
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.20.0.tgz#4e6752b984fcbfd5851af5c4dfdab5031bb4aa1d"
integrity sha512-Qe/xHnMDwji541+2ibn90eFI5xWh51SQ6ehmHncagNrPIJb3a+x1DMhQcAMUF6YKwGzSbb5VQfay5wFoxcaf+A==

"@carbon/icons-react@^10.30.0", "@carbon/icons-react@^10.36.0-rc.0":
version "10.36.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.36.0-rc.0.tgz#a1d7edf6ed9871ff48bfe92754127283eada1e45"
integrity sha512-3uEAPHDFJZBi2Sr6Mq9qQjqWVjkvmDNacN5yONCo9nOs194kwUjHbkxaXU1OEyZ0ZZaAyonrKe4nERGE91znNw==
"@carbon/icons-react@^10.30.0", "@carbon/icons-react@^10.36.0":
version "10.36.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.36.0.tgz#a09dc6b4bcda2f43063014af38e112081a2a91fb"
integrity sha512-lWmG8v09XTVKPsGd0kbZgYAwvQ99XB3Szt0y91W3b2zKXiSilyFuSbG9Vd6fwrfaP84QG48MnCFdct0Aww57Xg==
dependencies:
"@carbon/icon-helpers" "^10.20.0-rc.0"
"@carbon/icon-helpers" "^10.20.0"
"@carbon/telemetry" "0.0.0-alpha.6"
prop-types "^15.7.2"

"@carbon/icons@^10.36.0-rc.0":
version "10.36.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.36.0-rc.0.tgz#df428e33b8b94400642889182d6de1498a79a6ef"
integrity sha512-ptD9txokY7QPUs1XF1VrDd80l77Vj4wgNmkCN0Rad8gajxj/qCAPnNcVh+pgLXY3EOkg9z5ZYqEYm27BQgwD2Q==
"@carbon/icons@^10.36.0":
version "10.36.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.36.0.tgz#255de337aafe50c5507e223b92deaaa464b51ef0"
integrity sha512-5p/62+zZRdg21GIFk0+BtDiDqC2rfdqM4fjstW/nhugob/zjZMNUXwNYH001bhEuOLvewzENgF3EQwGYb1NFfg==
dependencies:
svgson "^5.2.1"

Expand All @@ -1238,29 +1238,29 @@
resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.23.0.tgz#7af99758abc780d1509ab109b0491bdd19623e9f"
integrity sha512-oO7okc7c7QPWpC0k6DeZFG219DWv4ioMYtgZ189rH81e8bjKIwc5uJh63uSZ9ITMI9+pvDu6hXaiHYIGsLza3w==

"@carbon/layout@^10.28.0-rc.0":
version "10.28.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.28.0-rc.0.tgz#98f16e6884f13ad9d67eac1168b7eecaff5177ec"
integrity sha512-8m/FUVEg/1ccz2/05WIqDhGADKvpoF5rrPXcNPMXIYduGwddZpNrk2tBkTyY+Dpo65PyephdnPM9LiY4g1n09w==
"@carbon/layout@^10.28.0":
version "10.28.0"
resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.28.0.tgz#cc4b496d89a9d0a3916095d0f93490d755c82cca"
integrity sha512-jic1yPqAjeWHzyAATC4/fH+75nT89S6Stpu/EKWNuXIMZe1xFmawatvEmLrUOZUiOMVlcU58U0UNxB5OPmtTCQ==

"@carbon/motion@^10.21.0-rc.0":
version "10.21.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/motion/-/motion-10.21.0-rc.0.tgz#bc984942897878940a878a25f6f2345b3d176c04"
integrity sha512-lK3oyo2PLenhubaIoU6a8sgIo/JU4s+Ju5tpnryqsK3SA1so/FfugjjCgXNk960g8VyloxMs9zFTldPkSfS4+g==
"@carbon/motion@^10.21.0":
version "10.21.0"
resolved "https://registry.yarnpkg.com/@carbon/motion/-/motion-10.21.0.tgz#aede2d8fe2b91612cfc4ce725057a636566ceccd"
integrity sha512-+/DSS8q79JO6nTbgFwef1j5PQ+0RjM878HzLFcKHNDbYQKfJcmriuD7y6JIcz0mVgcZAzxgEkL84W37Crkvoxg==

"@carbon/pictograms-react@^11.14.0-rc.0":
version "11.14.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/pictograms-react/-/pictograms-react-11.14.0-rc.0.tgz#4dfff855164527e5e60cad35255096bec1cca9fd"
integrity sha512-prRtSjaes+2P+3eOgcyPWY3avUZvyYmm91IY5cSZgO4PyZY3tEVsihKyBFTZFKs25XE1aQcwCDRPpwBGSbDnEg==
"@carbon/pictograms-react@^11.14.0":
version "11.14.0"
resolved "https://registry.yarnpkg.com/@carbon/pictograms-react/-/pictograms-react-11.14.0.tgz#3e06637235456e35b7f372d22d756e9b25cacba9"
integrity sha512-sc2Ciw4UTnbTpn1MnFpiXonZ5LHZVfFywa9PgAFgfGlZPwLiY3iZBlVMenY7vIAWPxUZA2qfQlk3tjeMcJiN/Q==
dependencies:
"@carbon/icon-helpers" "^10.20.0-rc.0"
"@carbon/icon-helpers" "^10.20.0"
"@carbon/telemetry" "0.0.0-alpha.6"
prop-types "^15.7.2"

"@carbon/pictograms@^11.14.0-rc.0":
version "11.14.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/pictograms/-/pictograms-11.14.0-rc.0.tgz#cd61c0dfc44eeb614fb04b047fbbc220ac2e42cb"
integrity sha512-kL1C7TJ3kDz+4o3rHJkncZD6LdoJCY02U9IPVxsZsI5xB+tMJ9IiLJJHVgQTOayN9a49srxNUiGt+gbf+3/ZEg==
"@carbon/pictograms@^11.14.0":
version "11.14.0"
resolved "https://registry.yarnpkg.com/@carbon/pictograms/-/pictograms-11.14.0.tgz#658f6759e8faaa04ddafb61e694912e2b48956cc"
integrity sha512-Wjb7OGiWPLpZCCEnjkbTRaLEt0dNlX9QY5cyVTDmn3grd7pDtE/ROM4n6h08wpPApuMmeEt7cjSIAzsIr7q5ZA==

"@carbon/[email protected]":
version "0.0.0-alpha.6"
Expand Down Expand Up @@ -1288,14 +1288,14 @@
"@carbon/type" "^10.27.0"
color "^3.1.2"

"@carbon/themes@^10.39.0-rc.0":
version "10.39.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/themes/-/themes-10.39.0-rc.0.tgz#351d4a69b7c9bb484a848ed461dc441dc2dab3a3"
integrity sha512-YBPn0LyrCts9aLxizRM6V+h/KJRhNSPyigSmBC/x/LVDKKGFve1Ee4wK9BVX8ssb0MHSNApDuUxkCroDMxhKpA==
"@carbon/themes@^10.39.0":
version "10.39.0"
resolved "https://registry.yarnpkg.com/@carbon/themes/-/themes-10.39.0.tgz#27fd389b3d1b07c4f3be60f66b8bebec20445240"
integrity sha512-ODyvx6kqhnmtoN0j7PslzYCZSDbPaJDZjn16IotOOHeQ0Bq0pChl9uynNauyCaLAuh8Kmc9LsihXdUl/gM3YQA==
dependencies:
"@carbon/colors" "^10.29.0-rc.0"
"@carbon/layout" "^10.28.0-rc.0"
"@carbon/type" "^10.32.0-rc.0"
"@carbon/colors" "^10.29.0"
"@carbon/layout" "^10.28.0"
"@carbon/type" "^10.32.0"
color "^3.1.2"

"@carbon/type@^10.27.0":
Expand All @@ -1306,13 +1306,13 @@
"@carbon/import-once" "^10.6.0"
"@carbon/layout" "^10.23.0"

"@carbon/type@^10.32.0-rc.0":
version "10.32.0-rc.0"
resolved "https://registry.yarnpkg.com/@carbon/type/-/type-10.32.0-rc.0.tgz#8598195e40c887752d610eeacb31600e38172766"
integrity sha512-hiRxQL/7vK5w3iT+ZrdDuTND/hYv+jYGF/iEhlNKmnno3N1HXF6GKC0+lJrSk4IY/NBq9wy+VC/ObZELTLIXvQ==
"@carbon/type@^10.32.0":
version "10.32.0"
resolved "https://registry.yarnpkg.com/@carbon/type/-/type-10.32.0.tgz#42548e9bd810581ffbf303d76947822325f10c98"
integrity sha512-gHNmtPQ1JQpUgUaja/VK7ZeiOlN8OiH00FuhGpaLjrIhWEV/HKnW07GNWLRxntzHJ0m8O3rZ3z3VbdpfUXgSVw==
dependencies:
"@carbon/import-once" "^10.6.0"
"@carbon/layout" "^10.28.0-rc.0"
"@carbon/layout" "^10.28.0"

"@carbon/[email protected]":
version "1.1.1"
Expand Down Expand Up @@ -4252,13 +4252,13 @@ capture-stack-trace@^1.0.0:
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==

carbon-components-react@^7.33.0, carbon-components-react@^7.40.0-rc.0:
version "7.40.0-rc.0"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.40.0-rc.0.tgz#6f99d1fdcc44d03ddd942641f3cf16baae7252a5"
integrity sha512-ndzx/KEQNrW6TGAduXNBxyNhazspWYl//2ibbFcfiCu6dlcb7Ag2QeVwTwaieyRx0dmLsdM3misf1+ZGJ+OnFg==
carbon-components-react@^7.33.0, carbon-components-react@^7.40.0:
version "7.40.0"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.40.0.tgz#f2a7313dc77ad5d7a66798820857d97d83bd1415"
integrity sha512-tPHUFMTQprY8EFuW2WqAS2iJzzfgN6+jaguP3VmQzdsbl/IP5+/C+9hyXs1iQIhUmbvoq2SNozL+PWf9Srh9Ug==
dependencies:
"@carbon/feature-flags" "^0.5.0"
"@carbon/icons-react" "^10.36.0-rc.0"
"@carbon/icons-react" "^10.36.0"
"@carbon/telemetry" "0.0.0-alpha.6"
classnames "2.3.1"
copy-to-clipboard "^3.3.1"
Expand All @@ -4274,10 +4274,10 @@ carbon-components-react@^7.33.0, carbon-components-react@^7.40.0-rc.0:
use-resize-observer "^6.0.0"
window-or-global "^1.0.1"

carbon-components@^10.33.0, carbon-components@^10.40.0-rc.0:
version "10.40.0-rc.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.40.0-rc.0.tgz#a79630713f0e69ac801bdb6ffa0b060b9fe098a1"
integrity sha512-noRIyfmstfHks1UDvILqzc4xFBVhuR1QXScGC3rtQBsB+H7c6pebc4QwMragTZkWPskZYazmydqQh5o4GK9JIg==
carbon-components@^10.33.0, carbon-components@^10.40.0:
version "10.40.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.40.0.tgz#59c339dd964624cd07802dc695ceed6f32a07ef7"
integrity sha512-tIc0qHVLilWCelkH56al4ILwZRA4AbbwJEFt0mnGtefmgQ3O1UJLm5/ybp7VnWeHwUnip7PljHSDwHUzQcj5zg==
dependencies:
"@carbon/telemetry" "0.0.0-alpha.6"
flatpickr "4.6.1"
Expand Down

0 comments on commit 69109bf

Please sign in to comment.