refactor: use branch-pipe

Author: kt3k

bulbofile.js

@@ -7,6 +7,7 @@ const nunjucks = require('gulp-nunjucks')
 const marked = require('gulp-marked')
 const wrapper = require('layout-wrapper')
 const accumulate = require('vinyl-accumulate')
+const branch = require('branch-pipe')
 
 const data = {
   orgName: 'Node.js 日本ユーザーグループ',
@@ -49,59 +50,53 @@ asset('source/events/**/*.md')
   }))
   .pipe(layout('index'))
 
-// Event index pages
+// Event pages
 asset('source/events/**/*.md')
   .watch('source/**/*.{md,njk}')
   .pipe(frontMatter({property: 'fm'}))
   .pipe(marked())
-  .pipe(accumulate('events.html', {
-    debounce: true,
-    sort: (x, y) => y.fm.date[0].valueOf() - x.fm.date[0].valueOf()
-  }))
-  .pipe(layout('event-index'))
+  .pipe(branch.obj(src => [
+    src
+      .pipe(accumulate('events.html', {
+        debounce: true,
+        sort: (x, y) => y.fm.date[0].valueOf() - x.fm.date[0].valueOf()
+      }))
+      .pipe(layout('event-index')), // Event index page
+    src
+      .pipe(layout('event')) // Single event page
+  ]))
 
-// Single event page
-asset('source/events/**/*.md')
-  .watch('source/**/*.{md,njk}')
-  .pipe(frontMatter({property: 'fm'}))
-  .pipe(marked())
-  .pipe(layout('event'))
-
-// News index page
+// News pages
 asset('source/news/**/*.md')
   .watch('source/**/*.{md,njk}')
   .pipe(frontMatter({property: 'fm'}))
   .pipe(marked())
-  .pipe(accumulate('news.html', {
-    debounce: true,
-    sort: (x, y) => y.fm.date.valueOf() - x.fm.date.valueOf()
-  }))
-  .pipe(layout('news-index'))
-
-// Single news pages
-asset('source/news/**/*.md')
-  .watch('source/**/*.{md,njk}')
-  .pipe(frontMatter({property: 'fm'}))
-  .pipe(marked())
-  .pipe(layout('news'))
-
-// Job index page
-asset('source/jobs/**/*.md')
-  .watch('source/**/*.{md,njk}')
-  .pipe(frontMatter({property: 'fm'}))
-  .pipe(marked())
-  .pipe(accumulate('jobboard.html', {
-    debounce: true,
-    sort: (x, y) => y.fm.postedAt.valueOf() - x.fm.postedAt.valueOf()
-  }))
-  .pipe(layout('jobboard'))
+  .pipe(branch.obj(src => [
+    src
+      .pipe(accumulate('news.html', {
+        debounce: true,
+        sort: (x, y) => y.fm.date.valueOf() - x.fm.date.valueOf()
+      }))
+      .pipe(layout('news-index')), // News index page
+    src
+      .pipe(layout('news')) // Single news page
+  ]))
 
-// Single job page
+// Jobboard pages
 asset('source/jobs/**/*.md')
   .watch('source/**/*.{md,njk}')
   .pipe(frontMatter({property: 'fm'}))
   .pipe(marked())
-  .pipe(layout('job'))
+  .pipe(branch.obj(src => [
+    src
+      .pipe(accumulate('jobboard.html', {
+        debounce: true,
+        sort: (x, y) => y.fm.postedAt.valueOf() - x.fm.postedAt.valueOf()
+      }))
+      .pipe(layout('jobboard')), // Job index page
+    src
+      .pipe(layout('job')) // Single job page
+  ]))
 
 asset('source/css/*.css')
 asset('source/images/**/*.{png,svg,jpg,jpeg,gif}')

package.json

@@ -39,6 +39,7 @@
     "vinyl-accumulate": "^1.4.1"
   },
   "devDependencies": {
+    "branch-pipe": "^1.0.1",
     "rimraf": "^2.5.4"
   }
 }

source/layout/event-index.njk

@@ -14,7 +14,7 @@
       {{ date | date('YYYY年MM月DD日') }}
     {% endfor %}
     {% if event.fm.image %}
-      <p><a href="{{ basepath(file) }}{{ event.relative }}"><img src="{{ event.fm.image }}" /></a></p>
+      <p><a href="{{ basepath(file) }}/{{ event.relative }}"><img src="{{ event.fm.image }}" /></a></p>
     {% endif %}
     </ul>
   {% endfor %}

yarn.lock

@@ -167,6 +167,13 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+branch-pipe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/branch-pipe/-/branch-pipe-1.0.1.tgz#f1a1903d15cf8421658ead586c062db7c8dc253d"
+  dependencies:
+    duplexer2 "^0.1.4"
+    merge-stream "^1.0.1"
+
 buffer-shims@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
@@ -1427,6 +1434,12 @@ merge-stream@^1.0.0:
   dependencies:
     readable-stream "^2.0.1"
 
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  dependencies:
+    readable-stream "^2.0.1"
+
 micromatch@^2.1.5, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"