Merge pull request #194 from Flakebi/deps

Update all dependencies

Author: Zulko

package.json

@@ -15,32 +15,32 @@
   "homepage": "https://github.com/RelaxedJS",
   "license": "ISC",
   "dependencies": {
-    "@iktakahiro/markdown-it-katex": "^3.1.0",
+    "@iktakahiro/markdown-it-katex": "^4.0.1",
     "cheerio": "^1.0.0-rc.2",
-    "chokidar": "^2.0.3",
+    "chokidar": "^3.5.3",
     "colors": "^1.3.0",
-    "commander": "^2.15.1",
+    "commander": "^9.1.0",
     "csvtojson": "^2.0.3",
     "deptree": "^1.0.0",
-    "filesize": "^3.6.1",
+    "filesize": "^8.0.7",
     "html2jade": "^0.8.6",
-    "jimp": "^0.5.4",
-    "js-yaml": "^3.12.0",
+    "jimp": "^0.16.1",
+    "js-yaml": "^4.1.0",
     "jstransformer-highlight": "^2.0.0",
     "jstransformer-markdown-it": "^2.1.0",
-    "katex": "^0.11.1",
-    "markdown-it": "^10.0.0",
-    "markdown-it-footnote": "^3.0.2",
+    "katex": "^0.15.3",
+    "markdown-it": "^12.3.0",
+    "markdown-it-footnote": "^3.0.3",
     "mathjax-node-page": "^3.0.1",
     "mermaid": "^8.0.0-rc.8",
-    "node-sass": "^7.0.1",
-    "pug": "^2.0.3",
-    "puppeteer": "^1.8.0"
+    "pug": "^3.0.2",
+    "puppeteer": "^13.5.1",
+    "sass": "^1.49.9"
   },
   "devDependencies": {
-    "diff": "^3.5.0",
-    "mocha": "^5.2.0",
+    "diff": "^5.0.0",
+    "mocha": "^9.2.2",
     "pdf-image": "^2.0.0",
     "pixel-diff": "^1.0.1"
   }
-}
+}

src/builtin_plugins/katex/head.html

@@ -2,4 +2,4 @@
   rel="stylesheet"
   href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css"
   integrity="sha384-zB1R0rpPzHqg7Kpt0Aljp8JPLqbXI3bhnPWROx27a9N0Ll6ZP/+DiW/UqRcLbRjq"
-  crossorigin="anonymous">
+  crossorigin="anonymous" />

src/builtin_plugins/markdown/index.js

@@ -7,7 +7,7 @@ exports.constructor = async function (params) {
   var href = "https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css"
   return {
     pugFilters: { markdown: MarkdownPugFilter },
-    headElements: `<link rel="stylesheet" href="${href}"></link>`
+    headElements: `<link rel="stylesheet" href="${href}" />`
   }
 }
 function MarkdownPugFilter (text, options) {
@@ -28,5 +28,3 @@ function MarkdownPugFilter (text, options) {
   md.use(mdKatex)
   return md.render(text)
 }
-
-

src/builtin_plugins/scss/index.js

@@ -1,4 +1,4 @@
-const sass = require('node-sass')
+const sass = require('sass')
 
 exports.constructor = async function (params) {
   return {
@@ -7,7 +7,7 @@ exports.constructor = async function (params) {
 }
 
 function ScssPugFilter (text, options) {
-  var file = options.filename
-  options = file.endsWith('scss') ? { file } : { data: text }
-  return sass.renderSync(options).css.toString('utf8')
+  if (options.filename.endsWith('scss'))
+    return sass.compile(options.filename).css
+  return sass.compileString(text).css
 }

src/index.js

@@ -34,6 +34,7 @@ program
 // ARGUMENTS PARSING AND SETUP
 
 program.parse(process.argv)
+const options = program.opts()
 
 if (!input || fs.lstatSync(input).isDirectory()) {
   input = autodetectMasterFile(input)
@@ -59,14 +60,14 @@ if (!output) {
 const outputPath = path.resolve(output)
 
 var tempDir
-if (program.temp) {
-  var validTempPath = fs.existsSync(program.temp) && fs.statSync(program.temp).isDirectory()
+if (options.temp) {
+  var validTempPath = fs.existsSync(options.temp) && fs.statSync(options.temp).isDirectory()
 
   if (validTempPath) {
-    tempDir = path.resolve(program.temp)
+    tempDir = path.resolve(options.temp)
   } else {
     console.error(colors.red('ReLaXed error: Could not find specified --temp directory: ' +
-      program.temp))
+      options.temp))
     process.exit(1)
   }
 } else {
@@ -77,16 +78,16 @@ const tempHTMLPath = path.join(tempDir, inputFilenameNoExt + '_temp.htm')
 
 // Default and additional watch locations
 let watchLocations = [inputDir]
-if (program.watch) {
-  watchLocations = watchLocations.concat(program.watch)
+if (options.watch) {
+  watchLocations = watchLocations.concat(options.watch)
 }
 
-let locals = parseLocals(program.locals, inputDir)
+let locals = parseLocals(options.locals, inputDir)
 
 // Google Chrome headless configuration
 const puppeteerConfig = {
   headless: true,
-  args: (!program.sandbox ? ['--no-sandbox'] : []).concat([
+  args: (!options.sandbox ? ['--no-sandbox'] : []).concat([
     '--disable-translate',
     '--disable-extensions',
     '--disable-sync'
@@ -104,7 +105,7 @@ const relaxedGlobals = {
   busy: false,
   config: {},
   configPlugins: [],
-  basedir: program.basedir || inputDir
+  basedir: options.basedir || inputDir
 }
 
 var updateConfig = async function () {
@@ -114,7 +115,7 @@ var updateConfig = async function () {
     if (configPath.endsWith('.json')) {
       relaxedGlobals.config = JSON.parse(data)
     } else {
-      relaxedGlobals.config = yaml.safeLoad(data)
+      relaxedGlobals.config = yaml.load(data)
     }
   }
   await plugins.updateRegisteredPlugins(relaxedGlobals, inputDir)
@@ -141,7 +142,7 @@ async function main () {
 
   await build(inputPath)
 
-  if (program.buildOnce) {
+  if (options.buildOnce) {
     process.exit(0)
   } else {
     watch()
@@ -163,7 +164,7 @@ async function build (filepath) {
 
   var updatedLocals = false
   if (isLastLocalJsonPath(filepath)) {
-    locals = parseLocals(program.locals, inputDir)
+    locals = parseLocals(options.locals, inputDir)
     updatedLocals = true
   }
 

src/masterToPDF.js

@@ -50,6 +50,7 @@ exports.masterToPDF = async function (masterPath, relaxedGlobals, tempHTMLPath,
    */
   var head = pluginHooks.headElements.map(e => e.instance).join(`\n\n`)
   html = `
+    <!DOCTYPE html>
     <html>
       <head>
         <meta charset="UTF-8">