git.iko.soy/urbit.org
on master help sign in
Merge pull request #1861 from urbit/mp/grant-fixes
b05bc0c~sarlev-sarsen
lib/cache.js+9−6
compare with master
unifiedsplit
@@ -24,7 +24,7 @@ function buildSearchIndex(dir) {
24
24
25 try {
25 try {
26 metadata = matter(fs.readFileSync(path.join(dir, "_index.md")), options);
26 metadata = matter(fs.readFileSync(path.join(dir, "_index.md")), options);
27− } catch (err) {}
27+ } catch (err) { }
28
28
29 const children = fs.readdirSync(dir, { withFileTypes: true });
29 const children = fs.readdirSync(dir, { withFileTypes: true });
30 const pages = children.filter((f) => f.isFile() && f.name !== "_index.md");
30 const pages = children.filter((f) => f.isFile() && f.name !== "_index.md");
@@ -40,14 +40,17 @@ function buildSearchIndex(dir) {
40 );
40 );
41 const parsed = markdoc.parse(pageContent);
41 const parsed = markdoc.parse(pageContent);
42 const transform = markdoc.transform(parsed);
42 const transform = markdoc.transform(parsed);
43− return {
43+ const slug = dir.includes("/grants/")
44− title: pageData.title,
45− base: page.name,
44+ ? `/grants/${page.name.replace(/.md$/, "")}`
46− slug: path.join(
45+ : path.join(
47 dir.substr(dir.indexOf("content") + 7),
46 dir.substr(dir.indexOf("content") + 7),
48 "/",
47 "/",
49 page.name.replace(/.md$/, "")
48 page.name.replace(/.md$/, "")
50− ),
49+ );
50+ return {
51+ title: pageData.title,
52+ base: page.name,
53+ slug,
51 content: pageData.description || "",
54 content: pageData.description || "",
52 headings: transform.children
55 headings: transform.children
53 .filter((e) => e.name === "h2" || e.name === "h3")
56 .filter((e) => e.name === "h2" || e.name === "h3")
pages/grants.js+2−3
@@ -373,9 +373,8 @@ export async function getStaticProps() {
373 `grants/${year.name}`,
373 `grants/${year.name}`,
374 "date"
374 "date"
375 )
375 )
376− }).flat().sort((a, b) => {
376+ }).flat()
377− return a.title.toLowerCase().localeCompare(b.title.toLowerCase())
377+ .sort((a, b) => new Date(b.date) - new Date(a.date));
378− });
379
378
380 return {
379 return {
381 props: {
380 props: {