Skip to content

Commit

Permalink
Merge pull request #42 from hlxsites/main
Browse files Browse the repository at this point in the history
Release 20240802 (Revert UE)
  • Loading branch information
davenichols-DHLS authored Aug 2, 2024
2 parents 65c974f + 7a3673e commit 49a2fc8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions component-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
"resourceType": "core/franklin/components/block/v1/block",
"template": {
"name": "Accordion",
"model": "accordion",
"filter": "accordion"
}
}
Expand Down Expand Up @@ -175,6 +176,7 @@
"resourceType": "core/franklin/components/block/v1/block",
"template": {
"name": "Carousel",
"model": "carousel",
"filter": "carousel"
}
}
Expand Down Expand Up @@ -205,6 +207,7 @@
"resourceType": "core/franklin/components/block/v1/block",
"template": {
"name": "Mini Teasers",
"model": "mini-teasers",
"filter": "mini-teasers"
}
}
Expand Down Expand Up @@ -235,6 +238,7 @@
"resourceType": "core/franklin/components/block/v1/block",
"template": {
"name": "Cards",
"model": "cards",
"filter": "cards"
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/actions/convert/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ function skipConverter(path) {
if (!path) return false;
if (path.includes('-jck1')) return true;
if (path.includes('/en-new')) return true;
if (path.includes('/us/en/blog/')) return true;
if (path.includes('/us/en/news/')) return true;
// if (path.includes('/us/en/blog/')) return true;
// if (path.includes('/us/en/news/')) return true;
// skip the converter for pages like **/products/*/topics/**
const regex = /\/[^/]+\/[^/]+\/products\/[^/]+\/topics-jck1\/[^/]+/;
return regex.test(path);
Expand Down

0 comments on commit 49a2fc8

Please sign in to comment.