Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix sorting logic for t9nmanifest entries #7203

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/calcite-components/support/generateT9nTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ import { InputData, jsonInputForTargetLanguage, quicktype } from "quicktype-core
const manifestFileContents = paths
.sort((pathA, pathB) => {
// ensure paths are sorted per component-name as `globby` does not guarantee order (see https://github.com/sindresorhus/globby/issues/131)
const componentAName = pathA.split(manifestFilePathSeparator)[2];
const componentBName = pathB.split(manifestFilePathSeparator)[2];
const componentAName = pathA.split(manifestFilePathSeparator).at(-2);
const componentBName = pathB.split(manifestFilePathSeparator).at(-2);

return componentAName.localeCompare(componentBName);
})
.join("\n");
Expand Down
4 changes: 2 additions & 2 deletions t9nmanifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ packages\calcite-components\src\components\action\assets\action\t9n
packages\calcite-components\src\components\action-bar\assets\action-bar\t9n
packages\calcite-components\src\components\action-group\assets\action-group\t9n
packages\calcite-components\src\components\action-pad\assets\action-pad\t9n
packages\calcite-components\src\components\block\assets\block\t9n
packages\calcite-components\src\components\alert\assets\alert\t9n
packages\calcite-components\src\components\block\assets\block\t9n
packages\calcite-components\src\components\block-section\assets\block-section\t9n
packages\calcite-components\src\components\button\assets\button\t9n
packages\calcite-components\src\components\card\assets\card\t9n
Expand All @@ -26,9 +26,9 @@ packages\calcite-components\src\components\menu\assets\menu\t9n
packages\calcite-components\src\components\menu-item\assets\menu-item\t9n
packages\calcite-components\src\components\modal\assets\modal\t9n
packages\calcite-components\src\components\notice\assets\notice\t9n
packages\calcite-components\src\components\pagination\assets\pagination\t9n
packages\calcite-components\src\components\panel\assets\panel\t9n
packages\calcite-components\src\components\pick-list-item\assets\pick-list-item\t9n
packages\calcite-components\src\components\pagination\assets\pagination\t9n
packages\calcite-components\src\components\popover\assets\popover\t9n
packages\calcite-components\src\components\rating\assets\rating\t9n
packages\calcite-components\src\components\scrim\assets\scrim\t9n
Expand Down