Consolidate into single minify transform

pdehaan · pdehaan · commit 3d1a0f75e4be · 2020-09-25T09:52:45.000-07:00
diff --git a/.eleventy.js b/.eleventy.js
@@ -1,6 +1,5 @@
 module.exports = (eleventyConfig) => {
-  eleventyConfig.addTransform("jsmin", require("./transforms/jsmin"));
-  eleventyConfig.addTransform("htmlmin", require("./transforms/htmlmin"));
+  eleventyConfig.addTransform("minify", require("./transforms/minify"));
 
   return {
     dir: {
diff --git a/transforms/htmlmin.js b/transforms/htmlmin.js
@@ -1,17 +1,16 @@
-module.exports = async (content, outputPath) => {
-  if (!outputPath.endsWith(".html")) {
-    return content;
-  }
+const minify = require("html-minifier").minify;
+const prettier = require("prettier");
 
-  const $content = require("prettier").format(content, { parser: "html" });
+module.exports = async (content, outputPath) => {
+  const $content = prettier.format(content, { parser: "html" });
 
   // If this is NOT a production build, return the prettified HTML for easier debugging.
   if (process.env.NODE_ENV !== "production") {
     return $content;
   }
 
   // Else, let's "aggressively" minify the HTML (and any inlined CSS/JavaScript).
-  return require("html-minifier").minify($content, {
+  return minify($content, {
     collapseWhitespace: true,
     minifyCSS: true,
     minifyJS: true,
diff --git a/transforms/jsmin.js b/transforms/jsmin.js
@@ -1,8 +1,6 @@
-module.exports = async (content, outputPath) => {
-  if (!outputPath.endsWith(".min.js")) {
-    return content;
-  }
+const minify = require("terser").minify;
 
-  const minified = await require("terser").minify(content, {});
+module.exports = async (content, outputPath) => {
+  const minified = await minify(content, {});
   return minified.code;
 };
diff --git a/transforms/minify.js b/transforms/minify.js
@@ -0,0 +1,16 @@
+const extname = require("path").extname;
+
+const htmlmin = require("./htmlmin");
+const jsmin = require("./jsmin");
+
+module.exports = async (content, outputPath) => {
+  const ext = extname(outputPath);
+  switch (ext) {
+    case ".html":
+      return htmlmin(content, outputPath);
+    case ".js":
+      return jsmin(content, outputPath);
+    default:
+      return content;
+  }
+};
