Compare commits

...

2 Commits

Author SHA1 Message Date
Bad 0738ce4cb1 Rename dateFormatter.js to date-formatter.js
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2020-10-31 18:21:04 +01:00
Bad 20e94f05e7 Lazy load highlight.js
This significantly reduces the bundle size(over 1MiB!) but it also uses
some hacks to dynamically load browserify modules on runtime(see
lazy-load-modules.js
2020-10-31 18:17:34 +01:00
10 changed files with 38 additions and 7 deletions

View File

@ -145,9 +145,11 @@ async function addJS(sourcePath, targetPath) {
await fs.promises.writeFile(pj(buildDir, targetPath), content)
}
async function addBundle(sourcePath, targetPath) {
async function addBundle(sourcePath, targetPath, module = false) {
let opts = {}
if(module) opts.standalone = sourcePath
const content = await new Promise(resolve => {
browserify()
browserify([], opts)
.add(pj(".", sourcePath))
.transform(file => {
let content = ""
@ -287,6 +289,9 @@ async function addBabel(sourcePath, targetPath) {
await addPug(item.source, item.target)
} else if (item.type === "bundle") {
await addBundle(item.source, item.target)
} else if (item.type === "module") {
// Creates a standalone bundle that can be imported on runtime
await addBundle(item.source, item.target, true)
} else {
throw new Error("Unknown item type: "+item.type)
}

View File

@ -19,6 +19,11 @@ module.exports = [
source: "/js/main.js",
target: "/static/bundle.js"
},
{
type: "module",
source: "/js/hljs.js",
target: "/static/hljs.js"
},
{
type: "file",
source: "/assets/fonts/whitney-500.woff",

View File

@ -40,6 +40,7 @@ html
!= JSON.stringify([...static.keys()].map(k => [k, getStatic(k)]))
| )
link(rel="stylesheet" type="text/css" href=getStatic("/sass/main.sass"))
link(rel="preload" as="script" href=getStatic("/js/hljs.js"))
script(type="module" src=getStatic("/js/main.js"))
body
main.main

View File

@ -1,10 +1,10 @@
const {ElemJS} = require("../basic")
const hljs = require("highlight.js")
const {lazyLoad} = require("../lazy-load-module")
class HighlightedCode extends ElemJS {
constructor(code) {
super(code)
hljs.highlightBlock(this.element)
lazyLoad("/static/hljs.js").then(hljs => hljs.highlightBlock(this.element))
}
}

View File

@ -1,5 +1,5 @@
const {ElemJS, ejs} = require("../basic")
const {dateFormatter} = require("../dateFormatter")
const {dateFormatter} = require("../date-formatter")
class MatrixEvent extends ElemJS {
constructor(data) {

View File

@ -1,5 +1,4 @@
const {ejs, ElemJS} = require("../basic")
const hljs = require("highlight.js")
const {HighlightedCode} = require("./components")
const DOMPurify = require("dompurify")
const {resolveMxc} = require("../functions")

2
src/js/hljs.js Normal file
View File

@ -0,0 +1,2 @@
const hljs = require("highlight.js")
module.exports = hljs

View File

@ -0,0 +1,19 @@
// I hate this with passion
async function lazyLoad(url) {
const cache = window.lazy_load_cache || new Map()
if (cache.get(url)) return cache.get(url)
const module = loadModuleWithoutCache(url)
cache.set(url, module)
return module
}
// Loads the module without caching
async function loadModuleWithoutCache(url) {
const src = await fetch(url).then(r => r.text())
let module = {}
eval(src)
return module.exports
}
module.exports = {lazyLoad}

View File

@ -6,7 +6,7 @@ const {Sender} = require("./sender.js")
const lsm = require("./lsm.js")
const {resolveMxc} = require("./functions.js")
const {renderEvent} = require("./events/renderEvent")
const {dateFormatter} = require("./dateFormatter")
const {dateFormatter} = require("./date-formatter")
let debug = false