Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
makafsal committed Nov 25, 2024
2 parents 7d8f719 + 48d5c34 commit cdee198
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@carbon/ibm-products-styles": "^2.50.0",
"@carbon/layout": "^11.28.0",
"@carbon/motion": "^11.24.0",
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.70.0",
"@carbon/themes": "^11.43.0",
"@carbon/type": "^11.33.0",
"@percy/cli": "^1.30.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/ibm-products-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
},
"dependencies": {
"@carbon/ibm-products-styles": "^2.50.0",
"@carbon/styles": "1.68.0",
"@carbon/web-components": "2.16.0",
"@carbon/styles": "1.69.0",
"@carbon/web-components": "2.17.0",
"lit": "^3.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ibm-products/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"@carbon/grid": "^11.29.0",
"@carbon/layout": "^11.28.0",
"@carbon/motion": "^11.24.0",
"@carbon/react": "^1.69.0",
"@carbon/react": "^1.70.0",
"@carbon/themes": "^11.43.0",
"@carbon/type": "^11.33.0",
"react": "^16.8.6 || ^17.0.1 || ^18.2.0",
Expand Down
34 changes: 17 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ __metadata:
"@carbon/ibm-products-styles": "npm:^2.50.0"
"@carbon/layout": "npm:^11.28.0"
"@carbon/motion": "npm:^11.24.0"
"@carbon/react": "npm:^1.69.0"
"@carbon/react": "npm:^1.70.0"
"@carbon/themes": "npm:^11.43.0"
"@carbon/type": "npm:^11.33.0"
"@percy/cli": "npm:^1.30.1"
Expand Down Expand Up @@ -1852,8 +1852,8 @@ __metadata:
"@carbon/ibm-products-styles": "npm:^2.50.0"
"@carbon/icons": "npm:^11.52.0"
"@carbon/motion": "npm:^11.24.0"
"@carbon/styles": "npm:1.68.0"
"@carbon/web-components": "npm:2.16.0"
"@carbon/styles": "npm:1.69.0"
"@carbon/web-components": "npm:2.17.0"
"@mordech/vite-lit-loader": "npm:^0.35.0"
"@rollup/plugin-alias": "npm:^5.1.1"
"@rollup/plugin-commonjs": "npm:^28.0.1"
Expand Down Expand Up @@ -1952,7 +1952,7 @@ __metadata:
"@carbon/grid": ^11.29.0
"@carbon/layout": ^11.28.0
"@carbon/motion": ^11.24.0
"@carbon/react": ^1.69.0
"@carbon/react": ^1.70.0
"@carbon/themes": ^11.43.0
"@carbon/type": ^11.33.0
react: ^16.8.6 || ^17.0.1 || ^18.2.0
Expand Down Expand Up @@ -2027,15 +2027,15 @@ __metadata:
languageName: node
linkType: hard

"@carbon/react@npm:^1.69.0":
version: 1.69.0
resolution: "@carbon/react@npm:1.69.0"
"@carbon/react@npm:^1.70.0":
version: 1.70.0
resolution: "@carbon/react@npm:1.70.0"
dependencies:
"@babel/runtime": "npm:^7.24.7"
"@carbon/feature-flags": "npm:^0.24.0"
"@carbon/icons-react": "npm:^11.52.0"
"@carbon/layout": "npm:^11.28.0"
"@carbon/styles": "npm:^1.68.0"
"@carbon/styles": "npm:^1.69.0"
"@floating-ui/react": "npm:^0.26.0"
"@ibm/telemetry-js": "npm:^1.5.0"
classnames: "npm:2.5.1"
Expand All @@ -2057,7 +2057,7 @@ __metadata:
react: ^16.8.6 || ^17.0.1 || ^18.2.0
react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
sass: ^1.33.0
checksum: d0d7df8b19303ce295c0eb6dec6a8915557be314a2a3409e1fad6e121bef86a343530a96373320fc0dbea0b9d34d45369e983352c6ae0f7782a9fa25681220ac
checksum: b74d9f56caa93cbac8b58ab28d57959e0881591e81e4f4dbaec233ea443423acc51d8ee64cd32968a2b03aec1ffbabf7be6ddd29aadd0169177e2ed285ca3b26
languageName: node
linkType: hard

Expand Down Expand Up @@ -2109,9 +2109,9 @@ __metadata:
languageName: node
linkType: hard

"@carbon/styles@npm:1.68.0, @carbon/styles@npm:^1.68.0":
version: 1.68.0
resolution: "@carbon/styles@npm:1.68.0"
"@carbon/styles@npm:1.69.0, @carbon/styles@npm:^1.69.0":
version: 1.69.0
resolution: "@carbon/styles@npm:1.69.0"
dependencies:
"@carbon/colors": "npm:^11.28.0"
"@carbon/feature-flags": "npm:^0.24.0"
Expand All @@ -2127,7 +2127,7 @@ __metadata:
peerDependenciesMeta:
sass:
optional: true
checksum: 28106636b6fbbc9789faa81bd6441712892daa3eda1852e25be2bc55e42d1db7416477699a828ccc767c11fc1b66c4f74c53c30ed7b3e3f917605c86d9f8eb96
checksum: 7ff43f020ec6ef8641873863637aeb05d849ac34441a9d273b6d7d69b67b7996f4111fadb43697cfb3b2ac736b6815129760c9a1fbbe6f3d195592c186daf6f2
languageName: node
linkType: hard

Expand Down Expand Up @@ -2188,9 +2188,9 @@ __metadata:
languageName: node
linkType: hard

"@carbon/web-components@npm:2.16.0":
version: 2.16.0
resolution: "@carbon/web-components@npm:2.16.0"
"@carbon/web-components@npm:2.17.0":
version: 2.17.0
resolution: "@carbon/web-components@npm:2.17.0"
dependencies:
"@carbon/styles": "npm:1.63.1"
"@floating-ui/dom": "npm:^1.6.3"
Expand All @@ -2199,7 +2199,7 @@ __metadata:
lit: "npm:^3.1.0"
lodash-es: "npm:^4.17.21"
tslib: "npm:^2.6.3"
checksum: 339fc34bef1ab1d2c76195fba9874140d85e268f225177f2cebb770fdc71e156721cedb01c2195d7c34597228dc5dfe709bb553c8158109f29ef70a48299d89d
checksum: dfdea6127f7cf35a4538023e97b5c40ada4dcd8c10a49a506ca5c38a7061f35eacc91ccb93a8d8dc55c4be9c3bb9266f1248192dcb7ba1aed6221f00623f31fd
languageName: node
linkType: hard

Expand Down

0 comments on commit cdee198

Please sign in to comment.