highmark-cli 0.0.183 → 0.0.184

package/bin/action/publish.js

@@ -2,8 +2,8 @@
 
 const watchOperation = require("../operation/watch"),
       serverOperation = require("../operation/server"),
+      copyHTMLOperation = require("../operation/copyHTML"),
       copyFontsOperation = require("../operation/copyFonts"),
-      indexHTMLOperation = require("../operation/indexHTML"),
       markdownHTMLOperation = require("../operation/markdownHTML"),
       copyClientFilesOperation = require("../operation/copyClientFiles"),
       markdownStylesCSSOperation = require("../operation/markdownStylesCSS");
@@ -17,7 +17,7 @@ function publishAction(port, watch, quietly, copyFonts, startServer, inputFilePa
           markdownStylesCSSOperation,
           copyClientFilesOperation,
           copyFontsOperation,
-          indexHTMLOperation,
+          copyHTMLOperation,
           serverOperation,
           watchOperation
         ],

package/bin/constants.js

@@ -7,8 +7,6 @@ const FONT = "font",
       LIVE_RELOAD_PATH = "/live-reload",
       INDEX_HTML_FILE_NAME = "index.html",
       DIVS_SELECTOR_STRING = "body > div",
-      INDEX_TEMPLATE_FILE_PATH = "template/index.html",
-      CLIENT_TEMPLATE_FILE_PATH = "template/client.html",
       CLIENT_DIVS_SELECTOR_STRING = "body > div.view > div.divisions > div",
       DEFAULT_DIVISION_IDENTIFIER = "default";
 
@@ -20,8 +18,6 @@ module.exports = {
   LIVE_RELOAD_PATH,
   INDEX_HTML_FILE_NAME,
   DIVS_SELECTOR_STRING,
-  INDEX_TEMPLATE_FILE_PATH,
-  CLIENT_TEMPLATE_FILE_PATH,
   CLIENT_DIVS_SELECTOR_STRING,
   DEFAULT_DIVISION_IDENTIFIER
 };

package/bin/operation/copyHTML.js

@@ -0,0 +1,23 @@
+"use strict";
+
+const { copyHTML } = require("highmark-client");
+
+function copyHTMLOperation(proceed, abort, context) {
+  const { copyClientFiles } = context;
+
+  if (copyClientFiles) {
+    proceed();
+
+    return;
+  }
+
+  const { markdownHTML, markdownStylesCSS, outputDirectoryPath } = context,
+        noClient = true,
+        targetDirectoryPath = outputDirectoryPath;  ///
+
+  copyHTML(markdownHTML, markdownStylesCSS, noClient, targetDirectoryPath);
+
+  proceed();
+}
+
+module.exports = copyHTMLOperation;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-cli",
   "author": "James Smith",
-  "version": "0.0.183",
+  "version": "0.0.184",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-cli",
   "description": "Extensible, styleable Markdown.",
@@ -12,8 +12,7 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "express": "^4.19.2",
-    "highmark-client": "^0.0.19",
-    "highmark-fonts": "^1.0.43",
+    "highmark-client": "^0.0.21",
     "highmark-markdown": "^0.0.245",
     "lively-cli": "^2.0.59",
     "necessary": "^13.6.6",

package/bin/operation/indexHTML.js

@@ -1,49 +0,0 @@
-"use strict";
-
-const { liveReloadSnippet } = require("lively-cli"),
-      { pathUtilities, packageUtilities, templateUtilities } = require("necessary"),
-      { computerModernStyle: computerModernStyleCSS } = require("highmark-fonts");
-
-const { writeFile } = require("../utilities/fileSystem"),
-      { INDEX_HTML_FILE_NAME, INDEX_TEMPLATE_FILE_PATH } = require("../constants");
-
-const { parseFile } = templateUtilities,
-      { getPackagePath } = packageUtilities,
-      { concatenatePaths } = pathUtilities;
-
-function indexHTMLOperation(proceed, abort, context) {
-  const { copyClientFiles } = context;
-
-  if (copyClientFiles) {
-    proceed();
-
-    return;
-  }
-
-  const { outputDirectoryPath } = context,
-        indexHTML = createIndexHTML(context),
-        indexHTMLFilePath = concatenatePaths(outputDirectoryPath, INDEX_HTML_FILE_NAME),
-        filePath = indexHTMLFilePath, ///
-        content = indexHTML;  ///
-
-  writeFile(filePath, content);
-
-  proceed();
-}
-
-module.exports = indexHTMLOperation;
-
-function createIndexHTML(context) {
-  const { markdownHTML, markdownStylesCSS } = context,
-        packagePath = getPackagePath(),
-        indexTemplateFilePath = concatenatePaths(packagePath, INDEX_TEMPLATE_FILE_PATH),
-        args = {
-          markdownHTML,
-          markdownStylesCSS,
-          liveReloadSnippet,
-          computerModernStyleCSS
-        },
-        indexHTML = parseFile(indexTemplateFilePath, args);
-
-  return indexHTML;
-}

package/template/index.html

@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-
-    <meta charset="utf-8" />
-
-    <link rel="preload" href="font/cmunbbx.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunbi.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunbmo.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunbmr.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunbx.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunbxo.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunit.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunobi.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunobx.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunorm.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunoti.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunrm.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunsi.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunso.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunss.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunsx.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmuntb.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmunti.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmuntt.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="font/cmuntx.woff2" as="font" type="font/woff2" crossorigin />
-
-    <style>
-
-        *,
-        *::after,
-        *::before {
-          border: 0;
-          margin: 0;
-          padding: 0;
-          box-sizing: border-box;
-        }
-
-        html,
-        html > body {
-          width: 100%;
-          height: 100%;
-        }
-
-    </style>
-    <style>
-
-        ${computerModernStyleCSS}
-
-    </style>
-    <style>
-
-        ${markdownStylesCSS}
-
-    </style>
-  </head>
-  <body>
-
-${markdownHTML}
-
-${liveReloadSnippet}
-
-  </body>
-</html>