From 0b1e483c5344acc25453bec2381971fdbece6397 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 9 Feb 2022 23:45:09 +0100 Subject: [PATCH] bump webdeps --- scripts/deps-docker/Dockerfile | 11 ++-- scripts/deps-docker/codemirror.patch | 79 ++++++++++++++------------ scripts/deps-docker/easymde.patch | 84 +++++++++++++++------------- 3 files changed, 92 insertions(+), 82 deletions(-) diff --git a/scripts/deps-docker/Dockerfile b/scripts/deps-docker/Dockerfile index e72660ff..2cc00262 100644 --- a/scripts/deps-docker/Dockerfile +++ b/scripts/deps-docker/Dockerfile @@ -2,9 +2,9 @@ FROM alpine:3.15 WORKDIR /z ENV ver_asmcrypto=5b994303a9d3e27e0915f72a10b6c2c51535a4dc \ ver_hashwasm=4.9.0 \ - ver_marked=4.0.10 \ - ver_mde=2.15.0 \ - ver_codemirror=5.64.0 \ + ver_marked=4.0.12 \ + ver_mde=2.16.1 \ + ver_codemirror=5.65.1 \ ver_fontawesome=5.13.0 \ ver_zopfli=1.0.3 @@ -97,15 +97,14 @@ RUN cd CodeMirror-$ver_codemirror \ # build easymde -COPY easymde-marked6.patch /z/ COPY easymde.patch /z/ RUN cd easy-markdown-editor-$ver_mde \ - && patch -p1 < /z/easymde-marked6.patch \ && patch -p1 < /z/easymde.patch \ && sed -ri 's`https://registry.npmjs.org/marked/-/marked-[0-9\.]+.tgz`file:/z/nodepkgs/marked`' package-lock.json \ + && sed -ri 's`https://registry.npmjs.org/codemirror/-/codemirror-[0-9\.]+.tgz`file:/z/nodepkgs/codemirror`' package-lock.json \ && sed -ri 's`("marked": ")[^"]+`\1file:/z/nodepkgs/marked`' ./package.json \ && sed -ri 's`("codemirror": ")[^"]+`\1file:/z/nodepkgs/codemirror`' ./package.json \ - && sed -ri 's`^var marked = require\(.marked/lib/marked.\);$`var marked = window.marked;`' src/js/easymde.js \ + && sed -ri 's`^var marked = require\(.marked.\).marked;$`var marked = window.marked;`' src/js/easymde.js \ && npm install COPY easymde-ln.patch /z/ diff --git a/scripts/deps-docker/codemirror.patch b/scripts/deps-docker/codemirror.patch index effbe826..aef47f6f 100644 --- a/scripts/deps-docker/codemirror.patch +++ b/scripts/deps-docker/codemirror.patch @@ -1,6 +1,6 @@ -diff -NarU2 codemirror-5.59.3-orig/mode/gfm/gfm.js codemirror-5.59.3/mode/gfm/gfm.js ---- codemirror-5.59.3-orig/mode/gfm/gfm.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/mode/gfm/gfm.js 2021-02-21 20:42:02.166174775 +0000 +diff -wNarU2 codemirror-5.65.1-orig/mode/gfm/gfm.js codemirror-5.65.1/mode/gfm/gfm.js +--- codemirror-5.65.1-orig/mode/gfm/gfm.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/mode/gfm/gfm.js 2022-02-09 22:50:18.145862052 +0100 @@ -97,5 +97,5 @@ } } @@ -15,9 +15,9 @@ diff -NarU2 codemirror-5.59.3-orig/mode/gfm/gfm.js codemirror-5.59.3/mode/gfm/gf + }*/ stream.next(); return null; -diff -NarU2 codemirror-5.59.3-orig/mode/meta.js codemirror-5.59.3/mode/meta.js ---- codemirror-5.59.3-orig/mode/meta.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/mode/meta.js 2021-02-21 20:42:54.798742821 +0000 +diff -wNarU2 codemirror-5.65.1-orig/mode/meta.js codemirror-5.65.1/mode/meta.js +--- codemirror-5.65.1-orig/mode/meta.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/mode/meta.js 2022-02-09 22:50:18.145862052 +0100 @@ -13,4 +13,5 @@ CodeMirror.modeInfo = [ @@ -62,10 +62,10 @@ diff -NarU2 codemirror-5.59.3-orig/mode/meta.js codemirror-5.59.3/mode/meta.js + */ ]; // Ensure all modes have a mime property for backwards compatibility -diff -NarU2 codemirror-5.59.3-orig/src/display/selection.js codemirror-5.59.3/src/display/selection.js ---- codemirror-5.59.3-orig/src/display/selection.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/display/selection.js 2021-02-21 20:44:14.860894328 +0000 -@@ -84,29 +84,21 @@ +diff -wNarU2 codemirror-5.65.1-orig/src/display/selection.js codemirror-5.65.1/src/display/selection.js +--- codemirror-5.65.1-orig/src/display/selection.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/display/selection.js 2022-02-09 22:50:18.145862052 +0100 +@@ -96,29 +96,21 @@ let order = getOrder(lineObj, doc.direction) iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir, i) => { - let ltr = dir == "ltr" @@ -105,24 +105,24 @@ diff -NarU2 codemirror-5.59.3-orig/src/display/selection.js codemirror-5.59.3/sr + botRight = openEnd && last ? rightSide : toPos.right add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom) if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top) -diff -NarU2 codemirror-5.59.3-orig/src/input/ContentEditableInput.js codemirror-5.59.3/src/input/ContentEditableInput.js ---- codemirror-5.59.3-orig/src/input/ContentEditableInput.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/input/ContentEditableInput.js 2021-02-21 20:44:33.273953867 +0000 -@@ -399,4 +399,5 @@ +diff -wNarU2 codemirror-5.65.1-orig/src/input/ContentEditableInput.js codemirror-5.65.1/src/input/ContentEditableInput.js +--- codemirror-5.65.1-orig/src/input/ContentEditableInput.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/input/ContentEditableInput.js 2022-02-09 22:50:18.145862052 +0100 +@@ -400,4 +400,5 @@ let info = mapFromLineView(view, line, pos.line) + /* let order = getOrder(line, cm.doc.direction), side = "left" if (order) { -@@ -404,4 +405,5 @@ +@@ -405,4 +406,5 @@ side = partPos % 2 ? "right" : "left" } + */ let result = nodeAndOffsetInLineMap(info.map, pos.ch, side) result.offset = result.collapse == "right" ? result.end : result.start -diff -NarU2 codemirror-5.59.3-orig/src/input/movement.js codemirror-5.59.3/src/input/movement.js ---- codemirror-5.59.3-orig/src/input/movement.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/input/movement.js 2021-02-21 20:45:12.763093671 +0000 +diff -wNarU2 codemirror-5.65.1-orig/src/input/movement.js codemirror-5.65.1/src/input/movement.js +--- codemirror-5.65.1-orig/src/input/movement.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/input/movement.js 2022-02-09 22:50:18.145862052 +0100 @@ -15,4 +15,5 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) { @@ -146,9 +146,16 @@ diff -NarU2 codemirror-5.59.3-orig/src/input/movement.js codemirror-5.59.3/src/i return null + */ } -diff -NarU2 codemirror-5.59.3-orig/src/line/line_data.js codemirror-5.59.3/src/line/line_data.js ---- codemirror-5.59.3-orig/src/line/line_data.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/line/line_data.js 2021-02-21 20:45:36.472549599 +0000 +diff -wNarU2 codemirror-5.65.1-orig/src/line/line_data.js codemirror-5.65.1/src/line/line_data.js +--- codemirror-5.65.1-orig/src/line/line_data.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/line/line_data.js 2022-02-09 22:54:11.542722046 +0100 +@@ -3,5 +3,5 @@ + import { elt, eltP, joinClasses } from "../util/dom.js" + import { eventMixin, signal } from "../util/event.js" +-import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection.js" ++import { zeroWidthElement } from "../util/feature_detection.js" + import { lst, spaceStr } from "../util/misc.js" + @@ -79,6 +79,6 @@ // Optionally wire in some hacks into the token-rendering // algorithm, to deal with browser quirks. @@ -158,10 +165,10 @@ diff -NarU2 codemirror-5.59.3-orig/src/line/line_data.js codemirror-5.59.3/src/l + // builder.addToken = buildTokenBadBidi(builder.addToken, order) builder.map = [] let allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line) -diff -NarU2 codemirror-5.59.3-orig/src/measurement/position_measurement.js codemirror-5.59.3/src/measurement/position_measurement.js ---- codemirror-5.59.3-orig/src/measurement/position_measurement.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/measurement/position_measurement.js 2021-02-21 20:50:52.372945293 +0000 -@@ -380,5 +380,6 @@ +diff -wNarU2 codemirror-5.65.1-orig/src/measurement/position_measurement.js codemirror-5.65.1/src/measurement/position_measurement.js +--- codemirror-5.65.1-orig/src/measurement/position_measurement.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/measurement/position_measurement.js 2022-02-09 22:50:18.145862052 +0100 +@@ -382,5 +382,6 @@ sticky = "after" } - if (!order) return get(sticky == "before" ? ch - 1 : ch, sticky == "before") @@ -169,39 +176,39 @@ diff -NarU2 codemirror-5.59.3-orig/src/measurement/position_measurement.js codem + /* function getBidi(ch, partPos, invert) { -@@ -391,4 +392,5 @@ +@@ -393,4 +394,5 @@ if (other != null) val.other = getBidi(ch, other, sticky != "before") return val + */ } -@@ -468,4 +470,5 @@ +@@ -470,4 +472,5 @@ let begin = 0, end = lineObj.text.length, ltr = true + /* let order = getOrder(lineObj, cm.doc.direction) // If the line isn't plain left-to-right text, first figure out -@@ -482,4 +485,5 @@ +@@ -484,4 +487,5 @@ end = ltr ? part.to : part.from - 1 } + */ // A binary search to find the first character whose bounding box -@@ -526,4 +530,5 @@ +@@ -528,4 +532,5 @@ } +/* function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) { // Bidi parts are sorted left-to-right, and in a non-line-wrapping -@@ -580,4 +585,5 @@ +@@ -582,4 +587,5 @@ return part } +*/ let measureText -diff -NarU2 codemirror-5.59.3-orig/src/util/bidi.js codemirror-5.59.3/src/util/bidi.js ---- codemirror-5.59.3-orig/src/util/bidi.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/util/bidi.js 2021-02-21 20:52:18.168092225 +0000 +diff -wNarU2 codemirror-5.65.1-orig/src/util/bidi.js codemirror-5.65.1/src/util/bidi.js +--- codemirror-5.65.1-orig/src/util/bidi.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/util/bidi.js 2022-02-09 22:50:18.145862052 +0100 @@ -4,5 +4,5 @@ export function iterateBidiSections(order, from, to, f) { @@ -259,9 +266,9 @@ diff -NarU2 codemirror-5.59.3-orig/src/util/bidi.js codemirror-5.59.3/src/util/b - return order + return false; } -diff -NarU2 codemirror-5.59.3-orig/src/util/feature_detection.js codemirror-5.59.3/src/util/feature_detection.js ---- codemirror-5.59.3-orig/src/util/feature_detection.js 2021-02-20 21:24:57.000000000 +0000 -+++ codemirror-5.59.3/src/util/feature_detection.js 2021-02-21 20:49:22.191269270 +0000 +diff -wNarU2 codemirror-5.65.1-orig/src/util/feature_detection.js codemirror-5.65.1/src/util/feature_detection.js +--- codemirror-5.65.1-orig/src/util/feature_detection.js 2022-01-20 13:06:23.000000000 +0100 ++++ codemirror-5.65.1/src/util/feature_detection.js 2022-02-09 22:50:18.145862052 +0100 @@ -25,4 +25,5 @@ } diff --git a/scripts/deps-docker/easymde.patch b/scripts/deps-docker/easymde.patch index e3882836..3f200ad0 100644 --- a/scripts/deps-docker/easymde.patch +++ b/scripts/deps-docker/easymde.patch @@ -1,52 +1,52 @@ -diff -NarU2 easy-markdown-editor-2.14.0-orig/gulpfile.js easy-markdown-editor-2.14.0/gulpfile.js ---- easy-markdown-editor-2.14.0-orig/gulpfile.js 2021-02-14 12:11:48.000000000 +0000 -+++ easy-markdown-editor-2.14.0/gulpfile.js 2021-02-21 20:55:37.134701007 +0000 +diff -wNarU2 easy-markdown-editor-2.16.1-orig/gulpfile.js easy-markdown-editor-2.16.1/gulpfile.js +--- easy-markdown-editor-2.16.1-orig/gulpfile.js 2022-01-14 23:27:44.000000000 +0100 ++++ easy-markdown-editor-2.16.1/gulpfile.js 2022-02-09 23:06:01.694592535 +0100 @@ -25,5 +25,4 @@ './node_modules/codemirror/lib/codemirror.css', './src/css/*.css', - './node_modules/codemirror-spell-checker/src/css/spell-checker.css', ]; -diff -NarU2 easy-markdown-editor-2.14.0-orig/package.json easy-markdown-editor-2.14.0/package.json ---- easy-markdown-editor-2.14.0-orig/package.json 2021-02-14 12:11:48.000000000 +0000 -+++ easy-markdown-editor-2.14.0/package.json 2021-02-21 20:55:47.761190082 +0000 -@@ -21,5 +21,4 @@ - "dependencies": { - "codemirror": "^5.59.2", +diff -wNarU2 easy-markdown-editor-2.16.1-orig/package.json easy-markdown-editor-2.16.1/package.json +--- easy-markdown-editor-2.16.1-orig/package.json 2022-01-14 23:27:44.000000000 +0100 ++++ easy-markdown-editor-2.16.1/package.json 2022-02-09 23:06:24.778501888 +0100 +@@ -23,5 +23,4 @@ + "@types/marked": "^4.0.1", + "codemirror": "^5.63.1", - "codemirror-spell-checker": "1.1.2", - "marked": "^2.0.0" + "marked": "^4.0.10" }, -diff -NarU2 easy-markdown-editor-2.14.0-orig/src/js/easymde.js easy-markdown-editor-2.14.0/src/js/easymde.js ---- easy-markdown-editor-2.14.0-orig/src/js/easymde.js 2021-02-14 12:11:48.000000000 +0000 -+++ easy-markdown-editor-2.14.0/src/js/easymde.js 2021-02-21 20:57:09.143171536 +0000 +diff -wNarU2 easy-markdown-editor-2.16.1-orig/src/js/easymde.js easy-markdown-editor-2.16.1/src/js/easymde.js +--- easy-markdown-editor-2.16.1-orig/src/js/easymde.js 2022-01-14 23:27:44.000000000 +0100 ++++ easy-markdown-editor-2.16.1/src/js/easymde.js 2022-02-09 23:07:21.203131415 +0100 @@ -12,5 +12,4 @@ require('codemirror/mode/gfm/gfm.js'); require('codemirror/mode/xml/xml.js'); -var CodeMirrorSpellChecker = require('codemirror-spell-checker'); - var marked = require('marked/lib/marked'); + var marked = require('marked').marked; -@@ -1762,9 +1761,4 @@ +@@ -1816,9 +1815,4 @@ options.autosave.uniqueId = options.autosave.unique_id; - // If overlay mode is specified and combine is not provided, default it to true - if (options.overlayMode && options.overlayMode.combine === undefined) { -- options.overlayMode.combine = true; +- options.overlayMode.combine = true; - } - // Update this options this.options = options; -@@ -2003,28 +1997,7 @@ +@@ -2057,34 +2051,7 @@ var mode, backdrop; - // CodeMirror overlay mode - if (options.overlayMode) { -- CodeMirror.defineMode('overlay-mode', function(config) { -- return CodeMirror.overlayMode(CodeMirror.getMode(config, options.spellChecker !== false ? 'spell-checker' : 'gfm'), options.overlayMode.mode, options.overlayMode.combine); -- }); +- CodeMirror.defineMode('overlay-mode', function (config) { +- return CodeMirror.overlayMode(CodeMirror.getMode(config, options.spellChecker !== false ? 'spell-checker' : 'gfm'), options.overlayMode.mode, options.overlayMode.combine); +- }); - -- mode = 'overlay-mode'; -- backdrop = options.parsingConfig; -- backdrop.gitHubSpice = false; +- mode = 'overlay-mode'; +- backdrop = options.parsingConfig; +- backdrop.gitHubSpice = false; - } else { mode = options.parsingConfig; mode.name = 'gfm'; @@ -58,31 +58,35 @@ diff -NarU2 easy-markdown-editor-2.14.0-orig/src/js/easymde.js easy-markdown-edi - backdrop.name = 'gfm'; - backdrop.gitHubSpice = false; - -- CodeMirrorSpellChecker({ -- codeMirrorInstance: CodeMirror, -- }); +- if (typeof options.spellChecker === 'function') { +- options.spellChecker({ +- codeMirrorInstance: CodeMirror, +- }); +- } else { +- CodeMirrorSpellChecker({ +- codeMirrorInstance: CodeMirror, +- }); +- } - } // eslint-disable-next-line no-unused-vars -diff -NarU2 easy-markdown-editor-2.14.0-orig/types/easymde.d.ts easy-markdown-editor-2.14.0/types/easymde.d.ts ---- easy-markdown-editor-2.14.0-orig/types/easymde.d.ts 2021-02-14 12:11:48.000000000 +0000 -+++ easy-markdown-editor-2.14.0/types/easymde.d.ts 2021-02-21 20:57:42.492620979 +0000 -@@ -160,9 +160,4 @@ +diff -wNarU2 easy-markdown-editor-2.16.1-orig/types/easymde.d.ts easy-markdown-editor-2.16.1/types/easymde.d.ts +--- easy-markdown-editor-2.16.1-orig/types/easymde.d.ts 2022-01-14 23:27:44.000000000 +0100 ++++ easy-markdown-editor-2.16.1/types/easymde.d.ts 2022-02-09 23:07:55.427605243 +0100 +@@ -167,9 +167,4 @@ } - interface OverlayModeOptions { -- mode: CodeMirror.Mode -- combine?: boolean +- mode: CodeMirror.Mode; +- combine?: boolean; - } - - interface Options { - autoDownloadFontAwesome?: boolean; -@@ -214,7 +209,5 @@ + interface SpellCheckerOptions { + codeMirrorInstance: CodeMirror.Editor; +@@ -229,6 +224,4 @@ + syncSideBySidePreviewScroll?: boolean; - promptTexts?: PromptTexts; -- syncSideBySidePreviewScroll?: boolean; +- overlayMode?: OverlayModeOptions; - -- overlayMode?: OverlayModeOptions -+ syncSideBySidePreviewScroll?: boolean + direction?: 'ltr' | 'rtl'; } - }