liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: code blocks incorrect escaping + deps update

Browse Source
This commit is contained in:
NGPixel
2020-03-20 23:23:13 -04:00
parent 2810f7b5af
commit b529ad21c9
7 changed files with 712 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/telemetry.js
View File

@@ -1,7 +1,7 @@
const _ = require('lodash')
const request = require('request-promise')
const bugsnag = require('@bugsnag/node')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid')
const qs = require('querystring')
const os = require('os')

15
server/modules/rendering/html-core/renderer.js
View File

@@ -9,7 +9,7 @@ const URL = require('url').URL
module.exports = {
async render() {
const $ = cheerio.load(this.input, {
decodeEntities: false
decodeEntities: true
})
if ($.root().children().length < 1) {
@@ -229,7 +229,7 @@ module.exports = {
headers.push(headerSlug)
})
let output = $.html('body').replace('<body>', '').replace('</body>', '')
let output = decodeEscape($.html('body').replace('<body>', '').replace('</body>', ''))
// --------------------------------
// STEP: POST
@@ -243,3 +243,14 @@ module.exports = {
return output
}
}
function decodeEscape (string) {
return string.replace(/&#x([0-9a-f]{1,6});/ig, (entity, code) => {
code = parseInt(code, 16)
// Don't unescape ASCII characters, assuming they're encoded for a good reason
if (code < 0x80) return entity
return String.fromCodePoint(code)
})
}

2
server/setup.js
View File

@@ -1,5 +1,5 @@
const path = require('path')
const uuid = require('uuid/v4')
const { v4: uuid } = require('uuid')
const bodyParser = require('body-parser')
const compression = require('compression')
const express = require('express')