unvendor: Replace droll

e9a002bc2b78ed700f3f4069febf20d0c064a6fe

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: ec4763b0c56513b1013218f020d3925ccc085b22
8 files changed, +22 -7Ignore whitespace
.eslintrc.cjs+0 -1
@@ -50,7 +50,6 @@ module.exports = {
50 },50 },
51 // These scripts are loaded in HTML; tell ESLint not to complain about them being undefined51 // These scripts are loaded in HTML; tell ESLint not to complain about them being undefined
52 globals: {52 globals: {
53 droll: 'readonly',
54 showdownKatex: 'readonly',53 showdownKatex: 'readonly',
55 toastr: 'readonly',54 toastr: 'readonly',
56 SillyTavern: 'readonly',55 SillyTavern: 'readonly',
package-lock.json+12 -0
@@ -29,6 +29,7 @@
29 "csrf-csrf": "^2.2.3",29 "csrf-csrf": "^2.2.3",
30 "diff-match-patch": "^1.0.5",30 "diff-match-patch": "^1.0.5",
31 "dompurify": "^3.1.7",31 "dompurify": "^3.1.7",
32 "droll": "^0.2.1",
32 "epubjs": "^0.3.93",33 "epubjs": "^0.3.93",
33 "express": "^4.21.0",34 "express": "^4.21.0",
34 "form-data": "^4.0.0",35 "form-data": "^4.0.0",
@@ -3531,6 +3532,17 @@
3531 "node": ">=10"3532 "node": ">=10"
3532 }3533 }
3533 },3534 },
3535 "node_modules/droll": {
3536 "version": "0.2.1",
3537 "resolved": "https://registry.npmjs.org/droll/-/droll-0.2.1.tgz",
3538 "integrity": "sha512-fXxtxZSwGK6afeG18Vk6q/8LQDAnIylsvk/2tQhHwDOJmdB/x+YL9GLoSZUZXJkQ8LrBcyU/1EoIL1eSlpDMsg==",
3539 "bin": {
3540 "droll": "bin/droll-cli.js"
3541 },
3542 "engines": {
3543 "node": ">=0.8.0"
3544 }
3545 },
3534 "node_modules/eastasianwidth": {3546 "node_modules/eastasianwidth": {
3535 "version": "0.2.0",3547 "version": "0.2.0",
3536 "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",3548 "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
package.json+1 -0
@@ -19,6 +19,7 @@
19 "csrf-csrf": "^2.2.3",19 "csrf-csrf": "^2.2.3",
20 "diff-match-patch": "^1.0.5",20 "diff-match-patch": "^1.0.5",
21 "dompurify": "^3.1.7",21 "dompurify": "^3.1.7",
22 "droll": "^0.2.1",
22 "epubjs": "^0.3.93",23 "epubjs": "^0.3.93",
23 "express": "^4.21.0",24 "express": "^4.21.0",
24 "form-data": "^4.0.0",25 "form-data": "^4.0.0",
public/global.d.ts+0 -1
@@ -1,5 +1,4 @@
1// Global namespace modules1// Global namespace modules
2declare var droll;
3declare var showdownKatex;2declare var showdownKatex;
4declare var ai;3declare var ai;
54
public/index.html+0 -1
@@ -6751,7 +6751,6 @@
6751 <script src="lib/toastr.min.js"></script>6751 <script src="lib/toastr.min.js"></script>
6752 <script src="lib/select2.min.js"></script>6752 <script src="lib/select2.min.js"></script>
6753 <script src="lib/select2-search-placeholder.js"></script>6753 <script src="lib/select2-search-placeholder.js"></script>
6754 <script src="lib/droll.js"></script>
6755 <script src="lib/pagination.js"></script>6754 <script src="lib/pagination.js"></script>
6756 <script src="lib/toolcool-color-picker.js"></script>6755 <script src="lib/toolcool-color-picker.js"></script>
6757 <script src="lib/jquery.izoomify.js"></script>6756 <script src="lib/jquery.izoomify.js"></script>
public/jsconfig.json+1 -3
@@ -17,9 +17,7 @@
17 ],17 ],
18 "typeAcquisition": {18 "typeAcquisition": {
19 "include": [19 "include": [
20 "@popperjs/core",20 "showdown-katex"
21 "showdown-katex",
22 "droll"
23 ]21 ]
24 }22 }
25}23}
public/lib.js+7 -0
@@ -19,6 +19,7 @@ import showdown from 'showdown';
19import moment from 'moment';19import moment from 'moment';
20import seedrandom from 'seedrandom';20import seedrandom from 'seedrandom';
21import * as Popper from '@popperjs/core';21import * as Popper from '@popperjs/core';
22import droll from 'droll';
2223
23/**24/**
24 * Expose the libraries to the 'window' object.25 * Expose the libraries to the 'window' object.
@@ -69,6 +70,10 @@ export function initLibraryShims() {
69 // @ts-ignore70 // @ts-ignore
70 window.Popper = Popper;71 window.Popper = Popper;
71 }72 }
73 if (!('droll' in window)) {
74 // @ts-ignore
75 window.droll = droll;
76 }
72}77}
7378
74export default {79export default {
@@ -90,6 +95,7 @@ export default {
90 moment,95 moment,
91 seedrandom,96 seedrandom,
92 Popper,97 Popper,
98 droll,
93};99};
94100
95export {101export {
@@ -111,4 +117,5 @@ export {
111 moment,117 moment,
112 seedrandom,118 seedrandom,
113 Popper,119 Popper,
120 droll,
114};121};
public/scripts/macros.js+1 -1
@@ -1,4 +1,4 @@
1import { Handlebars, moment, seedrandom } from '../lib.js';1import { Handlebars, moment, seedrandom, droll } from '../lib.js';
2import { chat, chat_metadata, main_api, getMaxContextSize, getCurrentChatId, substituteParams } from '../script.js';2import { chat, chat_metadata, main_api, getMaxContextSize, getCurrentChatId, substituteParams } from '../script.js';
3import { timestampToMoment, isDigitsOnly, getStringHash, escapeRegex, uuidv4 } from './utils.js';3import { timestampToMoment, isDigitsOnly, getStringHash, escapeRegex, uuidv4 } from './utils.js';
4import { textgenerationwebui_banned_in_macros } from './textgen-settings.js';4import { textgenerationwebui_banned_in_macros } from './textgen-settings.js';