Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/cla-assistant/gith…
Browse files Browse the repository at this point in the history
…ub-action-2.6.1
  • Loading branch information
kodiakhq[bot] authored Oct 2, 2024
2 parents 5b6fa60 + 79eb9d6 commit a6e67da
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 19 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@babel/preset-react": "~7.12.1",
"@commitlint/cli": "^16.0.0",
"@commitlint/config-conventional": "^16.0.0",
"@types/jest": "29.5.12",
"@types/jest": "29.5.13",
"async-done": "^1.3.0",
"babel-preset-carbon": "^0.0.14",
"browserslist-config-carbon": "^10.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"gulp-rename": "^2.0.0",
"gulp-sass": "^5.0.0",
"require-dir": "^1.2.0",
"sass": "~1.78.0",
"sass": "~1.79.0",
"sass-loader": "^13.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"@carbon/icon-helpers": "10.52.0",
"@carbon/icons": "10.48.5",
"@carbon/icons-react": "^11.33.0",
"@carbon/pictograms-react": "11.66.0",
"@carbon/pictograms-react": "11.67.0",
"@carbon/react": "1.66.0",
"@carbon/type": "11.31.0",
"@open-wc/semantic-dom-diff": "~0.18.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/web-components/src/components/card/card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class C4DCard extends CTAMixin(StableSelectorMixin(CDSLink)) {
if (ctaType !== CTA_TYPE.VIDEO) {
return html`<slot name="heading"></slot>`;
}
const caption = formatVideoCaptionInEffect({ name: videoName });
const formatedVideoName = formatVideoCaptionInEffect({ name: videoName });

this.dispatchEvent(
new CustomEvent(
Expand All @@ -116,8 +116,9 @@ class C4DCard extends CTAMixin(StableSelectorMixin(CDSLink)) {
)
);
return html`
<slot name="heading"></slot
><c4d-card-heading part="caption">${caption}</c4d-card-heading>
<slot name="heading">
<c4d-card-heading>${formatedVideoName}</c4d-card-heading>
</slot>
`;
}

Expand Down
64 changes: 51 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3414,7 +3414,7 @@ __metadata:
gulp-rename: "npm:^2.0.0"
gulp-sass: "npm:^5.0.0"
require-dir: "npm:^1.2.0"
sass: "npm:~1.78.0"
sass: "npm:~1.79.0"
sass-loader: "npm:^13.0.0"
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -3509,7 +3509,7 @@ __metadata:
"@carbon/icons-react": "npm:^11.33.0"
"@carbon/layout": "npm:11.26.0"
"@carbon/motion": "npm:11.22.0"
"@carbon/pictograms-react": "npm:11.66.0"
"@carbon/pictograms-react": "npm:11.67.0"
"@carbon/react": "npm:1.66.0"
"@carbon/styles": "npm:1.65.0"
"@carbon/type": "npm:11.31.0"
Expand Down Expand Up @@ -3654,6 +3654,15 @@ __metadata:
languageName: node
linkType: hard

"@carbon/icon-helpers@npm:^10.53.0":
version: 10.53.0
resolution: "@carbon/icon-helpers@npm:10.53.0"
dependencies:
"@ibm/telemetry-js": "npm:^1.5.0"
checksum: 10/94fd69ce9411a5011cd6cbdae4ae543ea1deb1b36b44ab0bd8e21a7f6840e078c0d9db496f4ba8412c8265cda8dcd9d091f8e3c01d34103b8a9013a3cfb064a8
languageName: node
linkType: hard

"@carbon/icons-react@npm:11.49.0, @carbon/icons-react@npm:^11.33.0, @carbon/icons-react@npm:^11.49.0":
version: 11.49.0
resolution: "@carbon/icons-react@npm:11.49.0"
Expand Down Expand Up @@ -3694,16 +3703,16 @@ __metadata:
languageName: node
linkType: hard

"@carbon/pictograms-react@npm:11.66.0":
version: 11.66.0
resolution: "@carbon/pictograms-react@npm:11.66.0"
"@carbon/pictograms-react@npm:11.67.0":
version: 11.67.0
resolution: "@carbon/pictograms-react@npm:11.67.0"
dependencies:
"@carbon/icon-helpers": "npm:^10.52.0"
"@carbon/icon-helpers": "npm:^10.53.0"
"@ibm/telemetry-js": "npm:^1.5.0"
prop-types: "npm:^15.7.2"
peerDependencies:
react: ">=16"
checksum: 10/9797e62f9606a216406d7bb7d7c0ebc2b548d9746d83aa37432bb4a98d74d75721f9d8bc3c052a6fef802563dd10c14a86bb81efd8b6efb0a9f3f374d31e311a
checksum: 10/62e9744b6859a1d0893c50f0274b5251afa45bc1a4efadfc70c24a25feef26363839e0522a117bab950b60f3cbf911b9909a33017c423c273e1f27de4335c89f
languageName: node
linkType: hard

Expand Down Expand Up @@ -7779,13 +7788,13 @@ __metadata:
languageName: node
linkType: hard

"@types/jest@npm:29.5.12":
version: 29.5.12
resolution: "@types/jest@npm:29.5.12"
"@types/jest@npm:29.5.13":
version: 29.5.13
resolution: "@types/jest@npm:29.5.13"
dependencies:
expect: "npm:^29.0.0"
pretty-format: "npm:^29.0.0"
checksum: 10/312e8dcf92cdd5a5847d6426f0940829bca6fe6b5a917248f3d7f7ef5d85c9ce78ef05e47d2bbabc40d41a930e0e36db2d443d2610a9e3db9062da2d5c904211
checksum: 10/7d6e3e4ef4b1cab0f61270d55764709512fdfbcb1bd47c0ef44117d48490529c1f264dacf3440b9188363e99e290b80b79c529eadc3af2184116a90f6856b192
languageName: node
linkType: hard

Expand Down Expand Up @@ -11620,7 +11629,7 @@ __metadata:
"@babel/runtime": "npm:^7.16.3"
"@commitlint/cli": "npm:^16.0.0"
"@commitlint/config-conventional": "npm:^16.0.0"
"@types/jest": "npm:29.5.12"
"@types/jest": "npm:29.5.13"
async-done: "npm:^1.3.0"
babel-preset-carbon: "npm:^0.0.14"
browserslist-config-carbon: "npm:^10.3.0"
Expand Down Expand Up @@ -11857,6 +11866,15 @@ __metadata:
languageName: node
linkType: hard

"chokidar@npm:^4.0.0":
version: 4.0.0
resolution: "chokidar@npm:4.0.0"
dependencies:
readdirp: "npm:^4.0.1"
checksum: 10/e9a65db724a9ba2a40ad10f1d55caa5ccb5ba17533414271ec315004664860439348e51fa4faaa640fcc5f6427a410919fa1608892fbad41ed86fce682633cfa
languageName: node
linkType: hard

"chownr@npm:^1.1.1":
version: 1.1.4
resolution: "chownr@npm:1.1.4"
Expand Down Expand Up @@ -28210,6 +28228,13 @@ __metadata:
languageName: node
linkType: hard

"readdirp@npm:^4.0.1":
version: 4.0.1
resolution: "readdirp@npm:4.0.1"
checksum: 10/f8a2d3308c9dd19d9da4fc7f19a02fc057259a80014949d8f3d98f4e6042896119fb96eb3f3e6a743747d12f0bf781b771902b0b03aba58f884589c50968fad4
languageName: node
linkType: hard

"readdirp@npm:~3.6.0":
version: 3.6.0
resolution: "readdirp@npm:3.6.0"
Expand Down Expand Up @@ -29487,7 +29512,7 @@ __metadata:
languageName: node
linkType: hard

"sass@npm:^1.19.0, sass@npm:~1.78.0":
"sass@npm:^1.19.0":
version: 1.78.0
resolution: "sass@npm:1.78.0"
dependencies:
Expand All @@ -29500,6 +29525,19 @@ __metadata:
languageName: node
linkType: hard

"sass@npm:~1.79.0":
version: 1.79.3
resolution: "sass@npm:1.79.3"
dependencies:
chokidar: "npm:^4.0.0"
immutable: "npm:^4.0.0"
source-map-js: "npm:>=0.6.2 <2.0.0"
bin:
sass: sass.js
checksum: 10/9b83e91c44a4c5d738ded27fcd2c88260f5f407e49c6aab92f75a1f768831182a8f4f89f30e2599b74447451d6536ea6f3a55cac34c5ec00b45983d493732e5d
languageName: node
linkType: hard

"sax@npm:~1.2.4":
version: 1.2.4
resolution: "sax@npm:1.2.4"
Expand Down

0 comments on commit a6e67da

Please sign in to comment.