Update html build process to use Markdown input

marijnh · marijnh · commit a5695d410414 · 2017-09-28T17:02:28.000+02:00
diff --git a/Makefile b/Makefile
@@ -8,9 +8,9 @@ html: $(foreach CHAP,$(CHAPTERS),html/$(CHAP).html) html/js/acorn_codemirror.js
       code/skillsharing.zip code/solutions/20_4_a_public_space_on_the_web.zip html/js/chapter_info.js \
       $(patsubst img/%.svg,img/generated/%.png,$(SVGS))
 
-html/%.html: %.txt asciidoc_html.conf
-	PATH=node_modules/codemirror/bin:$(PATH) asciidoc -f asciidoc_html.conf --backend=html5 -o - $< | node bin/addmarks > $@
-	node bin/build_code.js $<
+html/%.html: %.md
+	node src/render_html.js $< > $@
+	node src/build_code.js $<
 
 html/js/chapter_info.js: $(foreach CHAP,$(CHAPTERS),$(CHAP).txt) code/solutions/* bin/chapter_info.js
 	node bin/chapter_info.js > html/js/chapter_info.js
diff --git a/src/build_code.js b/src/build_code.js
@@ -0,0 +1,26 @@
+var fs = require("fs");
+
+var file = process.argv[2];
+var input = fs.readFileSync(file, "utf8");
+
+var included = /\{\{includeCode\b(.*)\}\}(?:\s|\{\{.*)*```.*\n([^]*?\n)```/g, m;
+var files = Object.create(null);
+var defaultFile = "code/chapter/" + file.replace(".md", ".js");
+
+while (m = included.exec(input)) {
+  var snippet = m[2], directive = JSON.parse(m[1]), file = defaultFile;
+  snippet = snippet.replace(/(\n|^)\s*\/\/ →.*\n/g, "$1");
+  if (directive.indexOf("strip_log") > -1)
+    snippet = snippet.replace(/(\n|^)\s*console\.log\(.*\);\n/g, "$1");
+  if (m = directive.match(/top_lines:\s*(\d+)/))
+    snippet = snippet.split("\n").slice(0, Number(m[1])).join("\n") + "\n";
+  if (m = directive.match(/\s>(\S+)/))
+    file = m[1];
+  if (file in files)
+    files[file].push(snippet);
+  else
+    files[file] = [snippet];
+}
+
+for (var file in files)
+  fs.writeFileSync(file, files[file].join("\n"), "utf8");
