Refactor to reorder some content

Author: wooorm

generate/component/sponsor/byline.js

@@ -4,6 +4,7 @@
 
 import {h} from 'hastscript'
 
+const gh = 'https://github.com/sponsors/unifiedjs'
 const oc = 'http://opencollective.com/unified'
 
 /**
@@ -16,6 +17,8 @@ export function byline() {
     'Financial support lets the team spend more time maintaining existing ',
     'projects and developing new ones. ',
     'To support unified, become a sponsor or backer on ',
+    h('a', {href: gh}, 'GitHub'),
+    ' or ',
     h('a', {href: oc}, 'OpenCollective'),
     '.'
   ])

generate/page/community.js

@@ -30,12 +30,17 @@ export function community(data) {
   return page(
     h('.row-l.column-l', {}, h('h2', {}, breadcrumbs('/community/'))),
     [
-      h('.article.content', [h('h3', 'Showcase'), casesByline()]),
-      cases(data.users, {max: 3}),
+      h('.article.content', [
+        h('p', [
+          'unified is an open source effort by people volunteering their time. ',
+          'A team of maintainers among the broader community. '
+        ]),
+        h('h3', 'Sponsors'),
+        sponsorsByline()
+      ]),
+      sponsors(data.sponsors, {max: 6}),
       h('.article.content', [h('h3', 'Team'), membersByline()]),
       members(data, sortMembers(data, data.humans), {max: 6}),
-      h('.article.content', [h('h3', 'Sponsors'), sponsorsByline()]),
-      sponsors(data.sponsors, {max: 6}),
       h('.article.content', [
         h('h3', 'Support'),
         h('p', [
@@ -96,7 +101,9 @@ export function community(data) {
           h('a', {href: '/explore/release/'}, 'Releases'),
           ' section for recent releases.'
         ])
-      ])
+      ]),
+      h('.article.content', [h('h3', 'Showcase'), casesByline()]),
+      cases(data.users, {max: 3})
     ]
   )
 }

generate/page/home.js

@@ -20,6 +20,7 @@ import {releases as dataReleases} from '../../data/releases.js'
 import {constantCollective} from '../util/constant-collective.js'
 import {fmtCompact} from '../util/fmt-compact.js'
 import {fmtPercent} from '../util/fmt-percent.js'
+import {fmtPlural} from '../util/fmt-plural.js'
 import {pickRandom} from '../util/pick-random.js'
 import {page} from './page.js'
 
@@ -84,18 +85,6 @@ export function home(data) {
       ])
     ],
     [
-      h('.article.content', [
-        h('h2', 'Build'),
-        h('p', [
-          h('b', 'We provide the building blocks'),
-          ': from tiny, focussed, modular utilities to plugins that combine ',
-          'them to perform bigger tasks. ',
-          'And much, much more. ',
-          'You can build on unified, mixing and matching building blocks ',
-          'together, to make all kinds of interesting new things. '
-        ])
-      ]),
-      cases(data.users, {max: 6}),
       h('.article.content', [
         h('h2', 'Learn'),
         h('p', [
@@ -106,9 +95,19 @@ export function home(data) {
           'make things with unified. '
         ])
       ]),
-      articlesList('/learn/', articlesSort(data.articles), {
-        max: 6
-      }),
+      articlesList('/learn/', articlesSort(data.articles), {max: 6}),
+      h('.article.content', [
+        h('h2', 'Sponsor'),
+        h('p', [
+          'To support our efforts financially, sponsor us on ',
+          h('a', {href: 'https://github.com/sponsors/unifiedjs'}, 'GitHub'),
+          ' or ',
+          h('a', {href: 'http://opencollective.com/unified'}, 'OpenCollective'),
+          '. ',
+          'This lets us spend more time maintaining our projects and developing new ones. '
+        ])
+      ]),
+      sponsors(data.sponsors, {max: 6}),
       h('.article.content', [
         h('h2', 'Explore'),
         h('p', [
@@ -131,6 +130,18 @@ export function home(data) {
         ])
       ]),
       listPackage(data, d, {trail: explore()}),
+      h('.article.content', [
+        h('h2', 'Build'),
+        h('p', [
+          h('b', 'We provide the building blocks'),
+          ': from tiny, focussed, modular utilities to plugins that combine ',
+          'them to perform bigger tasks. ',
+          'And much, much more. ',
+          'You can build on unified, mixing and matching building blocks ',
+          'together, to make all kinds of interesting new things. '
+        ])
+      ]),
+      cases(data.users, {max: 6}),
       h('.article.content', [
         h('h2', 'Work'),
         h('p', [
@@ -143,22 +154,17 @@ export function home(data) {
           ' are currently open (',
           fmtPercent(open / (open + closed)),
           '). ',
-          'In the last 30 days, we’ve cut ' + releases + ' new releases.'
-        ])
-      ]),
-      release(data),
-      h('.article.content', [
-        h('h2', 'Sponsor'),
-        h('p', [
-          'Thankfully, we are backed financially by our sponsors. ',
-          'This allows us to spend more time maintaining our projects and ',
-          'developing new ones. ',
-          'To support our efforts financially, sponsor or back us on ',
-          h('a', {href: 'http://opencollective.com/unified'}, 'OpenCollective'),
-          '.'
+          // Note: data is sometimes missing.
+          releases
+            ? 'In the last 30 days, we’ve cut ' +
+              releases +
+              ' new ' +
+              fmtPlural(releases, {one: 'release', other: 'releases'}) +
+              '.'
+            : undefined
         ])
       ]),
-      sponsors(data.sponsors, {max: 6})
+      release(data)
     ]
   )
 

generate/page/learn.js

@@ -28,7 +28,6 @@ export function learn(sections) {
 
   return page(h('.row-l.column-l', {}, h('h2', {}, breadcrumbs('/learn/'))), [
     h('.article.content', [
-      h('h3', 'Intro'),
       h('p', [
         'unified is an interface for parsing, inspecting, transforming, and ',
         'serializing content through syntax trees. ',