diff --git a/build/index.js b/build/index.js index 85353cd4..7de2d23b 100644 --- a/build/index.js +++ b/build/index.js @@ -122,7 +122,7 @@ Metalsmith(cwd) .use(collections({ blog: { pattern: 'blog/*.md', - sortBy: 'date', + sortBy: 'order', reverse: true, refer: false }, diff --git a/build/plugins/order.js b/build/plugins/order.js index c497b00b..54dfbaf4 100644 --- a/build/plugins/order.js +++ b/build/plugins/order.js @@ -4,15 +4,15 @@ function plugin() { return function (files, metalsmith, done) { Object.keys(files).forEach((file) => { - if (!file.includes('docs')) { + if (!file.includes('docs' || 'blog')) { return } - const res = path.basename(file).match(/^(\d+)-/); + const res = path.basename(file).match(/^(?:(?:\d+)-)+/); if (res) { const data = files[file]; - data.order = res[1]; + data.order = res[0].replace(/-/g, ''); data.slug = data.slug.replace(res[0], ''); @@ -24,4 +24,4 @@ function plugin() { } } -module.exports = plugin; \ No newline at end of file +module.exports = plugin;