Replace some dependencies

Author: andrewbranch

package-lock.json

@@ -37,8 +37,6 @@
     "@types/glob": "^7.1.1",
     "@types/jest": "^24.0.21",
     "@types/json5": "0.0.30",
-    "@types/lodash.escape": "^4.0.6",
-    "@types/lodash.uniq": "^4.5.6",
     "@types/node": "^12.12.5",
     "@types/plist": "^3.0.2",
     "glob": "^7.1.5",
@@ -51,24 +49,23 @@
     "rehype-stringify": "^6.0.0",
     "remark-parse": "^7.0.1",
     "remark-rehype": "^5.0.0",
-    "rimraf": "^3.0.0",
     "synthwave-vscode": "github:robb0wen/synthwave-vscode",
     "typescript": "^3.6.4",
     "unified": "^8.4.1"
   },
   "dependencies": {
     "decompress": "^4.2.0",
     "json5": "^2.1.1",
-    "lodash.escape": "^4.0.1",
-    "lodash.uniq": "^4.5.0",
     "loglevel": "^1.6.4",
     "oniguruma": "^7.2.0",
     "plist": "^3.0.1",
     "unist-util-visit": "^1.4.1",
     "vscode-textmate": "4.2.2"
   },
   "jest": {
-    "testMatch": ["<rootDir>/test/index.js"],
+    "testMatch": [
+      "<rootDir>/test/index.js"
+    ],
     "globalSetup": "<rootDir>/test/setup.js",
     "coveragePathIgnorePatterns": [
       "lib"

package.json

@@ -1,5 +1,4 @@
-const escapeHTML = require('lodash.escape');
-const { last, flatMap } = require('../utils');
+const { last, flatMap, escapeHTML } = require('../utils');
 const { createThemeCSSRules } = require('./css');
 const { joinClassNames } = require('../renderers/css');
 const { pre, code, span, style, TriviaRenderFlags, mergeAttributes } = require('../renderers/html');

src/factory/html.js

@@ -1,8 +1,7 @@
-const escapeHTML = require('lodash.escape');
 const { renderHTML } = require('../renderers/html');
 const { joinClassNames } = require('../renderers/css');
-const { flatMap, partitionOne } = require('../utils');
 const { getThemeClassNames } = require('../themeUtils');
+const { flatMap, partitionOne, escapeHTML } = require('../utils');
 const { createTokenElement, createLineElement, createCodeBlockElement } = require('../factory/html');
 
 /**

src/graphql/getCodeBlockDataFromRegistry.js

@@ -1,6 +1,6 @@
 // @ts-check
-const escape = require('lodash.escape');
 const createWriter = require('./createWriter');
+const { escapeHTML } = require('../utils');
 const { joinClassNames, renderCSS } = require('./css');
 
 /**
@@ -64,7 +64,7 @@ function renderHTML(element) {
 
     const { tagName, attributes, children } = element;
     const attrs = Object.keys(attributes)
-      .map(attr => ` ${attr}="${escape(attributes[attr])}"`)
+      .map(attr => ` ${attr}="${escapeHTML(attributes[attr])}"`)
       .join('');
 
     writer.write(`<${tagName}${attrs}>`);

src/renderers/html.js

@@ -5,7 +5,6 @@ const zlib = require('zlib');
 const path = require('path');
 const JSON5 = require('json5');
 const plist = require('plist');
-const uniq = require('lodash.uniq');
 const logger = require('loglevel');
 
 const readdir = util.promisify(fs.readdir);
@@ -102,6 +101,15 @@ async function mergeCache(cache, key, value) {
   await cache.set(key, { ...(await cache.get(key)), ...value });
 }
 
+/**
+ * @template T
+ * @param {T[]} arr
+ * @returns {T[]}
+ */
+function uniq(arr) {
+  return Array.from(new Set(arr));
+}
+
 /**
  * @template T
  * @template U
@@ -183,6 +191,21 @@ function createRequire(path) {
   return /** @type {NodeRequire} */ ((module.createRequire || module.createRequireFromPath)(path));
 }
 
+const htmlCharRegExp = /[<>&'"]/g;
+/** @param {string} html */
+function escapeHTML(html) {
+  return String(html).replace(
+    htmlCharRegExp,
+    char =>
+      ({
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&#39;'
+      }[char] || char)
+  );
+}
+
 const requireJson = /** @param {string} pathName */ pathName => JSON5.parse(fs.readFileSync(pathName, 'utf8'));
 const requirePlistOrJson = /** @param {string} pathName */ async pathName =>
   path.extname(pathName) === '.json' ? requireJson(pathName) : plist.parse(await readFile(pathName, 'utf8'));
@@ -203,10 +226,12 @@ module.exports = {
   getMetadataForToken,
   mergeCache,
   flatMap,
+  uniq,
   deprecationNotice,
   isRelativePath,
   createOnce,
   partitionOne,
   last,
-  createRequire
+  createRequire,
+  escapeHTML
 };

src/utils.js

@@ -1,12 +1,12 @@
 const fs = require('fs');
 const path = require('path');
+const open = require('open');
 const glob = require('glob');
 const unified = require('unified');
 const reparseHast = require('hast-util-raw');
 const mdastToHast = require('mdast-util-to-hast');
 const remark = require('remark-parse');
 const stringify = require('rehype-stringify');
-const { execSync } = require('child_process');
 const { promisify } = require('util');
 const { renderDocument, renderNewCase, renderTestDiff } = require('./viewer/render');
 const { markdownNode, createCache, createNodeId, actions } = require('../utils');
@@ -73,7 +73,7 @@ describe('integration tests', () => {
     if (failedCaseHTML.length || newCaseHTML.length) {
       const fileName = path.resolve(__dirname, 'viewer/report.html');
       await writeFile(fileName, renderDocument([...newCaseHTML, ...failedCaseHTML].join('\n')));
-      execSync(`open ${fileName}`);
+      return open(fileName);
     }
   });
 });

test/integration/integration.test.js

@@ -1,5 +1,5 @@
 // @ts-check
-const escape = require('lodash.escape');
+const { escapeHTML } = require('../../../src/utils');
 
 /**
  * @param {string} title
@@ -34,7 +34,7 @@ function renderNewCase(title, content) {
     <h2>${title} (new)</h2>
     <div class="row">
       <div class="output">${renderInIframe(content)}</div>
-      <pre class="html"><code>${escape(content)}</code></div>
+      <pre class="html"><code>${escapeHTML(content)}</code></div>
     </div>
   </div>
 `;
@@ -43,7 +43,7 @@ function renderNewCase(title, content) {
 /** @param {string} html */
 function renderInIframe(html) {
   return `
-  <iframe srcdoc="${escape(`
+  <iframe srcdoc="${escapeHTML(`
     <html>
       <head>
         <style>