From 5457b88f8d3d234af0b08d15f3c6249f6649aac3 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Fri, 16 Feb 2024 10:16:36 -0400 Subject: data: move sorting & generic functions out of #wiki-data --- src/content/dependencies/generateAlbumInfoPage.js | 2 +- src/content/dependencies/generateAlbumSecondaryNav.js | 2 +- src/content/dependencies/generateAlbumSidebarGroupBox.js | 2 +- src/content/dependencies/generateArtTagGalleryPage.js | 2 +- src/content/dependencies/generateArtistGalleryPage.js | 2 +- .../dependencies/generateArtistInfoPageArtworksChunkedList.js | 9 ++------- .../generateArtistInfoPageCommentaryChunkedList.js | 9 ++------- .../dependencies/generateArtistInfoPageFlashesChunkedList.js | 9 ++------- .../dependencies/generateArtistInfoPageTracksChunkedList.js | 9 ++------- src/content/dependencies/generateCommentaryIndexPage.js | 4 ++-- src/content/dependencies/generateFlashActSidebar.js | 3 +-- src/content/dependencies/generateFooterLocalizationLinks.js | 2 +- src/content/dependencies/generateGroupGalleryPage.js | 8 ++------ src/content/dependencies/generateNewsEntryPage.js | 2 +- src/content/dependencies/generateNewsIndexPage.js | 2 +- src/content/dependencies/generateTrackInfoPage.js | 3 ++- src/content/dependencies/listAlbumsByDate.js | 2 +- src/content/dependencies/listAlbumsByDateAdded.js | 3 ++- src/content/dependencies/listAlbumsByDuration.js | 5 +++-- src/content/dependencies/listAlbumsByName.js | 2 +- src/content/dependencies/listAlbumsByTracks.js | 4 ++-- src/content/dependencies/listAllAdditionalFilesTemplate.js | 4 ++-- src/content/dependencies/listArtistsByCommentaryEntries.js | 4 ++-- src/content/dependencies/listArtistsByContributions.js | 11 +++-------- src/content/dependencies/listArtistsByDuration.js | 5 +++-- src/content/dependencies/listArtistsByGroup.js | 10 +++------- src/content/dependencies/listArtistsByLatestContribution.js | 7 +++---- src/content/dependencies/listArtistsByName.js | 3 ++- src/content/dependencies/listGroupsByAlbums.js | 4 ++-- src/content/dependencies/listGroupsByDuration.js | 5 +++-- src/content/dependencies/listGroupsByLatestAlbum.js | 4 ++-- src/content/dependencies/listGroupsByName.js | 2 +- src/content/dependencies/listGroupsByTracks.js | 4 ++-- src/content/dependencies/listRandomPageLinks.js | 2 +- src/content/dependencies/listTagsByName.js | 2 +- src/content/dependencies/listTagsByUses.js | 4 ++-- src/content/dependencies/listTracksByDate.js | 4 ++-- src/content/dependencies/listTracksByDuration.js | 4 ++-- src/content/dependencies/listTracksByDurationInAlbum.js | 4 ++-- src/content/dependencies/listTracksByName.js | 2 +- src/content/dependencies/listTracksByTimesReferenced.js | 4 ++-- src/content/dependencies/listTracksInFlashesByAlbum.js | 4 ++-- src/content/dependencies/listTracksInFlashesByFlash.js | 2 +- src/content/dependencies/listTracksWithExtra.js | 4 ++-- 44 files changed, 78 insertions(+), 107 deletions(-) (limited to 'src/content') diff --git a/src/content/dependencies/generateAlbumInfoPage.js b/src/content/dependencies/generateAlbumInfoPage.js index 7fbe4e23..5853f115 100644 --- a/src/content/dependencies/generateAlbumInfoPage.js +++ b/src/content/dependencies/generateAlbumInfoPage.js @@ -1,5 +1,5 @@ +import {sortAlbumsTracksChronologically} from '#sort'; import {empty} from '#sugar'; -import {sortAlbumsTracksChronologically} from '#wiki-data'; import getChronologyRelations from '../util/getChronologyRelations.js'; diff --git a/src/content/dependencies/generateAlbumSecondaryNav.js b/src/content/dependencies/generateAlbumSecondaryNav.js index 6ffb9351..5b2e3404 100644 --- a/src/content/dependencies/generateAlbumSecondaryNav.js +++ b/src/content/dependencies/generateAlbumSecondaryNav.js @@ -1,5 +1,5 @@ +import {sortChronologically} from '#sort'; import {atOffset, stitchArrays} from '#sugar'; -import {sortChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateAlbumSidebarGroupBox.js b/src/content/dependencies/generateAlbumSidebarGroupBox.js index 9e1b4cde..93ebf5d4 100644 --- a/src/content/dependencies/generateAlbumSidebarGroupBox.js +++ b/src/content/dependencies/generateAlbumSidebarGroupBox.js @@ -1,5 +1,5 @@ +import {sortChronologically} from '#sort'; import {atOffset, empty} from '#sugar'; -import {sortChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateArtTagGalleryPage.js b/src/content/dependencies/generateArtTagGalleryPage.js index 62b88bcf..962f1b7f 100644 --- a/src/content/dependencies/generateArtTagGalleryPage.js +++ b/src/content/dependencies/generateArtTagGalleryPage.js @@ -1,5 +1,5 @@ +import {sortAlbumsTracksChronologically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortAlbumsTracksChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateArtistGalleryPage.js b/src/content/dependencies/generateArtistGalleryPage.js index 11cf8cdf..13779159 100644 --- a/src/content/dependencies/generateArtistGalleryPage.js +++ b/src/content/dependencies/generateArtistGalleryPage.js @@ -1,5 +1,5 @@ +import {sortAlbumsTracksChronologically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortAlbumsTracksChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js b/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js index 36daf9c4..0beeb271 100644 --- a/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js +++ b/src/content/dependencies/generateArtistInfoPageArtworksChunkedList.js @@ -1,10 +1,5 @@ -import {stitchArrays} from '#sugar'; - -import { - chunkByProperties, - sortAlbumsTracksChronologically, - sortEntryThingPairs, -} from '#wiki-data'; +import {sortAlbumsTracksChronologically, sortEntryThingPairs} from '#sort'; +import {chunkByProperties, stitchArrays} from '#sugar'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js b/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js index 7c2418b1..0bcadc7c 100644 --- a/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js +++ b/src/content/dependencies/generateArtistInfoPageCommentaryChunkedList.js @@ -1,10 +1,5 @@ -import {stitchArrays} from '#sugar'; - -import { - chunkByProperties, - sortAlbumsTracksChronologically, - sortEntryThingPairs, -} from '#wiki-data'; +import {sortAlbumsTracksChronologically, sortEntryThingPairs} from '#sort'; +import {chunkByProperties, stitchArrays} from '#sugar'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js b/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js index 75a1d05a..88a97af2 100644 --- a/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js +++ b/src/content/dependencies/generateArtistInfoPageFlashesChunkedList.js @@ -1,10 +1,5 @@ -import {stitchArrays} from '#sugar'; - -import { - chunkByProperties, - sortEntryThingPairs, - sortFlashesChronologically, -} from '#wiki-data'; +import {sortEntryThingPairs, sortFlashesChronologically} from '#sort'; +import {chunkByProperties, stitchArrays} from '#sugar'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js b/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js index a8209165..d68eba3f 100644 --- a/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js +++ b/src/content/dependencies/generateArtistInfoPageTracksChunkedList.js @@ -1,10 +1,5 @@ -import {accumulateSum, empty, stitchArrays} from '#sugar'; - -import { - chunkByProperties, - sortAlbumsTracksChronologically, - sortEntryThingPairs, -} from '#wiki-data'; +import {sortAlbumsTracksChronologically, sortEntryThingPairs} from '#sort'; +import {accumulateSum, chunkByProperties, empty, stitchArrays} from '#sugar'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateCommentaryIndexPage.js b/src/content/dependencies/generateCommentaryIndexPage.js index 5d38941a..3c3504d2 100644 --- a/src/content/dependencies/generateCommentaryIndexPage.js +++ b/src/content/dependencies/generateCommentaryIndexPage.js @@ -1,5 +1,5 @@ -import {accumulateSum, stitchArrays} from '#sugar'; -import {filterMultipleArrays, sortChronologically} from '#wiki-data'; +import {sortChronologically} from '#sort'; +import {accumulateSum, filterMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: ['generatePageLayout', 'linkAlbumCommentary'], diff --git a/src/content/dependencies/generateFlashActSidebar.js b/src/content/dependencies/generateFlashActSidebar.js index 3c631d92..0bbfa1f8 100644 --- a/src/content/dependencies/generateFlashActSidebar.js +++ b/src/content/dependencies/generateFlashActSidebar.js @@ -1,6 +1,5 @@ import find from '#find'; -import {stitchArrays} from '#sugar'; -import {filterMultipleArrays} from '#wiki-data'; +import {filterMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: ['linkFlash', 'linkFlashAct', 'linkFlashIndex'], diff --git a/src/content/dependencies/generateFooterLocalizationLinks.js b/src/content/dependencies/generateFooterLocalizationLinks.js index 86e6c61a..dfd83aef 100644 --- a/src/content/dependencies/generateFooterLocalizationLinks.js +++ b/src/content/dependencies/generateFooterLocalizationLinks.js @@ -1,5 +1,5 @@ +import {sortByName} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortByName} from '#wiki-data'; export default { extraDependencies: [ diff --git a/src/content/dependencies/generateGroupGalleryPage.js b/src/content/dependencies/generateGroupGalleryPage.js index 490dcf10..b29c586f 100644 --- a/src/content/dependencies/generateGroupGalleryPage.js +++ b/src/content/dependencies/generateGroupGalleryPage.js @@ -1,10 +1,6 @@ +import {sortChronologically} from '#sort'; import {empty, stitchArrays} from '#sugar'; - -import { - filterItemsForCarousel, - getTotalDuration, - sortChronologically, -} from '#wiki-data'; +import {filterItemsForCarousel, getTotalDuration} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateNewsEntryPage.js b/src/content/dependencies/generateNewsEntryPage.js index fa4d68a8..bcba7194 100644 --- a/src/content/dependencies/generateNewsEntryPage.js +++ b/src/content/dependencies/generateNewsEntryPage.js @@ -1,5 +1,5 @@ +import {sortChronologically} from '#sort'; import {atOffset} from '#sugar'; -import {sortChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateNewsIndexPage.js b/src/content/dependencies/generateNewsIndexPage.js index 64279d7d..539af804 100644 --- a/src/content/dependencies/generateNewsIndexPage.js +++ b/src/content/dependencies/generateNewsIndexPage.js @@ -1,5 +1,5 @@ +import {sortChronologically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js index 9cce744b..7b70d4ff 100644 --- a/src/content/dependencies/generateTrackInfoPage.js +++ b/src/content/dependencies/generateTrackInfoPage.js @@ -1,5 +1,6 @@ +import {sortAlbumsTracksChronologically, sortFlashesChronologically} + from '#sort'; import {empty, stitchArrays} from '#sugar'; -import {sortAlbumsTracksChronologically, sortFlashesChronologically} from '#wiki-data'; import getChronologyRelations from '../util/getChronologyRelations.js'; diff --git a/src/content/dependencies/listAlbumsByDate.js b/src/content/dependencies/listAlbumsByDate.js index a5e31a0b..c83ffc97 100644 --- a/src/content/dependencies/listAlbumsByDate.js +++ b/src/content/dependencies/listAlbumsByDate.js @@ -1,5 +1,5 @@ +import {sortChronologically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortChronologically} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkAlbum'], diff --git a/src/content/dependencies/listAlbumsByDateAdded.js b/src/content/dependencies/listAlbumsByDateAdded.js index 75114a48..d462ad46 100644 --- a/src/content/dependencies/listAlbumsByDateAdded.js +++ b/src/content/dependencies/listAlbumsByDateAdded.js @@ -1,4 +1,5 @@ -import {chunkByProperties, sortAlphabetically} from '#wiki-data'; +import {sortAlphabetically} from '#sort'; +import {chunkByProperties} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkAlbum'], diff --git a/src/content/dependencies/listAlbumsByDuration.js b/src/content/dependencies/listAlbumsByDuration.js index 1f95f5e3..c60685ab 100644 --- a/src/content/dependencies/listAlbumsByDuration.js +++ b/src/content/dependencies/listAlbumsByDuration.js @@ -1,5 +1,6 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, getTotalDuration, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; +import {getTotalDuration} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkAlbum'], diff --git a/src/content/dependencies/listAlbumsByName.js b/src/content/dependencies/listAlbumsByName.js index 287dc0be..21419537 100644 --- a/src/content/dependencies/listAlbumsByName.js +++ b/src/content/dependencies/listAlbumsByName.js @@ -1,5 +1,5 @@ +import {sortAlphabetically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortAlphabetically} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkAlbum'], diff --git a/src/content/dependencies/listAlbumsByTracks.js b/src/content/dependencies/listAlbumsByTracks.js index abf3c3ff..798e6c2e 100644 --- a/src/content/dependencies/listAlbumsByTracks.js +++ b/src/content/dependencies/listAlbumsByTracks.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkAlbum'], diff --git a/src/content/dependencies/listAllAdditionalFilesTemplate.js b/src/content/dependencies/listAllAdditionalFilesTemplate.js index 627fdab4..bf48c966 100644 --- a/src/content/dependencies/listAllAdditionalFilesTemplate.js +++ b/src/content/dependencies/listAllAdditionalFilesTemplate.js @@ -1,5 +1,5 @@ -import {empty, stitchArrays} from '#sugar'; -import {filterMultipleArrays, sortChronologically} from '#wiki-data'; +import {sortChronologically} from '#sort'; +import {empty, filterMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: [ diff --git a/src/content/dependencies/listArtistsByCommentaryEntries.js b/src/content/dependencies/listArtistsByCommentaryEntries.js index aac3cfd1..eff2dba3 100644 --- a/src/content/dependencies/listArtistsByCommentaryEntries.js +++ b/src/content/dependencies/listArtistsByCommentaryEntries.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkArtist'], diff --git a/src/content/dependencies/listArtistsByContributions.js b/src/content/dependencies/listArtistsByContributions.js index 61141155..0af586cd 100644 --- a/src/content/dependencies/listArtistsByContributions.js +++ b/src/content/dependencies/listArtistsByContributions.js @@ -1,11 +1,6 @@ -import {empty, stitchArrays, unique} from '#sugar'; - -import { - filterByCount, - filterMultipleArrays, - sortAlphabetically, - sortByCount, -} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {empty, filterByCount, filterMultipleArrays, stitchArrays, unique} + from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkArtist'], diff --git a/src/content/dependencies/listArtistsByDuration.js b/src/content/dependencies/listArtistsByDuration.js index 056b126c..f677d82c 100644 --- a/src/content/dependencies/listArtistsByDuration.js +++ b/src/content/dependencies/listArtistsByDuration.js @@ -1,5 +1,6 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, getTotalDuration, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; +import {getTotalDuration} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkArtist'], diff --git a/src/content/dependencies/listArtistsByGroup.js b/src/content/dependencies/listArtistsByGroup.js index 69f910c7..30884d24 100644 --- a/src/content/dependencies/listArtistsByGroup.js +++ b/src/content/dependencies/listArtistsByGroup.js @@ -1,10 +1,6 @@ -import {empty, stitchArrays, unique} from '#sugar'; - -import { - filterMultipleArrays, - getArtistNumContributions, - sortAlphabetically, -} from '#wiki-data'; +import {sortAlphabetically} from '#sort'; +import {empty, filterMultipleArrays, stitchArrays, unique} from '#sugar'; +import {getArtistNumContributions} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkArtist', 'linkGroup'], diff --git a/src/content/dependencies/listArtistsByLatestContribution.js b/src/content/dependencies/listArtistsByLatestContribution.js index 03c51699..0f709577 100644 --- a/src/content/dependencies/listArtistsByLatestContribution.js +++ b/src/content/dependencies/listArtistsByLatestContribution.js @@ -1,13 +1,12 @@ -import {empty, stitchArrays} from '#sugar'; +import {chunkMultipleArrays, empty, sortMultipleArrays, stitchArrays} + from '#sugar'; import T from '#things'; import { - chunkMultipleArrays, sortAlphabetically, sortAlbumsTracksChronologically, sortFlashesChronologically, - sortMultipleArrays, -} from '#wiki-data'; +} from '#sort'; const {Album, Flash} = T; diff --git a/src/content/dependencies/listArtistsByName.js b/src/content/dependencies/listArtistsByName.js index 7704e97b..93218492 100644 --- a/src/content/dependencies/listArtistsByName.js +++ b/src/content/dependencies/listArtistsByName.js @@ -1,5 +1,6 @@ +import {sortAlphabetically} from '#sort'; import {stitchArrays} from '#sugar'; -import {getArtistNumContributions, sortAlphabetically} from '#wiki-data'; +import {getArtistNumContributions} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkArtist', 'linkGroup'], diff --git a/src/content/dependencies/listGroupsByAlbums.js b/src/content/dependencies/listGroupsByAlbums.js index 063b8269..4adfb6d9 100644 --- a/src/content/dependencies/listGroupsByAlbums.js +++ b/src/content/dependencies/listGroupsByAlbums.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkGroup'], diff --git a/src/content/dependencies/listGroupsByDuration.js b/src/content/dependencies/listGroupsByDuration.js index e2a023e6..da2f26db 100644 --- a/src/content/dependencies/listGroupsByDuration.js +++ b/src/content/dependencies/listGroupsByDuration.js @@ -1,5 +1,6 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, getTotalDuration, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; +import {getTotalDuration} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkGroup'], diff --git a/src/content/dependencies/listGroupsByLatestAlbum.js b/src/content/dependencies/listGroupsByLatestAlbum.js index fa223664..48319314 100644 --- a/src/content/dependencies/listGroupsByLatestAlbum.js +++ b/src/content/dependencies/listGroupsByLatestAlbum.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {compareDates, filterMultipleArrays, sortChronologically, sortMultipleArrays} from '#wiki-data'; +import {compareDates, sortChronologically} from '#sort'; +import {filterMultipleArrays, sortMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: [ diff --git a/src/content/dependencies/listGroupsByName.js b/src/content/dependencies/listGroupsByName.js index 8f0c424d..696a49bd 100644 --- a/src/content/dependencies/listGroupsByName.js +++ b/src/content/dependencies/listGroupsByName.js @@ -1,5 +1,5 @@ +import {sortAlphabetically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortAlphabetically} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkGroup', 'linkGroupGallery'], diff --git a/src/content/dependencies/listGroupsByTracks.js b/src/content/dependencies/listGroupsByTracks.js index b3c55ca2..0b5e4e97 100644 --- a/src/content/dependencies/listGroupsByTracks.js +++ b/src/content/dependencies/listGroupsByTracks.js @@ -1,5 +1,5 @@ -import {accumulateSum, stitchArrays} from '#sugar'; -import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {accumulateSum, filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkGroup'], diff --git a/src/content/dependencies/listRandomPageLinks.js b/src/content/dependencies/listRandomPageLinks.js index 18585696..ab2eca93 100644 --- a/src/content/dependencies/listRandomPageLinks.js +++ b/src/content/dependencies/listRandomPageLinks.js @@ -1,5 +1,5 @@ +import {sortChronologically} from '#sort'; import {empty} from '#sugar'; -import {sortChronologically} from '#wiki-data'; export default { contentDependencies: [ diff --git a/src/content/dependencies/listTagsByName.js b/src/content/dependencies/listTagsByName.js index 8571ccd0..d7022a55 100644 --- a/src/content/dependencies/listTagsByName.js +++ b/src/content/dependencies/listTagsByName.js @@ -1,5 +1,5 @@ +import {sortAlphabetically} from '#sort'; import {stitchArrays} from '#sugar'; -import {sortAlphabetically} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkArtTag'], diff --git a/src/content/dependencies/listTagsByUses.js b/src/content/dependencies/listTagsByUses.js index 98a50b89..00c700a5 100644 --- a/src/content/dependencies/listTagsByUses.js +++ b/src/content/dependencies/listTagsByUses.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkArtTag'], diff --git a/src/content/dependencies/listTracksByDate.js b/src/content/dependencies/listTracksByDate.js index 25beb739..01ce4e2d 100644 --- a/src/content/dependencies/listTracksByDate.js +++ b/src/content/dependencies/listTracksByDate.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {chunkByProperties, sortAlbumsTracksChronologically} from '#wiki-data'; +import {sortAlbumsTracksChronologically} from '#sort'; +import {chunkByProperties, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'], diff --git a/src/content/dependencies/listTracksByDuration.js b/src/content/dependencies/listTracksByDuration.js index bff9bd45..64feb4f1 100644 --- a/src/content/dependencies/listTracksByDuration.js +++ b/src/content/dependencies/listTracksByDuration.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, sortAlphabetically, sortByCount} from '#wiki-data'; +import {sortAlphabetically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkTrack'], diff --git a/src/content/dependencies/listTracksByDurationInAlbum.js b/src/content/dependencies/listTracksByDurationInAlbum.js index 4e83e921..c1ea32a1 100644 --- a/src/content/dependencies/listTracksByDurationInAlbum.js +++ b/src/content/dependencies/listTracksByDurationInAlbum.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, filterMultipleArrays, sortByCount, sortChronologically} from '#wiki-data'; +import {sortByCount, sortChronologically} from '#sort'; +import {filterByCount, filterMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'], diff --git a/src/content/dependencies/listTracksByName.js b/src/content/dependencies/listTracksByName.js index caf6886f..773b0473 100644 --- a/src/content/dependencies/listTracksByName.js +++ b/src/content/dependencies/listTracksByName.js @@ -1,4 +1,4 @@ -import {sortAlphabetically} from '#wiki-data'; +import {sortAlphabetically} from '#sort'; export default { contentDependencies: ['generateListingPage', 'linkTrack'], diff --git a/src/content/dependencies/listTracksByTimesReferenced.js b/src/content/dependencies/listTracksByTimesReferenced.js index 15a3461d..5838ded0 100644 --- a/src/content/dependencies/listTracksByTimesReferenced.js +++ b/src/content/dependencies/listTracksByTimesReferenced.js @@ -1,5 +1,5 @@ -import {stitchArrays} from '#sugar'; -import {filterByCount, sortAlbumsTracksChronologically, sortByCount} from '#wiki-data'; +import {sortAlbumsTracksChronologically, sortByCount} from '#sort'; +import {filterByCount, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkTrack'], diff --git a/src/content/dependencies/listTracksInFlashesByAlbum.js b/src/content/dependencies/listTracksInFlashesByAlbum.js index 53ceb0ee..8ca0d993 100644 --- a/src/content/dependencies/listTracksInFlashesByAlbum.js +++ b/src/content/dependencies/listTracksInFlashesByAlbum.js @@ -1,5 +1,5 @@ -import {empty, stitchArrays} from '#sugar'; -import {filterMultipleArrays, sortChronologically} from '#wiki-data'; +import {sortChronologically} from '#sort'; +import {empty, filterMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkAlbum', 'linkFlash', 'linkTrack'], diff --git a/src/content/dependencies/listTracksInFlashesByFlash.js b/src/content/dependencies/listTracksInFlashesByFlash.js index c80d5822..6ab954ed 100644 --- a/src/content/dependencies/listTracksInFlashesByFlash.js +++ b/src/content/dependencies/listTracksInFlashesByFlash.js @@ -1,5 +1,5 @@ +import {sortFlashesChronologically} from '#sort'; import {empty, stitchArrays} from '#sugar'; -import {sortFlashesChronologically} from '#wiki-data'; export default { contentDependencies: ['generateListingPage', 'linkAlbum', 'linkFlash', 'linkTrack'], diff --git a/src/content/dependencies/listTracksWithExtra.js b/src/content/dependencies/listTracksWithExtra.js index c9f80f35..c7f42f9d 100644 --- a/src/content/dependencies/listTracksWithExtra.js +++ b/src/content/dependencies/listTracksWithExtra.js @@ -1,5 +1,5 @@ -import {empty, stitchArrays} from '#sugar'; -import {filterMultipleArrays, sortChronologically} from '#wiki-data'; +import {sortChronologically} from '#sort'; +import {empty, filterMultipleArrays, stitchArrays} from '#sugar'; export default { contentDependencies: ['generateListingPage', 'linkAlbum', 'linkTrack'], -- cgit 1.3.0-6-gf8a5