move base16 themes into subdir

highlightjs · Apr 14, 2021 · f4cd6d5 · f4cd6d5
1 parent a046e34
commit f4cd6d5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/src/styles/zenburn.css → src/styles/base16/zenburn.css b/src/styles/zenburn.css → src/styles/base16/zenburn.css
diff --git a/tools/build_browser.js b/tools/build_browser.js
@@ -1,5 +1,6 @@
 const _ = require('lodash');
 const fs = require("fs").promises;
+const fss = require("fs");
 const glob = require("glob-promise");
 const path = require("path");
 const zlib = require('zlib');
@@ -23,6 +24,14 @@ function buildHeader(args) {
   ` */`;
 }
 
+function sortByKey(array, key) {
+  return array.sort(function(a, b) {
+    const x = a[key];
+    const y = b[key];
+    return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+  });
+}
+
 function detailedGrammarSizes(languages) {
   if (languages.length > 180) return;
 
@@ -120,10 +129,19 @@ async function renderIndex(languages, minify) {
       count: categoryCounter.get(category)
     }));
 
-  const css = await glob("styles/*.css", { cwd: "./src" });
-  const styles = css
-    .map((el) => ({ name: _.startCase(path.basename(el, ".css")), path: el }))
+  function nameForStyle(file) {
+    let name = _.startCase(path.basename(file, ".css"));
+    if (file.includes("base16/")) {
+      name = `Base16 / ${name}`;
+    }
+    return name;
+  }
+
+  const css = await glob("styles/**/*.css", { cwd: "./src" });
+  let styles = css
+    .map((el) => ({ name: nameForStyle(el), path: el }))
     .filter((style) => style.name !== "Default");
+  styles = sortByKey(styles, "name");
 
   renderTemplate("./demo/index.html", "./demo/index.html", {
     categories,
@@ -144,11 +162,13 @@ async function installDocs() {
 function installDemoStyles() {
   log("Writing style files.");
   mkdir("demo/styles");
+  mkdir("demo/styles/base16");
 
-  glob.sync("*", { cwd: "./src/styles" }).forEach((file) => {
+  glob.sync("**", { cwd: "./src/styles" }).forEach((file) => {
+    const stat = fss.statSync(`./src/styles/${file}`);
     if (file.endsWith(".css")) {
       installCleanCSS(`./src/styles/${file}`, `demo/styles/${file}`);
-    } else {
+    } else if (!stat.isDirectory) {
       // images, backgrounds, etc
       install(`./src/styles/${file}`, `demo/styles/${file}`);
     }

diff --git a/tools/build_node.js b/tools/build_node.js
@@ -1,5 +1,7 @@
 const fs = require("fs").promises;
+const fss = require("fs");
 const config = require("./build_config");
+const glob = require("glob-promise");
 const { getLanguages } = require("./lib/language");
 const { install, mkdir } = require("./lib/makestuff");
 const { filter } = require("./lib/dependencies");
@@ -58,8 +60,8 @@ async function buildLanguages(languages) {
 
 async function buildNode(options) {
   mkdir("lib/languages");
-  mkdir("scss");
-  mkdir("styles");
+  mkdir("scss/base16");
+  mkdir("styles/base16");
   mkdir("types");
 
   install("./LICENSE", "LICENSE");
@@ -68,8 +70,11 @@ async function buildNode(options) {
   install("./src/core.d.ts","lib/core.d.ts");
 
   log("Writing styles.");
-  const styles = await fs.readdir("./src/styles/");
-  styles.forEach((file) => {
+  // const styles = await fs.readdir("./src/styles/");
+  glob.sync("**", { cwd: "./src/styles" }).forEach((file) => {
+    const stat = fss.statSync(`./src/styles/${file}`);
+    if (stat.isDirectory()) return;
+
     install(`./src/styles/${file}`, `styles/${file}`);
     install(`./src/styles/${file}`, `scss/${file.replace(".css", ".scss")}`);
   });