update deps + misc

This commit is contained in:
ed
2022-06-16 21:43:40 +02:00
parent ad7413a5ff
commit 190e11f7ea
8 changed files with 39 additions and 16 deletions

View File

@@ -1,10 +1,10 @@
FROM alpine:3.15
FROM alpine:3.16
WORKDIR /z
ENV ver_asmcrypto=5b994303a9d3e27e0915f72a10b6c2c51535a4dc \
ver_hashwasm=4.9.0 \
ver_marked=4.0.16 \
ver_marked=4.0.17 \
ver_mde=2.16.1 \
ver_codemirror=5.65.4 \
ver_codemirror=5.65.5 \
ver_fontawesome=5.13.0 \
ver_zopfli=1.0.3
@@ -32,7 +32,7 @@ RUN mkdir -p /z/dist/no-pk \
&& npm install \
&& npm i grunt uglify-js -g ) \
&& (tar -xf codemirror.tgz \
&& cd CodeMirror-$ver_codemirror \
&& cd codemirror5-$ver_codemirror \
&& npm install ) \
&& (tar -xf mde.tgz \
&& cd easy-markdown-editor* \
@@ -87,7 +87,7 @@ RUN cd marked-$ver_marked \
# build codemirror
COPY codemirror.patch /z/
RUN cd CodeMirror-$ver_codemirror \
RUN cd codemirror5-$ver_codemirror \
&& patch -p1 < /z/codemirror.patch \
&& sed -ri '/^var urlRE = /d' mode/gfm/gfm.js \
&& npm run build \

View File

@@ -23,4 +23,4 @@ purge:
sh:
@printf "\n\033[1;31mopening a shell in the most recently created docker image\033[0m\n"
docker run --rm -it `docker images -aq | head -n 1` /bin/bash
docker run --rm -it `docker images -aq | head -n 1` /bin/ash

View File

@@ -1,5 +1,5 @@
diff --git a/src/Lexer.js b/src/Lexer.js
adds linetracking to marked.js v4.0.6;
adds linetracking to marked.js v4.0.17;
add data-ln="%d" to most tags, %d is the source markdown line
--- a/src/Lexer.js
+++ b/src/Lexer.js