Merge pull request #276 from iojs/264_build_process_2

#264 build process - adds various i18n helpers, html-based templates

content/cn/template.json

@@ -9,5 +9,21 @@
   "org-link":"GitHub Org",
   "irc-link":"IRC Chat",
   "irc-logs-link":"Logs",
-  "gov-link":"项目管理"
+  "gov-link":"项目管理",
+  "verbose_version": "{{project.current_version}} 版本",
+  "downloads": {
+    "all": "其他"
+  },
+  "home": {
+    "download_links": "下载 {{> current_download_links}} 版本。",
+    "nightly_releases": "{{link '每日构建版本' 'https://iojs.org/download/nightly/'}} 可用于测试。",
+    "short_description": "{{link 'website'}} 是一个衍生自 {{link 'nodejs'}}，并兼容 {{link 'npm'}} 的开发平台。",
+    "slogan": "将 {{link 'pages.es6'}} 带入 Node 社区！"
+  },
+  "links": {
+    "pages": {
+      "changelog": "更新日志",
+      "faq_verbose": "常见问题"
+    }
+  }
 }

content/en/template.json

@@ -17,5 +17,26 @@
     "win64": "Win64",
     "mac": "Mac",
     "all": "Others"
+  },
+  "verbose_version": "Version {{project.current_version}}",
+  "home": {
+    "download_links": "Download for {{> current_download_links}}",
+    "faq_verbose": "{{link 'pages.faq_verbose'}}",
+    "nightly_releases": "{{link 'Nightly releases' 'https://iojs.org/download/nightly/'}} are available for testing.",
+    "short_description": "{{link 'website'}} is an {{link 'npm'}} compatible platform originally based on {{link 'nodejs'}}.",
+    "slogan": "Bringing {{link 'pages.es6'}} to the Node Community!",
+    "news_link": "{{link 'Weekly Update - March 13th' 'https://medium.com/node-js-javascript/io-js-week-of-march-13th-e3024cc66802'}} <small>featuring core and community updates ({{link 'Medium' 'https://medium.com/node-js-javascript/io-js-week-of-march-13th-e3024cc66802'}})</small>"
+  },
+  "links": {
+    "nodejs": "Node.js™",
+    "npm": "npm",
+    "website": "io.js",
+    "pages": {
+      "changelog": "Changelog",
+      "home": "Home",
+      "es6": "ES6",
+      "faq": "FAQ",
+      "faq_verbose": "Frequenty Asked Questions"
+    }
   }
 }

gulp/config.js

@@ -12,7 +12,7 @@ module.exports = {
   },
   templates: {
     templateSrc: src + '/templates/**/*.html',
-    contentSrc: content + '/**/*.md',
+    contentSrc: content + '/**/*.{html,md}',
     templateJSONsrc: content + '/**/template.json',
     dest: dest
   },

gulp/tasks/build.js

@@ -3,7 +3,8 @@ var runSequence = require('run-sequence');
 
 gulp.task('build', function(cb){
   runSequence(
-    // 'clean',
+    'clean',
+    'content',
     ['stylus', 'templates'],
     'minifyCss',
     cb);

gulp/tasks/content.js

@@ -0,0 +1,44 @@
+var path = require('path');
+var gulp = require('gulp');
+var clone = require('gulp-clone');
+var buffer = require('vinyl-buffer');
+var mergeStream = require('merge-stream');
+var generateContentAndTemplates = require('../util/content').generateContentAndTemplates;
+var through = require('through2');
+
+gulp.task('content', function() {
+  var base = path.resolve(__dirname, '..', '..');
+  var contentJSON = require('../../source/content.js');
+  var languagesJSON = require('../../source/languages.js');
+  var matchHTML = /\.html$/;
+  var templates = {};
+  var templateStreams = mergeStream();
+
+  Object.keys(contentJSON).filter(function(key) {
+    var article = contentJSON[key];
+    if (article.content && matchHTML.test(article.content)) {
+      var contentTemplate = `source/templates/${article.content}`;
+      if (templates[contentTemplate] == null) {
+        templates[contentTemplate] = gulp.src(contentTemplate, {base: 'source/templates'});
+      }
+      languagesJSON.forEach(function(lang) {
+        var newpath = path.resolve(base, 'content', lang.code, article.url);
+        var stream = templates[contentTemplate]
+          .pipe(clone())
+          .pipe(through.obj(function(file, _unused_, cb) {
+            file.base = 'content'
+            file.path = path.join(base, 'content', lang.code, article.url);
+            file._article = article;
+            this.push(file);
+            cb();
+          }));
+        templateStreams.add(stream);
+      });
+    }
+  });
+
+  return templateStreams
+    .pipe(buffer())
+    .pipe(through.obj(generateContentAndTemplates()))
+    .pipe(gulp.dest('public/'))
+});

gulp/tasks/develop.js

@@ -3,7 +3,8 @@ var runSequence = require('run-sequence');
 
 gulp.task('develop', function(cb){
   runSequence(
-    // 'clean',
+    'clean',
+    'content',
     ['stylus', 'templates'],
     ['watch', 'server'],
   cb);

gulp/tasks/templates.js

@@ -1,126 +1,17 @@
 /*
- * 1. because this is a gulp task. duh.
- * 2. to convert markdown to html
- * 3. handlebars is used to convert `{{ }}` placeholders
- *    in markdown, html, to output
- * 4. we get an un-buffered stream we need 100% loaded in order
+ * 1. we get an un-buffered stream we need 100% loaded in order
  *    to properly process
- * 5. the map function helps us "inject" our custom processing steps in to the
+ * 2. the through function helps us "inject" our custom processing steps in to the
  *    incoming file buffer
- * 6. renames our files for output
- * 7. brings in our own shared `utils`
+ * 3. renames our files for output
  */
-var fs = require('fs');
 var path = require('path');
-var gulp = require('gulp'); /* 1 */
-var md = require('markdown-it')({ html: true }); /* 2 */
-var Handlebars = require('handlebars'); /* 3 */
-var buffer = require('vinyl-buffer'); /* 4 */
-var vinylMap = require('vinyl-map'); /* 5 */
-var rename = require('gulp-rename'); /* 6 */
-var utils = require('../util/template-utils.js'); /* 7 */
+var gulp = require('gulp');
 
-
-/*
-  generateContentAndTemplates()
-  =============
-  This function wraps some lookups and caching around otherwise repeated actions
-  within the run of the task returned.
-
-  In general, the purpose is to:
-  - take incoming Markdown files** and inject in dictionary variables
-  - render the post-processed Markdown in to HTML
-  - fetch the appropriate template (HTML)
-  - Inject in dictionary variables and feed the HTML **content** (from markdown)
-    in to the template.
-  - Return the final combined HTML through to the vinyl stream.
-
-  ** later, we want to accept incoming HTML partials as well
-     (not all pages will be Markdown based)
-
-  Returns: a gulp-friendly pipe task (function)
-*/
-function generateContentAndTemplates() {
-  var base, projectJSON, i18nJSON, hbsTemplates;
-
-  /*
-   * cache variables and lookups used on subsequent runs of the pipe task:
-   *
-   * 1. `base` directory of project
-   * 2. `contentBase` is the root directory where the task is getting its content,
-   *     this is helpful later for processing out which i18n we're looking at
-   * 3. `projectJSON` is global, re-used across all languages
-   * 4. `i18nJSON` caches the template JSON for each language (avoids duplicated work)
-   * 5. `hbsTemplates` caches the handlebars FUNCTION for each template to save overhead
-   */
-  base = path.resolve(__dirname, '..', '..'); /* 1 */
-  contentBase = path.resolve(base, 'content'); /* 2 */
-  projectJSON = require('../../source/project.js'); /* 3 */
-  i18nJSON = {}; /* 4 */
-  hbsTemplates = {}; /* 5 */
-
-  // we returned a wrapped function to help us cache some work (above)
-  return function(contentBuffer, file) {
-    var fileName, contentRaw, lang, templateJSON, contentHandlebarsCompiled,
-        contentMarkdownCompiled, template, contentTemplateCompiled;
-
-    fileName = path.parse(file).name
-    contentRaw = contentBuffer.toString();
-
-    // determine the language based off of the current path
-    lang = path.relative(contentBase, path.dirname(file)).split(path.sep)[0];
-
-    if (i18nJSON[lang] == null) {
-      i18nJSON[lang] = utils.loadTemplateJSON(lang);
-    }
-
-    // load the current dictionary for the selected lang
-    templateJSON = {
-      i18n: i18nJSON[lang],
-      lang: lang,
-      build: {
-        markdownPage: fileName,
-        pageStylesheet: fileName
-      },
-      page: {
-        languages: projectJSON.languages.map(function(lang) {
-          return {
-            code: lang.code,
-            name: lang.name,
-            url: `/${lang.code}/${fileName}.html`
-          }
-        })
-      },
-      project: projectJSON
-    }
-
-    // initial Handlebars compile, Markdown content, before parsing
-    // (otherwise the `{{ }}` can be escaped)
-    contentHandlebarsCompiled = Handlebars.compile(contentRaw)(templateJSON);
-
-    // Turn `.md` in to `.html`
-    contentMarkdownCompiled = md.render(contentHandlebarsCompiled)
-
-    // this is hard-coded right now, but planned to be dynamic:
-    template = 'main.html';
-
-    // fetch the final template function we need (if not already cached)
-    if (hbsTemplates[template] == null) {
-      var templateBody =  fs.readFileSync(path.join(base, 'source', 'templates', template), {encoding: 'utf8'});
-      hbsTemplates[template] = Handlebars.compile(templateBody);
-    }
-
-    // Adds the inner-content already processed to the templateJSON
-    // as the dictionaries may be re-used between both levels:
-    templateJSON.content = contentMarkdownCompiled;
-
-    // Compile a version of the template with the content inside:
-    contentTemplateCompiled = hbsTemplates[template](templateJSON)
-
-    // Return as a Buffer for additional processing:
-    return new Buffer(contentTemplateCompiled);
-  }
-};
+var buffer = require('vinyl-buffer'); /* 1 */
+var through = require('through2'); /* 2 */
+var rename = require('gulp-rename'); /* 3 */
+var generateContentAndTemplates = require('../util/content').generateContentAndTemplates;
 
 /*
  * processMarkdown will take markdown files (from content) and apply any
@@ -151,13 +42,13 @@ var processMarkdown = function(eventOrStream, filePath) {
 
   return stream
     .pipe(buffer())
-    .pipe(vinylMap(generateContentAndTemplates()))
+    .pipe(through.obj(generateContentAndTemplates()))
     .pipe(rename({extname: '.html'}))
     .pipe(gulp.dest('public/'))
 }
 
 gulp.task('templates', function() {
-  var stream = gulp.src('content/**/*.md');
+  var stream = gulp.src('content/**/*.{md,html}');
   return processMarkdown(stream);
 });