Merge branch 'refs/heads/master' into auto-completion-smiley
authorCyperghost <olaf_schmitz_1@t-online.de>
Thu, 11 Apr 2024 09:27:45 +0000 (11:27 +0200)
committerCyperghost <olaf_schmitz_1@t-online.de>
Thu, 11 Apr 2024 09:27:45 +0000 (11:27 +0200)
# Conflicts:
# package-lock.json
# package.json

1  2 
package-lock.json
package.json

index c667f15c6cf9e90495958994121be2bf1d1a02db,4a59cfc291314b8360798d1829a0921323b8b07a..9fe742efb91b89d8c25ef9bbb4ce290ab7647e32
@@@ -14,7 -14,8 +14,8 @@@
          "@types/pica": "^5.1.3",
          "@types/prismjs": "^1.26.0",
          "@types/twitter-for-web": "0.0.3",
 -        "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#c407a8efe4f3ad08d7777cd71dce30b4dd2a523a",
 +        "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#efa5ffdc4a094c55ef015b29c9d5024649a8ea32",
+         "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
          "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
          "focus-trap": "^7.5.2",
          "html-parsed-element": "^0.4.1",
        }
      },
      "node_modules/@woltlab/editor": {
 -      "resolved": "git+ssh://git@github.com/WoltLab/editor.git#c407a8efe4f3ad08d7777cd71dce30b4dd2a523a",
 -      "integrity": "sha512-ArKFz4h0uCEt+hPzhQN9rjJ1cQzXyASQiRlmubi4q9mYqc2ZAh1EQWUiVoaHAMPglcz0607712zJR0MQa9UYeg==",
 +      "resolved": "git+ssh://git@github.com/WoltLab/editor.git#efa5ffdc4a094c55ef015b29c9d5024649a8ea32",
 +      "integrity": "sha512-R5ymdCAZ62OHkEwsqDEErzJA8r8JxDvBmNvNfxYB2cTzs8JJ/3ZRq3kYPLvCL2HnlY1S/i9eReYwlJdTx2+oaQ==",
        "dependencies": {
 -        "@ckeditor/ckeditor5-alignment": "^39.0.2",
 -        "@ckeditor/ckeditor5-autosave": "^39.0.2",
 -        "@ckeditor/ckeditor5-basic-styles": "^39.0.2",
 -        "@ckeditor/ckeditor5-block-quote": "^39.0.2",
 -        "@ckeditor/ckeditor5-code-block": "^39.0.2",
 -        "@ckeditor/ckeditor5-editor-classic": "^39.0.2",
 -        "@ckeditor/ckeditor5-engine": "^39.0.2",
 -        "@ckeditor/ckeditor5-essentials": "^39.0.2",
 -        "@ckeditor/ckeditor5-font": "^39.0.2",
 -        "@ckeditor/ckeditor5-heading": "^39.0.2",
 -        "@ckeditor/ckeditor5-highlight": "^39.0.2",
 -        "@ckeditor/ckeditor5-horizontal-line": "^39.0.2",
 -        "@ckeditor/ckeditor5-html-embed": "^39.0.2",
 -        "@ckeditor/ckeditor5-image": "^39.0.2",
 -        "@ckeditor/ckeditor5-indent": "^39.0.2",
 -        "@ckeditor/ckeditor5-link": "^39.0.2",
 -        "@ckeditor/ckeditor5-list": "^39.0.2",
 -        "@ckeditor/ckeditor5-mention": "^39.0.2",
 -        "@ckeditor/ckeditor5-paragraph": "^39.0.2",
 -        "@ckeditor/ckeditor5-paste-from-office": "^39.0.2",
 -        "@ckeditor/ckeditor5-remove-format": "^39.0.2",
 -        "@ckeditor/ckeditor5-table": "^39.0.2",
 -        "@ckeditor/ckeditor5-theme-lark": "^39.0.2",
 -        "@ckeditor/ckeditor5-ui": "^39.0.2",
 -        "@ckeditor/ckeditor5-undo": "^39.0.2",
 -        "@ckeditor/ckeditor5-utils": "^39.0.2",
 -        "@ckeditor/ckeditor5-widget": "^39.0.2"
 +        "@ckeditor/ckeditor5-alignment": "^41.3.0",
 +        "@ckeditor/ckeditor5-autosave": "^41.3.0",
 +        "@ckeditor/ckeditor5-basic-styles": "^41.3.0",
 +        "@ckeditor/ckeditor5-block-quote": "^41.3.0",
 +        "@ckeditor/ckeditor5-code-block": "^41.3.0",
 +        "@ckeditor/ckeditor5-editor-classic": "^41.3.0",
 +        "@ckeditor/ckeditor5-engine": "^41.3.0",
 +        "@ckeditor/ckeditor5-essentials": "^41.3.0",
 +        "@ckeditor/ckeditor5-font": "^41.3.0",
 +        "@ckeditor/ckeditor5-heading": "^41.3.0",
 +        "@ckeditor/ckeditor5-highlight": "^41.3.0",
 +        "@ckeditor/ckeditor5-horizontal-line": "^41.3.0",
 +        "@ckeditor/ckeditor5-html-embed": "^41.3.0",
 +        "@ckeditor/ckeditor5-image": "^41.3.0",
 +        "@ckeditor/ckeditor5-indent": "^41.3.0",
 +        "@ckeditor/ckeditor5-link": "^41.3.0",
 +        "@ckeditor/ckeditor5-list": "^41.3.0",
 +        "@ckeditor/ckeditor5-mention": "^41.3.0",
 +        "@ckeditor/ckeditor5-paragraph": "^41.3.0",
 +        "@ckeditor/ckeditor5-paste-from-office": "^41.3.0",
 +        "@ckeditor/ckeditor5-remove-format": "^41.3.0",
 +        "@ckeditor/ckeditor5-table": "^41.3.0",
 +        "@ckeditor/ckeditor5-theme-lark": "^41.3.0",
 +        "@ckeditor/ckeditor5-ui": "^41.3.0",
 +        "@ckeditor/ckeditor5-undo": "^41.3.0",
 +        "@ckeditor/ckeditor5-utils": "^41.3.0",
 +        "@ckeditor/ckeditor5-widget": "^41.3.0"
        }
      },
+     "node_modules/@woltlab/visual-dom-diff": {
+       "name": "visual-dom-diff",
+       "version": "0.7.2",
+       "resolved": "git+ssh://git@github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
+       "integrity": "sha512-2486uA3nAG4C7pyU8A5Bh4yD3hlBpeCPIRtGmJBDiHBiQ4b+oeqlGaw6EbSdTXtxgcBUm512aIc+zgKgTPWI7Q==",
+       "dependencies": {
+         "@types/diff-match-patch": "^1.0.36",
+         "diff-match-patch": "^1.0.5",
+         "tslib": "^2.6.2"
+       }
+     },
      "node_modules/@woltlab/zxcvbn": {
        "version": "4.4.2",
        "resolved": "git+ssh://git@github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
diff --cc package.json
index d78fc274b4137801509d2ab694fecc7b1197a8d3,d1e8e2e2b22acccd696b68b5873354658433ebbd..afe846cadf13106cf5bc39511376d6783f867abc
@@@ -21,7 -21,8 +21,8 @@@
      "@types/pica": "^5.1.3",
      "@types/prismjs": "^1.26.0",
      "@types/twitter-for-web": "0.0.3",
 -    "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#c407a8efe4f3ad08d7777cd71dce30b4dd2a523a",
 +    "@woltlab/editor": "git+https://github.com/WoltLab/editor.git#efa5ffdc4a094c55ef015b29c9d5024649a8ea32",
+     "@woltlab/visual-dom-diff": "git+https://github.com/WoltLab/visual-dom-diff.git#e5b51fce3157d1eda310566fc1f86101341d1fea",
      "@woltlab/zxcvbn": "git+https://github.com/WoltLab/zxcvbn.git#5b582b24e437f1883ccad3c37dae7c3c5f1e7da3",
      "focus-trap": "^7.5.2",
      "html-parsed-element": "^0.4.1",