Skip to content

Commit

Permalink
Fix: use timsort to be compatible with Node.js 10
Browse files Browse the repository at this point in the history
  • Loading branch information
SukkaW committed Oct 22, 2020
1 parent 03be708 commit 7914def
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion lib/modules/sortAttributes.es6
@@ -1,3 +1,5 @@
import { sort as timSort } from 'timsort';

const validOptions = new Set(['frequency', 'alphabetical']);

const processModuleOptions = options => {
Expand Down Expand Up @@ -29,7 +31,9 @@ class AttributeTokenChain {
_sortOrder.push(item);
}

this.sortOrder = _sortOrder.sort((a, b) => b[1] - a[1]).map(i => i[0]);
timSort(_sortOrder, (a, b) => b[1] - a[1]);

this.sortOrder = _sortOrder.map(i => i[0]);
}

sortFromNodeAttrs(nodeAttrs) {
Expand Down
5 changes: 4 additions & 1 deletion lib/modules/sortAttributesWithLists.es6
@@ -1,4 +1,5 @@
// class, rel, ping
import { sort as timSort } from 'timsort';
import { attributesWithLists } from './collapseAttributeWhitespace';

const validOptions = new Set(['frequency', 'alphabetical']);
Expand Down Expand Up @@ -29,7 +30,9 @@ class AttributeTokenChain {
_sortOrder.push(item);
}

this.sortOrder = _sortOrder.sort((a, b) => b[1] - a[1]).map(i => i[0]);
timSort(_sortOrder, (a, b) => b[1] - a[1]);

this.sortOrder = _sortOrder.map(i => i[0]);
}

sortFromNodeAttrsArray(attrValuesArray) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -39,6 +39,7 @@
"relateurl": "^0.2.7",
"svgo": "^1.3.2",
"terser": "^4.8.0",
"timsort": "^0.3.0",
"uncss": "^0.17.3"
},
"devDependencies": {
Expand Down

0 comments on commit 7914def

Please sign in to comment.